Update to .NET 10 SDK

Directory.Packages.props

@@ -18,7 +18,7 @@
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.8.0" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.1.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="MinVer" Version="6.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
@@ -36,7 +36,6 @@
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.17.0.131074" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.10" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
@@ -59,4 +58,12 @@
     <PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
     <PackageVersion Update="System.Threading.RateLimiting" Version="9.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0'))">
+    <PackageVersion Update="Microsoft.Bcl.TimeProvider" Version="10.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Logging" Version="10.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Options" Version="10.0.0" />
+    <PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="10.0.0" />
+    <PackageVersion Update="System.Threading.RateLimiting" Version="10.0.0" />
+  </ItemGroup>
 </Project>

bench/Polly.Benchmarks/Polly.Benchmarks.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ProjectType>Benchmark</ProjectType>
     <NoWarn>$(NoWarn);CA1822;IDE0060</NoWarn>

bench/Polly.Core.Benchmarks/Polly.Core.Benchmarks.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <RootNamespace>Polly</RootNamespace>
     <ImplicitUsings>true</ImplicitUsings>
     <ProjectType>Benchmark</ProjectType>

bench/benchmarks.ps1

@@ -20,6 +20,6 @@ if ($Interactive -ne $true) {
 
 $project = Join-Path "Polly.Core.Benchmarks" "Polly.Core.Benchmarks.csproj"
 
-dotnet run --configuration $Configuration --framework net9.0 --project $project $additionalArgs
+dotnet run --configuration $Configuration --framework net10.0 --project $project $additionalArgs
 
 exit $LASTEXITCODE

build.ps1

@@ -25,7 +25,7 @@ https://cakebuild.net
 #>
 
 Param(
-    [string]$Script = "build.cake",
+    [string]$Script = "cake.cs",
     [string]$Target = "Default",
     [ValidateSet("Default", "MutationCore", "MutationLegacy")]
     [string]$Configuration = "Release",
@@ -82,6 +82,6 @@ if ($WhatIf.IsPresent) {
 # Start Cake
 Write-Output "Running build script..."
 
-& dotnet cake $Script "--target=$Target" "--configuration=$Configuration" "--verbosity=$Verbosity" $additionalArgs
+& dotnet $Script -- "--target=$Target" "--configuration=$Configuration" "--verbosity=$Verbosity" $additionalArgs
 
 exit $LASTEXITCODE

build.cake → cake.cs

@@ -1,17 +1,16 @@
+#:sdk Cake.Sdk
+#:package Cake.FileHelpers
+#:package Newtonsoft.Json
+#:property ProjectType=Test
+#:property SignAssembly=false
+
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
 ///////////////////////////////////////////////////////////////////////////////
 
 var target = Argument<string>("target", "Default");
 var configuration = Argument<string>("configuration", "Release");
 
-//////////////////////////////////////////////////////////////////////
-// EXTERNAL NUGET LIBRARIES
-//////////////////////////////////////////////////////////////////////
-
-#addin nuget:?package=Cake.FileHelpers&version=7.0.0
-#addin nuget:?package=Newtonsoft.Json&version=13.0.3
-
 ///////////////////////////////////////////////////////////////////////////////
 // GLOBAL VARIABLES
 ///////////////////////////////////////////////////////////////////////////////
@@ -144,7 +143,7 @@
         loggers =
         [
             "junit;LogFilePath=junit.xml",
-            "GitHubActions;report-warnings=false",
+            "GitHubActions;report-warnings=false;summary-include-passed=false",
         ];
     }
 
@@ -285,11 +284,6 @@
 // HELPER FUNCTIONS
 //////////////////////////////////////////////////////////////////////
 
-string ToolsExePath(string exeFileName) {
-    var exePath = System.IO.Directory.GetFiles("./tools", exeFileName, SearchOption.AllDirectories).FirstOrDefault();
-    return exePath;
-}
-
 string PatchStrykerConfig(string path, Action<Newtonsoft.Json.Linq.JObject> patch)
 {
     var json = System.IO.File.ReadAllText(path);

eng/stryker-config.json

@@ -21,7 +21,8 @@
     ],
     "concurrency": 4,
     "configuration": "Debug",
-    "target-framework": "net8.0",
+    "language-version": "Preview",
+    "target-framework": "net10.0",
     "thresholds": {
       "high": 100,
       "low": 100

global.json

@@ -1,7 +1,10 @@
 {
   "sdk": {
-    "version": "9.0.308",
+    "version": "10.0.100",
     "allowPrerelease": false,
     "rollForward": "latestMinor"
+  },
+  "msbuild-sdks": {
+    "Cake.Sdk": "6.0.0"
   }
 }

samples/Chaos/Chaos.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Chaos</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Polly.Core" />
-    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>

samples/DependencyInjection/DependencyInjection.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

samples/Extensibility/Extensibility.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

samples/GenericPipelines/GenericPipelines.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

samples/Intro/Intro.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

samples/Retries/Retries.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Polly/Context.Dictionary.cs

@@ -11,9 +11,11 @@ public partial class Context : IDictionary<string, object>, IDictionary, IReadOn
     // For an individual execution through a policy or policywrap, it is expected that all execution steps (for example executing the user delegate, invoking policy-activity delegates such as onRetry, onBreak, onTimeout etc) execute sequentially.
     // Therefore, this class is intentionally not constructed to be safe for concurrent access from multiple threads.
 
-    private Dictionary<string, object> _wrappedDictionary;
-
-    private Dictionary<string, object> WrappedDictionary => _wrappedDictionary ?? (_wrappedDictionary = []);
+    private Dictionary<string, object> WrappedDictionary
+    {
+        get => field ??= [];
+        set;
+    }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Context"/> class, with the specified <paramref name="operationKey" /> and the supplied <paramref name="contextData"/>.
@@ -32,7 +34,7 @@ internal Context(IDictionary<string, object> contextData)
             throw new ArgumentNullException(nameof(contextData));
         }
 
-        _wrappedDictionary = new Dictionary<string, object>(contextData);
+        WrappedDictionary = new Dictionary<string, object>(contextData);
     }
 
     #region IDictionary<string,object> implementation

src/Snippets/Snippets.csproj

@@ -15,7 +15,7 @@
     <ProjectType>Library</ProjectType>
     <RootNamespace>Snippets</RootNamespace>
     <SignAssembly>false</SignAssembly>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,6 @@
     <PackageReference Include="NSubstitute" />
     <PackageReference Include="Refit.HttpClientFactory" />
     <PackageReference Include="RestSharp" />
-    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="xunit" />
   </ItemGroup>
 

test/Polly.AotTest/Polly.AotTest.csproj

@@ -5,7 +5,7 @@
     <PublishAot>true</PublishAot>
     <SKIP_POLLY_ANALYZERS>true</SKIP_POLLY_ANALYZERS>
     <SelfContained>true</SelfContained>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Polly.Core\Polly.Core.csproj" />

test/Polly.Core.Tests/Polly.Core.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net481</TargetFrameworks>
     <TestTfmsInParallel Condition="$([MSBuild]::IsOSPlatform('Windows'))">false</TestTfmsInParallel>
     <ProjectType>Test</ProjectType>

test/Polly.Extensions.Tests/Polly.Extensions.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net481</TargetFrameworks>
     <ProjectType>Test</ProjectType>
     <Nullable>enable</Nullable>

test/Polly.RateLimiting.Tests/Polly.RateLimiting.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net481</TargetFrameworks>
     <ProjectType>Test</ProjectType>
     <Nullable>enable</Nullable>

test/Polly.Specs/Helpers/Bulkhead/TraceableAction.cs

@@ -13,15 +13,13 @@ public class TraceableAction(int id, AutoResetEvent statusChanged, ITestOutputHe
     private readonly CancellationTokenSource _cancellationSource = new();
     private readonly AutoResetEvent _statusChanged = statusChanged;
 
-    private TraceableActionStatus _status;
-
     public TraceableActionStatus Status
     {
-        get => _status;
+        get;
         set
         {
-            _status = value;
-            _testOutputHelper.WriteLine(_id + "Updated status to {0}, signalling AutoResetEvent.", _status);
+            field = value;
+            _testOutputHelper.WriteLine(_id + "Updated status to {0}, signalling AutoResetEvent.", field);
             SignalStateChange();
         }
     }

test/Polly.Specs/Polly.Specs.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net481</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ProjectType>Test</ProjectType>

test/Polly.TestUtils/Polly.TestUtils.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net481</TargetFrameworks>
     <ProjectType>Library</ProjectType>
     <Nullable>enable</Nullable>

test/Polly.Testing.Tests/Polly.Testing.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net481</TargetFrameworks>
     <ProjectType>Test</ProjectType>
     <Nullable>enable</Nullable>