From 4420b2bcc1eb8cfd8b8e886acf003d63b1ce5d27 Mon Sep 17 00:00:00 2001 From: costellobot <102549341+costellobot@users.noreply.github.com> Date: Wed, 22 May 2024 09:51:28 +0100 Subject: [PATCH] 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 --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- Directory.Packages.props | 25 +++++++++++-------- NuGet.config | 8 ------ global.json | 2 +- .../LondonTravel.Site.AppHost.csproj | 3 +++ src/LondonTravel.Site.AppHost/Program.cs | 9 ++++--- .../LondonTravel.Site.csproj | 3 +++ src/LondonTravel.Site/Program.cs | 3 ++- 9 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f90d0466a..424266eae 100644 --- 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 index bea301d9d..6df6bf085 100644 --- 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 index 6b019d6ca..2cd23d9df 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,11 +5,14 @@ - - - - - + + + + @@ -19,14 +22,14 @@ - - - - - + + + + + - + diff --git a/NuGet.config b/NuGet.config index 7af2233fe..c5a1db116 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,22 +2,14 @@ - - - - - - - - diff --git a/global.json b/global.json index b35a5aa72..4713f9695 100644 --- 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 index a86194fa7..c1c3666df 100644 --- a/src/LondonTravel.Site.AppHost/LondonTravel.Site.AppHost.csproj +++ b/src/LondonTravel.Site.AppHost/LondonTravel.Site.AppHost.csproj @@ -6,7 +6,10 @@ + diff --git a/src/LondonTravel.Site.AppHost/Program.cs b/src/LondonTravel.Site.AppHost/Program.cs index a918e8113..224a38c6e 100644 --- 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("LondonTravelSite") - .WithReference(cosmos); +builder.AddProject("LondonTravelSite"); +//// .WithReference(cosmos); var app = builder.Build(); diff --git a/src/LondonTravel.Site/LondonTravel.Site.csproj b/src/LondonTravel.Site/LondonTravel.Site.csproj index 72acee393..b5ebc2aab 100644 --- a/src/LondonTravel.Site/LondonTravel.Site.csproj +++ b/src/LondonTravel.Site/LondonTravel.Site.csproj @@ -19,7 +19,10 @@ en-GB;en-US;qps-Ploc + diff --git a/src/LondonTravel.Site/Program.cs b/src/LondonTravel.Site/Program.cs index 5b3c14476..24a7020d1 100644 --- a/src/LondonTravel.Site/Program.cs +++ b/src/LondonTravel.Site/Program.cs @@ -168,7 +168,8 @@ builder.Services.AddSingleton(TimeProvider.System); builder.Services.AddSingleton(); -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(); builder.Services.TryAddSingleton();