Upgrade to net10.0 (#1083)

* Initial upgrade to dotnet 10

* Update test to react to behaviour change in net10

Author: slang25

.vscode/launch.json

@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/samples/SampleApp/bin/Debug/net9.0/SampleApp.dll",
+      "program": "${workspaceFolder}/samples/SampleApp/bin/Debug/net10.0/SampleApp.dll",
       "args": [],
       "cwd": "${workspaceFolder}/samples/SampleApp",
       "stopAtEntry": false,

.vsconfig

@@ -3,7 +3,7 @@
   "components": [
     "Microsoft.VisualStudio.Component.CoreEditor",
     "Microsoft.VisualStudio.Workload.CoreEditor",
-    "Microsoft.NetCore.Component.Runtime.9.0",
+    "Microsoft.NetCore.Component.Runtime.10.0",
     "Microsoft.NetCore.Component.SDK",
     "Microsoft.VisualStudio.Component.Roslyn.Compiler",
     "Microsoft.VisualStudio.Component.Roslyn.LanguageServices"

Directory.Packages.props

@@ -18,7 +18,7 @@
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.1.0" />
   </ItemGroup>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.307",
+    "version": "10.0.100",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

samples/SampleApp.Tests/SampleApp.Tests.csproj

@@ -3,18 +3,13 @@
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);CA1056;CA1062;CA1707;CA1711;CA1861;CA2007;SA1600</NoWarn>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net9.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="testsettings.json;xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
-    <WebApplicationFactoryContentRootAttribute
-      Include="SampleApp"
-      AssemblyName="SampleApp"
-      ContentRootPath="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../SampleApp'))"
-      ContentRootTest="SampleApp.csproj"
-      Priority="-1" />
+    <WebApplicationFactoryContentRootAttribute Include="SampleApp" AssemblyName="SampleApp" ContentRootPath="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../SampleApp'))" ContentRootTest="SampleApp.csproj" Priority="-1" />
   </ItemGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />

samples/SampleApp/SampleApp.csproj

@@ -2,10 +2,9 @@
   <PropertyGroup>
     <AspNetCoreHostingModel>inprocess</AspNetCoreHostingModel>
     <NoWarn>$(NoWarn);CA1062;CA2007;SA1600</NoWarn>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Refit" />
-    <PackageReference Include="System.Text.Json" OverrideVersion="9.0.0" />
   </ItemGroup>
 </Project>

tests/HttpClientInterception.Benchmarks/JustEat.HttpClientInterception.Benchmarks.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>JustEat.HttpClientInterception</RootNamespace>
     <Summary>Benchmarks for JustEat.HttpClientInterception</Summary>
-    <TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net472;net10.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="organization.json" CopyToOutputDirectory="PreserveNewest" />

tests/HttpClientInterception.Tests/Examples.cs

@@ -718,8 +718,7 @@ public static async Task Inject_Latency_For_Http_Get_With_Cancellation()
         using var client = options.CreateHttpClient();
 
         // Act
-        await Should.ThrowAsync<TaskCanceledException>(
-            () => client.GetAsync("http://www.google.co.uk", cts.Token));
+        await client.GetAsync("http://www.google.co.uk", cts.Token);
 
         // Assert
         cts.IsCancellationRequested.ShouldBeTrue();

tests/HttpClientInterception.Tests/InterceptingHttpMessageHandlerTests.cs

@@ -67,16 +67,16 @@ public static async Task SendAsync_Calls_Inner_Handler_If_Registration_Missing()
 
         options.OnMissingRegistration = (request) => Task.FromResult<HttpResponseMessage>(null);
 
-        using var handler = Substitute.For<HttpMessageHandler>();
-        using var expected = new HttpResponseMessage(HttpStatusCode.OK);
-        using var request = new HttpRequestMessage(HttpMethod.Options, "https://google.com/foo");
+        var handler = Substitute.For<HttpMessageHandler>();
+        var expected = new HttpResponseMessage(HttpStatusCode.OK);
+        var request = new HttpRequestMessage(HttpMethod.Options, "https://google.com/foo");
 
         handler.GetType()
                .GetMethod("SendAsync", BindingFlags.NonPublic | BindingFlags.Instance)
                .Invoke(handler, [request, Arg.Any<CancellationToken>()])
                .Returns(Task.FromResult(expected));
 
-        using var httpClient = options.CreateHttpClient(handler);
+        var httpClient = options.CreateHttpClient(handler);
 
         // Act
         var actual = await httpClient.SendAsync(request, CancellationToken.None);

tests/HttpClientInterception.Tests/JustEat.HttpClientInterception.Tests.csproj

@@ -6,7 +6,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>JustEat.HttpClientInterception</RootNamespace>
     <Summary>Tests for JustEat.HttpClientInterception</Summary>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="example-bundle.json;xunit.runner.json;Bundles\*.json" CopyToOutputDirectory="PreserveNewest" />