Update .NET SDK to 9.0.100-preview.4.24267.66 (#2455)

* Update .NET SDK Update .NET SDK to version 9.0.100-preview.4.24267.66. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 9.0.100-preview.4.24267.66 SDK. Bumps Aspire.Hosting.AppHost from 9.0.0-preview.3.24210.17 to 9.0.0-preview.4.24229.9. Bumps Aspire.Hosting.Azure.CosmosDB from 9.0.0-preview.3.24210.17 to 9.0.0-preview.4.24229.9. Bumps Aspire.Microsoft.Azure.Cosmos from 9.0.0-preview.3.24210.17 to 9.0.0-preview.4.24229.9. Bumps AspNet.Security.OAuth.Amazon from 9.0.0-preview.3.24211.70 to 9.0.0-preview.4.24271.72. Bumps AspNet.Security.OAuth.Apple from 9.0.0-preview.3.24211.70 to 9.0.0-preview.4.24271.72. Bumps AspNet.Security.OAuth.GitHub from 9.0.0-preview.3.24211.70 to 9.0.0-preview.4.24271.72. Bumps Microsoft.AspNetCore.Authentication.Google from 9.0.0-preview.3.24172.13 to 9.0.0-preview.5.24270.27. Bumps Microsoft.AspNetCore.Authentication.MicrosoftAccount from 9.0.0-preview.3.24172.13 to 9.0.0-preview.5.24270.27. Bumps Microsoft.AspNetCore.Authentication.Twitter from 9.0.0-preview.3.24172.13 to 9.0.0-preview.5.24270.27. Bumps Microsoft.AspNetCore.AzureAppServices.HostingStartup from 9.0.0-preview.3.24172.13 to 9.0.0-preview.5.24270.27. Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.3.24172.13 to 9.0.0-preview.5.24270.27. Bumps Microsoft.Extensions.Http.Resilience from 9.0.0-preview.3.24209.3 to 9.0.0-preview.5.24271.1. --- updated-dependencies: - dependency-name: Aspire.Hosting.AppHost dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Aspire.Hosting.Azure.CosmosDB dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Aspire.Microsoft.Azure.Cosmos dependency-type: direct:production update-type: version-update:semver-major - dependency-name: AspNet.Security.OAuth.Amazon dependency-type: direct:production update-type: version-update:semver-major - dependency-name: AspNet.Security.OAuth.Apple dependency-type: direct:production update-type: version-update:semver-major - dependency-name: AspNet.Security.OAuth.GitHub dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Authentication.Google dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Authentication.MicrosoftAccount dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Authentication.Twitter dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.AzureAppServices.HostingStartup dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Http.Resilience dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> * Fix build - Fix NuGet package updates. - Remove some parts of .NET Aspire until packages that support .NET 9 preview 4 are available. * Fix formatting Fix formatting. --------- Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> Co-authored-by: martincostello <martin@martincostello.com>
martincostello · May 23, 2024 · 4420b2b · 4420b2b
1 parent a9e09af
commit 4420b2b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -103,7 +103,7 @@ jobs:
 
     - name: Install .NET Workloads
       shell: pwsh
-      run: dotnet workload restore --skip-manifest-update --skip-sign-check
+      run: dotnet workload restore
 
     - name: Build, test and publish
       shell: pwsh

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -82,7 +82,7 @@ jobs:
     - name: Build .NET code
       if: matrix.language == 'csharp'
       run: |
-        dotnet workload restore --skip-manifest-update --skip-sign-check
+        dotnet workload restore
         dotnet build --configuration Release
 
     - name: Perform CodeQL Analysis

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,11 +5,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0-preview.3.24210.17" />
-    <PackageVersion Include="Aspire.Hosting.Azure.CosmosDB" Version="9.0.0-preview.3.24210.17" />
-    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="9.0.0-preview.3.24210.17" />
-    <PackageVersion Include="AspNet.Security.OAuth.Amazon" Version="9.0.0-preview.3.24211.70" />
-    <PackageVersion Include="AspNet.Security.OAuth.Apple" Version="9.0.0-preview.3.24211.70" />
-    <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="9.0.0-preview.3.24211.70" />
+    <!--
+    HACK Disabled until there are .NET 9 preview.4 packages available
+    <PackageVersion Include="Aspire.Hosting.Azure.CosmosDB" Version="9.0.0-preview.4.24229.9" />
+    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="9.0.0-preview.4.24229.9" />
+    -->
+    <PackageVersion Include="AspNet.Security.OAuth.Amazon" Version="9.0.0-preview.4.24271.72" />
+    <PackageVersion Include="AspNet.Security.OAuth.Apple" Version="9.0.0-preview.4.24271.72" />
+    <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="9.0.0-preview.4.24271.72" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
@@ -19,14 +22,14 @@
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageVersion Include="JustEat.HttpClientInterception" Version="4.3.0" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.3.24172.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.3.24172.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.0-preview.3.24172.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="9.0.0-preview.3.24172.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.3.24172.13" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.4.24267.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.4.24267.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.0-preview.4.24267.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="9.0.0-preview.4.24267.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.4.24267.6" />
     <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.40.0" />
     <PackageVersion Include="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21452.1" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.3.24209.3" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.4.24271.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Microsoft.Playwright" Version="1.44.0" />
     <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.4.4" />

diff --git a/NuGet.config b/NuGet.config
@@ -2,22 +2,14 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="aspire" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="aspnet-contrib" value="https://www.myget.org/F/aspnet-contrib/api/v3/index.json" />
-    <add key="azure-sdk-for-net" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
-    <packageSource key="aspire">
-      <package pattern="Aspire.*" />
-    </packageSource>
     <packageSource key="aspnet-contrib">
       <package pattern="AspNet.Security.OAuth.*" />
     </packageSource>
-    <packageSource key="azure-sdk-for-net">
-      <package pattern="Azure.*" />
-    </packageSource>
     <packageSource key="dotnet-eng">
       <package pattern="Microsoft.DotNet.XliffTasks" />
     </packageSource>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.3.24204.13",
+    "version": "9.0.100-preview.4.24267.66",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

diff --git a/src/LondonTravel.Site.AppHost/LondonTravel.Site.AppHost.csproj b/src/LondonTravel.Site.AppHost/LondonTravel.Site.AppHost.csproj
@@ -6,7 +6,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" />
+    <!--
+    HACK Disabled until there are .NET 9 preview.4 packages available
     <PackageReference Include="Aspire.Hosting.Azure.CosmosDB" />
+    -->
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LondonTravel.Site\LondonTravel.Site.csproj" />

diff --git a/src/LondonTravel.Site.AppHost/Program.cs b/src/LondonTravel.Site.AppHost/Program.cs
@@ -3,11 +3,12 @@
 
 var builder = DistributedApplication.CreateBuilder(args);
 
-var cosmos = builder.AddAzureCosmosDB("Cosmos")
-                    .RunAsEmulator();
+//// HACK Disabled until there are .NET 9 preview.4 packages available
+////var cosmos = builder.AddAzureCosmosDB("Cosmos")
+////                   .RunAsEmulator();
 
-builder.AddProject<Projects.LondonTravel_Site>("LondonTravelSite")
-       .WithReference(cosmos);
+builder.AddProject<Projects.LondonTravel_Site>("LondonTravelSite");
+//// .WithReference(cosmos);
 
 var app = builder.Build();
 

diff --git a/src/LondonTravel.Site/LondonTravel.Site.csproj b/src/LondonTravel.Site/LondonTravel.Site.csproj
@@ -19,7 +19,10 @@
     <XlfLanguages>en-GB;en-US;qps-Ploc</XlfLanguages>
   </PropertyGroup>
   <ItemGroup>
+    <!--
+    HACK Disabled until there are .NET 9 preview.4 packages available
     <PackageReference Include="Aspire.Microsoft.Azure.Cosmos" />
+    -->
     <PackageReference Include="AspNet.Security.OAuth.Amazon" />
     <PackageReference Include="AspNet.Security.OAuth.Apple" />
     <PackageReference Include="AspNet.Security.OAuth.GitHub" />

diff --git a/src/LondonTravel.Site/Program.cs b/src/LondonTravel.Site/Program.cs
@@ -168,7 +168,8 @@
 builder.Services.AddSingleton(TimeProvider.System);
 builder.Services.AddSingleton<ITflServiceFactory, TflServiceFactory>();
 
-builder.AddAzureCosmosClient("Cosmos");
+// HACK Disabled until there are .NET 9 preview.4 packages available
+// builder.AddAzureCosmosClient("Cosmos");
 builder.Services.AddSingleton(DocumentHelpers.CreateClient);
 builder.Services.TryAddSingleton<IDocumentService, DocumentService>();
 builder.Services.TryAddSingleton<IDocumentCollectionInitializer, DocumentCollectionInitializer>();