Skip to content

Commit 81c6697

Browse files
adamsitnikadamsitnik
authored
Update to .NET 8 RTM (#2097)
* update all dependencies that don't require TFM update to latest versions * build fix: fix xUnit1030 in the whole solution: don't use .GetAwaiter in Test projects * build fix: stop using UseBackgroundThreadsForIO, which got deprecated and removed (it was unused), see rabbitmq/rabbitmq-dotnet-client#846 for more details * build fix: xUnit1031: Test methods should not use blocking task operations, as they can cause deadlocks. * update all dependencies that required TFM bump to .NET 8 * build fix: stop using .Add, use .Append instead * run approval tests for 8, not 7
1 parent 5134490 commit 81c6697

File tree

134 files changed

+471
-580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+471
-580
lines changed

‎Directory.Build.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2323
<Nullable>enable</Nullable>
2424
<PackageTags>HealthCheck;HealthChecks;Health</PackageTags>
25-
<NoWarn>$(NoWarn);1591;IDISP013</NoWarn> <!--TODO: temporary solution-->
25+
<NoWarn>$(NoWarn);1591;IDISP013;AD0001;</NoWarn> <!--TODO: temporary solution, remove AD0001 after https://github.com/dotnet/aspnetcore/issues/50836 fixed-->
2626
<CheckEolTargetFramework>false</CheckEolTargetFramework>
2727
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
2828
<PackageReadmeFile Condition="Exists('README.md')">README.md</PackageReadmeFile>
@@ -35,7 +35,7 @@
3535

3636
<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">
3737
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
38-
<NoWarn>$(NoWarn);IDE1006</NoWarn>
38+
<NoWarn>$(NoWarn);IDE1006;RCS1090</NoWarn>
3939
<WarningsNotAsErrors>$(WarningsNotAsErrors);IDE0053;IDE0060</WarningsNotAsErrors>
4040
</PropertyGroup>
4141

@@ -55,10 +55,10 @@
5555
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
5656
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
5757
<PackageReference Include="Shouldly" Version="4.2.1" />
58-
<PackageReference Include="NSubstitute" Version="5.0.0" />
59-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
60-
<PackageReference Include="xunit" Version="2.5.0" />
61-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
58+
<PackageReference Include="NSubstitute" Version="5.1.0" />
59+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
60+
<PackageReference Include="xunit" Version="2.6.2" />
61+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
6262
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
6363
<PackageReference Include="coverlet.collector" Version="6.0.0">
6464
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -67,7 +67,7 @@
6767

6868
<ProjectReference Include="..\..\src\HealthChecks.UI.Client\HealthChecks.UI.Client.csproj" />
6969

70-
<Compile Include="../_SHARED/ApiApprovalTests.cs" Link="ApiApprovalTests.cs" Visible="false" Condition="'$(TargetFramework)' == 'net7.0'" />
70+
<Compile Include="../_SHARED/ApiApprovalTests.cs" Link="ApiApprovalTests.cs" Visible="false" Condition="'$(TargetFramework)' == 'net8.0'" />
7171
<Compile Include="../_SHARED/TestLogger.cs" Link="TestLogger.cs" Visible="false" />
7272
<Compile Include="../_SHARED/TestLoggerProvider.cs" Link="TestLoggerProvider.cs" Visible="false" />
7373
<Compile Include="../_SHARED/ConformanceTests.cs" Link="ConformanceTests.cs" Visible="false" />

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<ItemGroup Condition="'$(IsPackable)' == 'true'">
44
<None Include="..\..\assets\icon.png" Pack="true" PackagePath="\" Visible="false" />
5-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
5+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
66
<Compile Include="../ApiMarker.cs" Link="ApiMarker.cs" Visible="false" />
77
<Compile Include="../CallerArgumentExpressionAttribute.cs" Link="CallerArgumentExpressionAttribute.cs" Visible="false" />
88
</ItemGroup>

‎build/docker-images/HealthChecks.UI.Image/HealthChecks.UI.Image.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<WarningsNotAsErrors>$(WarningsNotAsErrors);RCS1090</WarningsNotAsErrors>
66
</PropertyGroup>
77

@@ -11,8 +11,8 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Azure.Identity" Version="1.10.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
14+
<PackageReference Include="Azure.Identity" Version="1.10.4" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎samples/HealthChecks.Sample/HealthChecks.Sample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎samples/HealthChecks.UI.Branding/HealthChecks.UI.Branding.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
8+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎samples/HealthChecks.UI.Oidc/HealthChecks.UI.Oidc.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.10" />
8+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎samples/HealthChecks.UI.Sample/HealthChecks.UI.Sample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
</PropertyGroup>
77

‎samples/HealthChecks.UI.StorageProviders/HealthChecks.UI.StorageProviders.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎samples/HealthChecks.UIAndApi/HealthChecks.UIAndApi.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
</PropertyGroup>
77

‎samples/HealthChecks.UIAndApiCustomization/HealthChecks.UIAndApiCustomization.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)