From 4a60f414a17629ff00d70610ce23d3575c4807cd Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Fri, 17 Nov 2023 08:06:17 +0800
Subject: [PATCH] Update to GA .NET 8 SDK (#2321)

---
 Directory.Build.props                            | 2 +-
 build/dependencies.props                         | 6 +++---
 build/get-dotnet.sh                              | 2 +-
 examples/Container/Backend/Dockerfile            | 4 ++--
 examples/Container/Frontend/Dockerfile           | 4 ++--
 global.json                                      | 2 +-
 testassets/InteropTestsGrpcWebWebsite/Dockerfile | 4 ++--
 testassets/InteropTestsWebsite/Dockerfile        | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 69adbc47f..e30431ee5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -23,7 +23,7 @@
     <NoWarn>$(NoWarn);NETSDK1195;NETSDK1210</NoWarn>
 
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/build/dependencies.props b/build/dependencies.props
index 6626a12af..0ba3b4266 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -6,15 +6,15 @@
     <GrpcDotNetPackageVersion>2.55.0</GrpcDotNetPackageVersion>  <!-- Used by example projects -->
     <GrpcPackageVersion>2.46.6</GrpcPackageVersion>
     <GrpcToolsPackageVersion>2.59.0</GrpcToolsPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>8.0.0-rc.1.23378.7</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>8.0.0</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftAspNetCoreApp7PackageVersion>7.0.5</MicrosoftAspNetCoreApp7PackageVersion>
     <MicrosoftAspNetCoreApp6PackageVersion>6.0.11</MicrosoftAspNetCoreApp6PackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.5.5</MicrosoftBuildLocatorPackageVersion>
     <MicrosoftBuildPackageVersion>16.9.0</MicrosoftBuildPackageVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>8.0.0-preview1.23165.1</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>8.0.0-preview.23525.2</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
     <MicrosoftCrankEventSourcesPackageVersion>0.2.0-alpha.21255.1</MicrosoftCrankEventSourcesPackageVersion>
     <MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftExtensionsPackageVersion>8.0.0-rc.1.23379.1</MicrosoftExtensionsPackageVersion>
+    <MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
     <MicrosoftExtensions6PackageVersion>6.0.0</MicrosoftExtensions6PackageVersion>
     <MicrosoftNETTestSdkPackageVersion>17.6.2</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftSourceLinkGitHubPackageVersion>1.1.1</MicrosoftSourceLinkGitHubPackageVersion>
diff --git a/build/get-dotnet.sh b/build/get-dotnet.sh
index 18eb4c6ff..05616b74d 100755
--- a/build/get-dotnet.sh
+++ b/build/get-dotnet.sh
@@ -18,7 +18,7 @@ ensure_dir() {
 # main
 
 # resolve SDK version
-sdk_version="8.0.100-rc.1.23407.2"
+sdk_version=$(jq -r .sdk.version $global_json_path)
 
 # download dotnet-install.sh
 ensure_dir $OBJDIR
diff --git a/examples/Container/Backend/Dockerfile b/examples/Container/Backend/Dockerfile
index 19b794071..6f9d6ccfd 100644
--- a/examples/Container/Backend/Dockerfile
+++ b/examples/Container/Backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0-preview AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Copy everything
@@ -8,7 +8,7 @@ RUN dotnet restore examples/Container/Backend
 RUN dotnet publish examples/Container/Backend -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0-preview
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "Backend.dll"]
\ No newline at end of file
diff --git a/examples/Container/Frontend/Dockerfile b/examples/Container/Frontend/Dockerfile
index 09ebb01b3..4acbb839b 100644
--- a/examples/Container/Frontend/Dockerfile
+++ b/examples/Container/Frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0-preview AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Copy everything
@@ -8,7 +8,7 @@ RUN dotnet restore examples/Container/Frontend
 RUN dotnet publish examples/Container/Frontend -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0-preview
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "Frontend.dll"]
\ No newline at end of file
diff --git a/global.json b/global.json
index c44660e01..391ba3c2a 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.7.23376.3",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/testassets/InteropTestsGrpcWebWebsite/Dockerfile b/testassets/InteropTestsGrpcWebWebsite/Dockerfile
index cd82ea52b..a38769bae 100644
--- a/testassets/InteropTestsGrpcWebWebsite/Dockerfile
+++ b/testassets/InteropTestsGrpcWebWebsite/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0-preview AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Copy everything
@@ -8,7 +8,7 @@ RUN dotnet restore testassets/InteropTestsGrpcWebWebsite
 RUN dotnet publish testassets/InteropTestsGrpcWebWebsite -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0-preview
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "InteropTestsGrpcWebWebsite.dll", "--urls", "http://+:80"]
diff --git a/testassets/InteropTestsWebsite/Dockerfile b/testassets/InteropTestsWebsite/Dockerfile
index b60d6d6df..c8f901a95 100644
--- a/testassets/InteropTestsWebsite/Dockerfile
+++ b/testassets/InteropTestsWebsite/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0-preview AS build-env
+FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Copy everything
@@ -8,7 +8,7 @@ RUN dotnet restore testassets/InteropTestsWebsite
 RUN dotnet publish testassets/InteropTestsWebsite --framework net8.0 -c Release -o out -p:LatestFramework=true
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0-preview
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "InteropTestsWebsite.dll", "--port_http1", "80"]
\ No newline at end of file