Upgrade to .NET 10

.github/workflows/publish.yaml

@@ -7,15 +7,22 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            8.0.x
-            9.0.x
+            10.0.x
+
+      - name: NuGet login
+        uses: NuGet/login@v1
+        id: login
+        with:
+          user: ${{ secrets.NUGET_USER }}
 
       - name: Restore
         run: dotnet restore
@@ -32,4 +39,4 @@ jobs:
         if: "!github.event.release.prerelease"
 
       - name: Publish
-        run: dotnet nuget push "*.nupkg" -k ${{ secrets.NUGET_KEY }} --skip-duplicate -s https://api.nuget.org/v3/index.json 
+        run: dotnet nuget push "*.nupkg" -k ${{ steps.login.outputs.NUGET_API_KEY }} --skip-duplicate -s https://api.nuget.org/v3/index.json 

.github/workflows/unit-tests.yaml

@@ -17,14 +17,13 @@ jobs:
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            8.0.x
-            9.0.x
+            10.0.x
 
       - name: Build
         run: dotnet build -c Release
 
       - name: Unit Tests (Roslyn)
-        run: dotnet test -f net8.0 -c Release --no-build --no-restore --verbosity normal DragonFruit.Data.Roslyn.Tests
+        run: dotnet test -c Release --no-build --no-restore --verbosity normal DragonFruit.Data.Roslyn.Tests
 
       - name: Unit Tests
-        run: dotnet test -f net8.0 -c Release --no-build --no-restore --verbosity normal DragonFruit.Data.Tests
+        run: dotnet test -c Release --no-build --no-restore --verbosity normal DragonFruit.Data.Tests

DragonFruit.Data.Roslyn.Tests/ApiRequestAnalyzerTests.cs

@@ -107,7 +107,7 @@ private async Task PerformTest(AnalyzerTest<DefaultVerifier> test)
             await test.RunAsync();
         }
 
-        private string GetSolutionRoot()
+        private static string GetSolutionRoot()
         {
             var currentDirectory = Directory.GetCurrentDirectory();
 

DragonFruit.Data.Roslyn.Tests/DragonFruit.Data.Roslyn.Tests.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
+        <TargetFramework>net10.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
 
-        <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

DragonFruit.Data.Roslyn/DragonFruit.Data.Roslyn.csproj

@@ -46,8 +46,8 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     </ItemGroup>
 
 </Project>

DragonFruit.Data.Serializers.Html/DragonFruit.Data.Serializers.Html.csproj

@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.71" />
+        <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
     </ItemGroup>
 
     <ItemGroup>

DragonFruit.Data.Serializers.Newtonsoft/DragonFruit.Data.Serializers.Newtonsoft.csproj

@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     </ItemGroup>
 
     <ItemGroup>

DragonFruit.Data.Serializers.Newtonsoft/JsonArrayPool.cs

@@ -14,7 +14,7 @@ namespace DragonFruit.Data.Serializers.Newtonsoft
     /// </remarks>
     internal class JsonArrayPool : IArrayPool<char>
     {
-        public static readonly JsonArrayPool Instance = new JsonArrayPool();
+        public static readonly JsonArrayPool Instance = new();
 
         public char[] Rent(int minimumLength)
         {

DragonFruit.Data.Serializers.Newtonsoft/NewtonsoftJsonSerializer.cs

@@ -11,14 +11,12 @@ namespace DragonFruit.Data.Serializers.Newtonsoft
 {
     public class NewtonsoftJsonSerializer : ApiSerializer
     {
-        private JsonSerializer _serializer;
-
         public override string ContentType => "application/json";
 
         public JsonSerializer Serializer
         {
-            get => _serializer ??= new JsonSerializer { Culture = CultureInfo.InvariantCulture };
-            set => _serializer = value;
+            get => field ??= new JsonSerializer { Culture = CultureInfo.InvariantCulture };
+            set;
         }
 
         public override HttpContent Serialize<T>(T input)

DragonFruit.Data.Tests/ConverterTests.cs

@@ -27,7 +27,7 @@
 
             if (builder.Length == 0)
             {
-                Assert.True(false, "Builder was empty");
+                Assert.Fail("Builder was empty");
             }
 
             builder.Length--; // remove the trailing &
@@ -48,7 +48,7 @@
 
             if (builder.Length == 0)
             {
-                Assert.True(false, "Builder was empty");
+                Assert.Fail("Builder was empty");
             }
 
             builder.Length--; // remove the trailing &
@@ -61,7 +61,7 @@
                 return new KeyValuePair<string, string>(segments[0], segments[1]);
             });
 
             Assert.True(EnumerableConverter.GetPairs(testData, mode, DefaultParameterName, null).SequenceEqual(resultPairs));
         }
 
         [Fact]
@@ -79,7 +79,7 @@
 
             if (builder.Length == 0)
             {
-                Assert.True(false, "Builder was empty");
+                Assert.Fail("Builder was empty");
             }
 
             builder.Length--; // remove the trailing &

DragonFruit.Data.Tests/DragonFruit.Data.Tests.csproj

@@ -3,14 +3,14 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

DragonFruit.Data.Tests/RequestTests.cs

@@ -27,7 +27,7 @@
 
             Assert.NotNull(request);
 
             using var sourceGenMessage = ((IRequestBuilder)request).BuildRequest(null);
             using var reflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, null);
 
             Assert.NotNull(sourceGenMessage.RequestUri);
@@ -43,11 +43,11 @@
         }
 
         [Fact]
-        public async void TestInheritedRequest()
+        public async Task TestInheritedRequest()
         {
             var request = new InheritedEchoRequest();
 
             using var sourceGenMessage = ((IRequestBuilder)request).BuildRequest(null);
             using var reflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, null);
 
             Assert.NotNull(sourceGenMessage.Content);
@@ -64,14 +64,14 @@
         public void TestInheritedMultipartRequest()
         {
             var request = new InheritedMultipartEchoRequest();
             using var sourceGenMessage = ((IRequestBuilder)request).BuildRequest(null);
             using var reflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, null);
 
             Assert.True(sourceGenMessage.Content is MultipartFormDataContent);
             Assert.True(reflectionGenMessage.Content is MultipartFormDataContent);
 
             var baseRequest = new InheritedEchoRequest();
             using var baseSourceGenMessage = ((IRequestBuilder)baseRequest).BuildRequest(null);
             using var baseReflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(baseRequest, null);
 
             Assert.True(baseSourceGenMessage.Content is StringContent);
@@ -79,7 +79,7 @@
         }
 
         [Fact]
-        public async void TestMultipartFormRequest()
+        public async Task TestMultipartFormRequest()
         {
             // actually send requests because it's easier than inspecting the multipart content
             using var httpClient = new HttpClient();
@@ -90,7 +90,7 @@
             var formats = new[]
             {
                 // sourcegen
                 ((IRequestBuilder)request).BuildRequest(null),
 
                 // reflection
                 ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, null)
@@ -109,11 +109,11 @@
                 }
 
                 // check querystring
                 Assert.Equal("content", json["args"]["c"].ToString());
 
                 // check form contents
                 Assert.Equal("content", json["form"]["file"].ToString());
                 Assert.Equal("content", json["form"]["bytes"].ToString());
 
                 json.Remove("headers");
                 processedResponses.Add(JsonSerializer.SerializeToUtf8Bytes(json));
@@ -128,7 +128,7 @@
         {
             var request = new SpecialTypeRequest();
 
             using var sourceGenMessage = ((IRequestBuilder)request).BuildRequest(null);
             using var reflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, null);
 
             // check query strings match expected output
@@ -139,11 +139,11 @@
         }
 
         [Fact]
-        public async void TestAdditionalSpecialTypeHandling()
+        public async Task TestAdditionalSpecialTypeHandling()
         {
             var request = new SpecialTypeAdditionalLocationsRequest();
 
             using var sourceGenMessage = ((IRequestBuilder)request).BuildRequest(null);
             using var reflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, null);
 
             // test headers
@@ -165,7 +165,7 @@
         {
             var request = new CustomHttpContentRequest();
 
             using var sourceGenMessage = ((IRequestBuilder)request).BuildRequest(null);
             using var reflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, null);
 
             Assert.NotNull(sourceGenMessage.Content);
@@ -188,7 +188,7 @@
             var request = new CustomSerializedContentRequest<TestRecord>(record);
             var serializers = new SerializerResolver(new ApiJsonSerializer());
 
             using var sourceGenMessage = ((IRequestBuilder)request).BuildRequest(serializers);
             using var reflectionGenMessage = ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, serializers);
 
             using (var sourceGenStream = await sourceGenMessage.Content!.ReadAsStreamAsync())

DragonFruit.Data.Tests/Requests/CustomSerializedContentRequest.cs

@@ -6,17 +6,13 @@
 
 namespace DragonFruit.Data.Tests.Requests
 {
-    public partial class CustomSerializedContentRequest<T> : ApiRequest where T : class
+    public partial class CustomSerializedContentRequest<T>(T requestContent) : ApiRequest
+        where T : class
     {
         public override string RequestPath => "https://postman-echo.com/patch";
         public override HttpMethod RequestMethod => HttpMethod.Patch;
 
-        public CustomSerializedContentRequest(T requestContent)
-        {
-            RequestContent = requestContent;
-        }
-
         [RequestBody]
-        public T RequestContent { get; }
+        public T RequestContent { get; } = requestContent;
     }
 }

DragonFruit.Data.Tests/Requests/DummyFileDownloadRequest.cs

@@ -3,15 +3,10 @@
 
 namespace DragonFruit.Data.Tests.Requests
 {
-    public partial class DummyFileDownloadRequest : ApiRequest
+    public partial class DummyFileDownloadRequest(string fileSize) : ApiRequest
     {
         public override string RequestPath => $"http://xcal1.vodafone.co.uk/{FileSize}.zip";
 
-        public DummyFileDownloadRequest(string fileSize)
-        {
-            FileSize = fileSize;
-        }
-
-        public string FileSize { get; set; }
+        public string FileSize { get; set; } = fileSize;
     }
 }

DragonFruit.Data.Tests/Requests/SpecialTypeAdditionalLocationsRequest.cs

@@ -6,14 +6,14 @@
 
 namespace DragonFruit.Data.Tests.Requests
 {
     public partial class SpecialTypeAdditionalLocationsRequest : ApiRequest
     {
         private readonly string[] _ids =
-        {
+        [
             "5c2a5585-2682-4c60-9bc7-b11874582af6",
             "d85cf845-a35a-48e9-b629-700f77ab1c5d",
             "885f37a8-6bf6-4d52-8092-71276ab706fd"
-        };
+        ];
 
         public override string RequestPath => "https://example.com";
 

DragonFruit.Data.Tests/Requests/SpecialTypeRequest.cs

@@ -6,16 +6,16 @@
 
 namespace DragonFruit.Data.Tests.Requests
 {
     public partial class SpecialTypeRequest : ApiRequest
     {
         public override string RequestPath => "https://postman-echo.com/get";
 
         [RequestParameter(ParameterType.Query, "users")]
         [EnumerableOptions(EnumerableOption.Concatenated, ":")]
-        public IReadOnlyCollection<string> Usernames => new[] { "test", "test_1a" };
+        public IReadOnlyCollection<string> Usernames => ["test", "test_1a"];
 
         [RequestParameter(ParameterType.Query, "ids")]
         [EnumerableOptions(EnumerableOption.Concatenated)]
-        public IEnumerable<int> UserIds => new[] { 1, 2 };
+        public IEnumerable<int> UserIds => [1, 2];
     }
 }

DragonFruit.Data/ApiClient.cs

@@ -38,15 +38,10 @@
     /// <summary>
     /// The <see cref="ApiClient"/> responsible for building, submitting and processing HTTP requests
     /// </summary>
-    public class ApiClient
+    public class ApiClient(ApiSerializer serializer)
     {
-        private HttpClient _client;
-        private Uri _baseAddress;
-
-        public ApiClient(ApiSerializer serializer)
-        {
-            Serializers = new SerializerResolver(serializer);
-        }
+        private HttpClient? _client;
+        private Uri? _baseAddress;
 
         public ApiClient(ApiSerializer serializer, Uri baseAddress)
             : this(serializer)
@@ -90,30 +85,26 @@
         /// <summary>
         /// Gets or sets the <see cref="Uri"/> that should act as the base address for relative-URI requests
         /// </summary>
-        public Uri BaseAddress
+        public Uri? BaseAddress
         {
             get => _client?.BaseAddress ?? _baseAddress;
             set
             {
                 _baseAddress = value;
-
-                if (_client != null)
-                {
-                    _client.BaseAddress = value;
-                }
+                _client?.BaseAddress = value;
             }
         }
 
         /// <summary>
         /// The <see cref="SerializerResolver"/> instance used to resolve serializers for requests.
         /// Caches and reused serializers where possible.
         /// </summary>
-        public SerializerResolver Serializers { get; }
+        public SerializerResolver Serializers { get; } = new(serializer);
 
         /// <summary>
         /// User-Controlled method to create a <see cref="HttpMessageHandler"/>
         /// </summary>
-        public Func<HttpMessageHandler> Handler { get; set; }
+        public Func<HttpMessageHandler>? Handler { get; set; }
 
         /// <summary>
         /// Gets the header container for the underlying <see cref="HttpClient"/>
@@ -209,7 +200,7 @@
         /// <param name="truncate">(Optional) whether to truncate the destination stream, if content is written. Defaults to true</param>
         /// <param name="safe">(Optional) whether to copy to a temporary buffer before writing to destination. When enabled provides greater redundancy from network failure. Defaults to false</param>
         /// <param name="cancellationToken">(Optional) cancellation request</param>
-        public async Task<HttpStatusCode> PerformDownload(ApiRequest request, Stream destination, IProgress<(long, long?)> progress = null, bool truncate = true, bool safe = false, CancellationToken cancellationToken = default)
+        public async Task<HttpStatusCode> PerformDownload(ApiRequest request, Stream destination, IProgress<(long, long?)>? progress = null, bool truncate = true, bool safe = false, CancellationToken cancellationToken = default)
         {
             using var requestMessage = await BuildRequest(request, "*/*").ConfigureAwait(false);
             return await PerformDownload(requestMessage, destination, progress, truncate, safe, cancellationToken).ConfigureAwait(false);
@@ -227,7 +218,7 @@
         /// <param name="truncate">(Optional) whether to truncate the destination stream, if content is written. Defaults to true</param>
         /// <param name="safe">(Optional) whether to copy to a temporary buffer before writing to destination. When enabled provides greater redundancy from network failure. Defaults to false</param>
         /// <param name="cancellationToken">(Optional) cancellation request</param>
-        public async Task<HttpStatusCode> PerformDownload(HttpRequestMessage request, Stream destination, IProgress<(long, long?)> progress = null, bool truncate = true, bool safe = false, CancellationToken cancellationToken = default)
+        public async Task<HttpStatusCode> PerformDownload(HttpRequestMessage request, Stream destination, IProgress<(long, long?)>? progress = null, bool truncate = true, bool safe = false, CancellationToken cancellationToken = default)
         {
             using var responseMessage = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 
@@ -400,16 +391,16 @@
         {
             switch (request)
             {
                 case IRequestExecutingCallback callback:
                     callback.OnRequestExecuting(this);
                     break;
 
                 case IAsyncRequestExecutingCallback asyncCallback:
                     await asyncCallback.OnRequestExecuting(this);
                     break;
             }
 
             var requestMessage = (request as IRequestBuilder)?.BuildRequest(Serializers) ?? ReflectionRequestMessageBuilder.CreateHttpRequestMessage(request, Serializers);
             requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(expectedContentType));
 
             return requestMessage;

DragonFruit.Data/ApiSerializer.cs

@@ -10,8 +10,6 @@ namespace DragonFruit.Data
 {
     public abstract class ApiSerializer
     {
-        private Encoding _encoding;
-
         /// <summary>
         /// The Content-Type/Accept header value
         /// </summary>
@@ -30,8 +28,8 @@ public abstract class ApiSerializer
         /// </summary>
         public virtual Encoding Encoding
         {
-            get => _encoding ??= new UTF8Encoding(false);
-            set => _encoding = value;
+            get => field ??= new UTF8Encoding(false);
+            set;
         }
 
         /// <summary>