Merge pull request #17 from Cabazure/net9.0

Update to net9.0
Cabazure · Nov 14, 2024 · d986904 · d986904
2 parents dbce6f3 + 01fe893
commit d986904
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,10 +28,10 @@ jobs:
       - name: 🛒 Checkout repository
         uses: actions/checkout@v4
 
-      - name: ⚙️ Setup dotnet 8.0.x
+      - name: ⚙️ Setup dotnet 9.0.x
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: 🧹 Clean
         run: dotnet clean -c Release && dotnet nuget locals all --clear

diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml
@@ -23,10 +23,10 @@ jobs:
       - name: 🏷️ Set VERSION variable from tag
         run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
 
-      - name: ⚙️ Setup dotnet 8.0.x
+      - name: ⚙️ Setup dotnet 9.0.x
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: 🧹 Clean
         run: dotnet clean -c Release && dotnet nuget locals all --clear

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,10 +28,10 @@ jobs:
       - name: 🏷️ Set VERSION variable from tag
         run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
 
-      - name: ⚙️ Setup dotnet 8.0.x
+      - name: ⚙️ Setup dotnet 9.0.x
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: 🧹 Clean
         run: dotnet clean -c Release && dotnet nuget locals all --clear

diff --git a/samples/AzureRest/AzureRest.Contracts/AzureRest.Contracts.csproj b/samples/AzureRest/AzureRest.Contracts/AzureRest.Contracts.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/AzureRest/AzureRest.TestApp/AzureRest.TestApp.csproj b/samples/AzureRest/AzureRest.TestApp/AzureRest.TestApp.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Azure.Identity" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cabazure.Client.Runtime/Cabazure.Client.Runtime.csproj b/src/Cabazure.Client.Runtime/Cabazure.Client.Runtime.csproj
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.43.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="Azure.Core" Version="1.44.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cabazure.Client/Cabazure.Client.csproj b/src/Cabazure.Client/Cabazure.Client.csproj
@@ -7,7 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>Latest</LangVersion>
-    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <EnablePackageValidation>true</EnablePackageValidation>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -36,10 +36,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-    <PackageReference Include="Azure.Core" Version="1.43.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
+    <PackageReference Include="Azure.Core" Version="1.44.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cabazure.Client/ClientInitializationGenerator.cs b/src/Cabazure.Client/ClientInitializationGenerator.cs
@@ -139,7 +139,8 @@ void BuildHttpClient(IHttpClientBuilder b)
                             builder?.Invoke(b);
                         }
             
-                        return services.AddCabazureClient(
+                        return AddCabazureClient(
+                            services,
                             clientName,
                             jsonOptions,
                             BuildHttpClient);

diff --git a/test/Cabazure.Client.IntegrationTests/Cabazure.Client.IntegrationTests.csproj b/test/Cabazure.Client.IntegrationTests/Cabazure.Client.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Test" Version="1.1.2" />
+    <PackageReference Include="Atc.Test" Version="1.1.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/test/Cabazure.Client.Runtime.Tests/Cabazure.Client.Runtime.Tests.csproj b/test/Cabazure.Client.Runtime.Tests/Cabazure.Client.Runtime.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Test" Version="1.1.2" />
+    <PackageReference Include="Atc.Test" Version="1.1.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/test/Cabazure.Client.Tests/Cabazure.Client.Tests.csproj b/test/Cabazure.Client.Tests/Cabazure.Client.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,14 +10,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Verify.XUnit" Version="26.6.0" />
+    <PackageReference Include="Verify.XUnit" Version="28.2.1" />
     <PackageReference Include="Verify.SourceGenerators" Version="2.5.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Test" Version="1.1.2" />
+    <PackageReference Include="Atc.Test" Version="1.1.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...neratorTests.CanGenerate_Initialization#ClientInitialization.Implementation.g.verified.cs b/...neratorTests.CanGenerate_Initialization#ClientInitialization.Implementation.g.verified.cs
@@ -64,7 +64,8 @@ void BuildHttpClient(IHttpClientBuilder b)
                 builder?.Invoke(b);
             }
 
-            return services.AddCabazureClient(
+            return AddCabazureClient(
+                services,
                 clientName,
                 jsonOptions,
                 BuildHttpClient);