Upgrade to .NET 9.0

IEvangelist · Nov 20, 2024 · 7ce8a9a · 7ce8a9a
1 parent b9d98d4
commit 7ce8a9a
Show file tree

Hide file tree

Showing 48 changed files with 116 additions and 117 deletions.
diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: |
-            8.0.x
+            9.0.x
 
       - name: Install dependencies
         run: dotnet restore
@@ -57,7 +57,7 @@ jobs:
   #       uses: actions/setup-dotnet@main
   #       with:
   #         dotnet-version: |
-  #           8.0.x
+  #           9.0.x
 
   #     - name: Install dependencies
   #       run: dotnet restore

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -81,7 +81,7 @@ jobs:
       uses: actions/setup-dotnet@main
       with:
         dotnet-version: |
-          8.0.x
+          9.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: |
-            8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
 
@@ -32,7 +32,7 @@ jobs:
   #       uses: actions/setup-dotnet@main
   #       with:
   #         dotnet-version: |
-  #           8.0.x
+  #           9.0.x
   #     - name: Install dependencies
   #       run: dotnet restore
 
@@ -107,7 +107,7 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: |
-            8.0.x
+            9.0.x
 
       - name: Restore ${{ matrix.project }} dependencies
         run: dotnet restore ./src/${{ matrix.project }}/${{ matrix.project }}.csproj

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: |
-            8.0.x
+            9.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,7 @@
 
   <PropertyGroup>
     <CompatibilityTargetFrameworks>netstandard2.0</CompatibilityTargetFrameworks>
-    <DefaultTargetFrameworks>net7.0;net8.0;</DefaultTargetFrameworks>
+    <DefaultTargetFrameworks>net8.0;net9.0</DefaultTargetFrameworks>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,40 +3,40 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="AspNetCore.HealthChecks.CosmosDb" Version="8.0.0" />
+    <PackageVersion Include="AspNetCore.HealthChecks.CosmosDb" Version="8.0.1" />
     <PackageVersion Include="Bogus" Version="35.6.1" />
     <PackageVersion Include="CorrelationId" Version="3.0.1" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
-    <PackageVersion Include="IEvangelist.Azure.CosmosRepository" Version="8.1.7" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.38.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.46.0" />
     <PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
     <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="MinVer" Version="6.0.0" />
     <PackageVersion Include="Moq.AutoMock" Version="3.5.0" />
-    <PackageVersion Include="Moq" Version="[4.18.4]" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Mumby0168.CleanArchitecture.Exceptions.AspNetCore" Version="1.1.0" />
     <PackageVersion Include="Mumby0168.CleanArchitecture.Exceptions" Version="1.0.0" />
-    <PackageVersion Include="Polly" Version="8.3.0" />
-    <PackageVersion Include="Scrutor" Version="5.0.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageVersion Include="Polly" Version="8.5.0" />
+    <PackageVersion Include="Scrutor" Version="5.0.2" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.0.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
+    <PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="xunit" Version="2.9.2" />
   </ItemGroup>

diff --git a/...rosoft.Azure.CosmosEventSourcing/BasicEventSourcingSample/BasicEventSourcingSample.csproj b/...rosoft.Azure.CosmosEventSourcing/BasicEventSourcingSample/BasicEventSourcingSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>373fc06c-c3e7-4ecb-bf30-88a8ae4eb700</UserSecretsId>

diff --git a/...zure.CosmosEventSourcing/EventSourcingCustomerAccount/EventSourcingCustomerAccount.csproj b/...zure.CosmosEventSourcing/EventSourcingCustomerAccount/EventSourcingCustomerAccount.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
       <UserSecretsId>55a00f1c-8604-4ac2-adf3-dd3127af43bc</UserSecretsId>

diff --git a/...rosoft.Azure.CosmosEventSourcing/EventSourcingJobsTracker/EventSourcingJobsTracker.csproj b/...rosoft.Azure.CosmosEventSourcing/EventSourcingJobsTracker/EventSourcingJobsTracker.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
       <UserSecretsId>ce605ed2-3eba-45c1-8970-76b34c1c2837</UserSecretsId>

diff --git a/...es/Microsoft.Azure.CosmosRepository.AspNetCore/ChangeFeedConsole/ChangeFeedConsole.csproj b/...es/Microsoft.Azure.CosmosRepository.AspNetCore/ChangeFeedConsole/ChangeFeedConsole.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/samples/Microsoft.Azure.CosmosRepository.AspNetCore/ChangeFeedWeb/ChangeFeedWeb.csproj b/samples/Microsoft.Azure.CosmosRepository.AspNetCore/ChangeFeedWeb/ChangeFeedWeb.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
       <UserSecretsId>66ceb007-2b64-4ecc-8234-8eb82effee6b</UserSecretsId>

diff --git a/samples/Microsoft.Azure.CosmosRepository/AzureFunctionTier/AzureFunctionTier.csproj b/samples/Microsoft.Azure.CosmosRepository/AzureFunctionTier/AzureFunctionTier.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>

diff --git a/samples/Microsoft.Azure.CosmosRepository/BugSandbox/BugSandbox.csproj b/samples/Microsoft.Azure.CosmosRepository/BugSandbox/BugSandbox.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/Microsoft.Azure.CosmosRepository/BugSandbox/Program.cs b/samples/Microsoft.Azure.CosmosRepository/BugSandbox/Program.cs
@@ -57,7 +57,7 @@ await repository.CreateAsync(
 
 public class ExampleModel : Item
 {
-    public string Category { get; set; }
+    public required string Category { get; set; }
 }
 
 public class ExampleSpecification : DefaultSpecification<ExampleModel>

diff --git a/samples/Microsoft.Azure.CosmosRepository/InMemoryWebTier/InMemoryWebTier.csproj b/samples/Microsoft.Azure.CosmosRepository/InMemoryWebTier/InMemoryWebTier.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...t.Azure.CosmosRepository/OptimisticConcurrencyControl/OptimisticConcurrencyControl.csproj b/...t.Azure.CosmosRepository/OptimisticConcurrencyControl/OptimisticConcurrencyControl.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <UserSecretsId>fd4da918-55af-4010-9ba0-e75f0e0dc917</UserSecretsId>

diff --git a/samples/Microsoft.Azure.CosmosRepository/Paging/Paging.csproj b/samples/Microsoft.Azure.CosmosRepository/Paging/Paging.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <UserSecretsId>9c9f04ba-0288-4b94-a15e-c669da85dfad</UserSecretsId>
     </PropertyGroup>
 

diff --git a/samples/Microsoft.Azure.CosmosRepository/ServiceTier/Program.cs b/samples/Microsoft.Azure.CosmosRepository/ServiceTier/Program.cs
@@ -59,7 +59,7 @@ static async Task RoundtripCrudOpsOnPeopleRepositoryAsync(IRepository<Person> re
 
     // Creating...
     Console.WriteLine("[Person] Repository creating...");
-    _ = await repository.CreateAsync(new[] { maryShaw, calvinWeatherfield });
+    _ = await repository.CreateAsync([maryShaw, calvinWeatherfield]);
 
     // Reading...
     Person mary = await repository.GetAsync(maryShaw.Id, maryShaw.SyntheticPartitionKey);
@@ -117,7 +117,7 @@ static async Task VerifyUpdates(IRepository<Widget> repo)
 
     // Creating...
     Console.WriteLine("[Widget] Repository creating...");
-    _ = await repository.CreateAsync(new[] { widget1, widget2 });
+    _ = await repository.CreateAsync([widget1, widget2]);
 
     // Reading...
     Widget contraption = await repository.GetAsync(widget1.Id);
@@ -208,9 +208,9 @@ static async Task ServiceExampleAsync(IExampleService service)
 
     // Deleting...
     Console.WriteLine("[Person] Service deleting...");
-    await Task.WhenAll(new[]
-    {
+    await Task.WhenAll(
+    [
         service.DeletePersonAsync(james).AsTask(),
         service.DeletePersonAsync(adele).AsTask()
-    });
+    ]);
 }
diff --git a/samples/Microsoft.Azure.CosmosRepository/ServiceTier/ServiceTier.csproj b/samples/Microsoft.Azure.CosmosRepository/ServiceTier/ServiceTier.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Azure.CosmosRepository\Microsoft.Azure.CosmosRepository.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Microsoft.Azure.CosmosRepository/Specification/Specification.csproj b/samples/Microsoft.Azure.CosmosRepository/Specification/Specification.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/...es/Microsoft.Azure.CosmosRepository/WebTier.Integration.Tests/LanguagesControllerTests.cs b/...es/Microsoft.Azure.CosmosRepository/WebTier.Integration.Tests/LanguagesControllerTests.cs
@@ -37,7 +37,7 @@ public async Task Post_Always_Creates_A_Language()
             Id = string.Empty,
             Name = "C#",
             Description = "A language created by Microsoft.",
-            Aliases = new[] { "C#", ".NET" },
+            Aliases = ["C#", ".NET"],
             PrimaryStyle = ProgrammingStyle.ObjectOriented,
             InitialReleaseDate = new DateTime(2001, 10, 25)
         };

diff --git a/...crosoft.Azure.CosmosRepository/WebTier.Integration.Tests/WebTier.Integration.Tests.csproj b/...crosoft.Azure.CosmosRepository/WebTier.Integration.Tests/WebTier.Integration.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/samples/Microsoft.Azure.CosmosRepository/WebTier/WebTier.csproj b/samples/Microsoft.Azure.CosmosRepository/WebTier/WebTier.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>faa0315d-a570-4d95-9c36-14570d154189</UserSecretsId>
   </PropertyGroup>
 

diff --git a/src/Microsoft.Azure.CosmosEventSourcing/Builders/DefaultCosmosEventSourcingBuilder.cs b/src/Microsoft.Azure.CosmosEventSourcing/Builders/DefaultCosmosEventSourcingBuilder.cs
@@ -62,7 +62,7 @@ public ICosmosEventSourcingBuilder AddDomainEventTypes(
                 .Where(type => typeof(IDomainEvent).IsAssignableFrom(type)))
             .ToList();
 
-        types.ForEach(t => DomainEventConverter.ConvertableTypes.Add(t));
+        types.ForEach(t => DomainEventConverter.ConvertibleTypes.Add(t));
 
         return this;
     }

diff --git a/src/Microsoft.Azure.CosmosEventSourcing/Converters/DomainEventConverter.cs b/src/Microsoft.Azure.CosmosEventSourcing/Converters/DomainEventConverter.cs
@@ -9,34 +9,33 @@ namespace Microsoft.Azure.CosmosEventSourcing.Converters;
 
 internal class DomainEventConverter : JsonConverter
 {
-    public static HashSet<Type> ConvertableTypes { get; } = [];
+    public static HashSet<Type> ConvertibleTypes { get; } = [];
 
-    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
-        serializer.Serialize(writer, value, value.GetType());
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) =>
+        serializer.Serialize(writer, value, objectType: value?.GetType() ?? throw new ArgumentNullException(nameof(value)));
 
-    public override object ReadJson(
+    public override object? ReadJson(
         JsonReader reader,
         Type objectType,
-        object existingValue,
+        object? existingValue,
         JsonSerializer serializer)
     {
         try
         {
             var j = JToken.ReadFrom(reader);
             var type = j["eventName"]?.ToString();
             type ??= j["EventName"]?.ToString();
-            Type? payloadType = ConvertableTypes.FirstOrDefault(x => x.Name == type);
+            Type? payloadType = ConvertibleTypes.FirstOrDefault(x => x.Name == type);
 
-            if (payloadType is null)
+            return payloadType switch
             {
-                return new NonDeserializableEvent
+                null => new NonDeserializableEvent
                 {
                     Name = type ?? "not-defined",
-                    Payload = j.ToObject<JObject>()
-                };
-            }
-
-            return j.ToObject(payloadType);
+                    Payload = j.ToObject<JObject>() ?? []
+                },
+                _ => j.ToObject(payloadType)
+            };
         }
         catch (Exception e)
         {

diff --git a/src/Microsoft.Azure.CosmosEventSourcing/Extensions/ServiceCollectionExtensions.cs b/src/Microsoft.Azure.CosmosEventSourcing/Extensions/ServiceCollectionExtensions.cs
@@ -28,7 +28,7 @@ public static IServiceCollection AddCosmosEventSourcing(
         Action<ICosmosEventSourcingBuilder> eventSourcingBuilder)
     {
         DefaultCosmosEventSourcingBuilder builder = new(services);
-        DomainEventConverter.ConvertableTypes.Add(typeof(AtomicEvent));
+        DomainEventConverter.ConvertibleTypes.Add(typeof(AtomicEvent));
         eventSourcingBuilder.Invoke(builder);
         services.AddScoped<IContextService, DefaultContextService>();
         services.AddScoped(typeof(IEventStore<>), typeof(DefaultEventStore<>));

diff --git a/src/Microsoft.Azure.CosmosEventSourcing/Projections/DefaultDomainEventProjection.cs b/src/Microsoft.Azure.CosmosEventSourcing/Projections/DefaultDomainEventProjection.cs
@@ -46,7 +46,7 @@ await Task.WhenAll(handlers.Select(handler =>
             try
             {
                 var result = handlerType.GetMethod("HandleAsync")?
-                    .Invoke(handler, new object[] { eventItem.DomainEvent, eventItem, cancellationToken });
+                    .Invoke(handler, [eventItem.DomainEvent, eventItem, cancellationToken]);
 
                 if (result is ValueTask valueTask)
                 {