Skip to content

Commit

Permalink
build(no-release): Update auxiliary packages
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmg committed Dec 11, 2023
1 parent 993d141 commit c0d1283
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Build solution
run: ./build.sh --target compile --no-logo
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Get semantic release version
uses: cycjimmy/semantic-release-action@v3
Expand All @@ -51,7 +51,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Run unit tests
run: ./build.sh --target test --no-logo
Expand All @@ -69,7 +69,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Semantic release
uses: cycjimmy/semantic-release-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Run unit tests
run: ./build.sh --target test --no-logo
20 changes: 10 additions & 10 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.11" />
<PackageVersion Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="FakeItEasy" Version="7.4.0" />
<PackageVersion Include="FakeItEasy" Version="8.0.0" />
<PackageVersion Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="7.0.10" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.4" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.4" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
<PackageVersion Include="xunit" Version="2.5.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageVersion Include="xunit" Version="2.6.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageVersion>
<PackageVersion Include="ZString" Version="2.5.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="7.0.1" />
<PackageReference Include="Nuke.Common" Version="7.0.6" />
<PackageDownload Include="ReportGenerator" Version="[4.8.12]" />
</ItemGroup>

Expand Down
4 changes: 3 additions & 1 deletion samples/WebApiSample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@
// You can choose to include additional metrics (other than the request total duration) conditionally.
requestOptions.IncludeCustomMetrics = query.ContainsKey("custom");
});

// Add any required origins for the Timing-Allow-Origin header.
#pragma warning disable CA1861
options.TimingAllowOrigins = new[] { "https://example.com" };
#pragma warning restore CA1861

// You may want to invoke the callbacks with the timings to record them elsewhere,
// even if you do not want to send the Server-Timing header in the response.
Expand Down
2 changes: 1 addition & 1 deletion samples/WebApiSample/WebApiSample.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<OutputType>Exe</OutputType>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
2 changes: 1 addition & 1 deletion test/Timingz.Tests/ManualMetricTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void DurationHasValueOnceStopped()
[Fact]
public void IsRunningUpdatedWhenStartingAndStopping()
{
IManualMetric metric = new ManualMetric(Name, Description);
var metric = new ManualMetric(Name, Description);
metric.IsRunning.Should().BeFalse();

metric.Start();
Expand Down
4 changes: 2 additions & 2 deletions test/Timingz.Tests/ServerTimingEventTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ public void ReadOnlyStateSetFromConstructorParameters()
RemotePort = 80
}
};
httpContext.Request.Headers.Add("foo", "bar");
httpContext.Request.Headers.Append("foo", "bar");
httpContext.Response.StatusCode = 200;
httpContext.Response.Headers.Add("foo", "bar");
httpContext.Response.Headers.Append("foo", "bar");

var metric1 = new Metric("foo");
var metric2 = new Metric("bar");
Expand Down
8 changes: 5 additions & 3 deletions test/Timingz.Tests/ServerTimingMiddlewareTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,14 @@ public LogMessage(LogLevel logLevel, string message, Exception exception)

private sealed class TestLogger<TName> : ILogger<TName>
{
private readonly IList<LogMessage> _logMessages = new List<LogMessage>();
private readonly List<LogMessage> _logMessages = [];

public IList<LogMessage> GetLogMessages()
#pragma warning disable CA1859
public IReadOnlyList<LogMessage> GetLogMessages()
{
lock (_logMessages) return _logMessages.ToList();
lock (_logMessages) return _logMessages.AsReadOnly();
}
#pragma warning restore CA1859

public IDisposable BeginScope<TState>(TState state) => null;

Expand Down
2 changes: 1 addition & 1 deletion test/Timingz.Tests/Timingz.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down

0 comments on commit c0d1283

Please sign in to comment.