From cec53c90167c49b275dc070798283bbcd8cc1efd Mon Sep 17 00:00:00 2001
From: alexyaang <59073590+alexyaang@users.noreply.github.com>
Date: Fri, 25 Aug 2023 13:57:48 -0400
Subject: [PATCH 1/2] added new image convention for .NET 8 RC release

---
 .../netCore/NetCoreGatherInformationStep.ts    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts b/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts
index 7608674836..fe87c83204 100644
--- a/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts
+++ b/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts
@@ -53,16 +53,14 @@ export class NetCoreGatherInformationStep extends GatherInformationStep<NetCoreS
             wizardContext.netCoreRuntimeBaseImage = wizardContext.platform === '.NET: ASP.NET Core' ? `${aspNetBaseImage}:${netCoreVersion.major}.${netCoreVersion.minor}` : `${consoleNetBaseImage}:${netCoreVersion.major}.${netCoreVersion.minor}`;
             wizardContext.netCoreSdkBaseImage = `${netSdkImage}:${netCoreVersion.major}.${netCoreVersion.minor}`;
 
-            if (netCoreVersion.major === 8) {
-                if (wizardContext.netCorePlatformOS === 'Windows') {
-                    // append '-preview-nanoserver-ltsc2022' for windows base images for .NET 8's new naming convention
-                    wizardContext.netCoreRuntimeBaseImage = `${wizardContext.netCoreRuntimeBaseImage}-preview-nanoserver-1809`;
-                    wizardContext.netCoreSdkBaseImage = `${wizardContext.netCoreSdkBaseImage}-preview-nanoserver-1809`;
-                } else {
-                    // append '-preview' for everything else
-                    wizardContext.netCoreRuntimeBaseImage = `${wizardContext.netCoreRuntimeBaseImage}-preview`;
-                    wizardContext.netCoreSdkBaseImage = `${wizardContext.netCoreSdkBaseImage}-preview`;
-                }
+            if (netCoreVersion.major === 9) {
+                wizardContext.netCoreRuntimeBaseImage = `${wizardContext.netCoreRuntimeBaseImage}-preview`;
+                wizardContext.netCoreSdkBaseImage = `${wizardContext.netCoreSdkBaseImage}-preview`;
+            }
+            // append '-nanoserver-ltsc2022' for windows base images for .NET 8+'s new naming convention
+            if (wizardContext.netCorePlatformOS === 'Windows') {
+                wizardContext.netCoreRuntimeBaseImage = `${wizardContext.netCoreRuntimeBaseImage}-nanoserver-1809`;
+                wizardContext.netCoreSdkBaseImage = `${wizardContext.netCoreSdkBaseImage}-nanoserver-1809`;
             }
 
             // change default user to adapt to Debian 12

From aa11f615ceeb46b111e9b7a0a64455f123a80571 Mon Sep 17 00:00:00 2001
From: alexyaang <59073590+alexyaang@users.noreply.github.com>
Date: Tue, 12 Sep 2023 10:27:15 -0400
Subject: [PATCH 2/2] added constant

---
 src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts b/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts
index fe87c83204..6cd9c7e5d4 100644
--- a/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts
+++ b/src/scaffolding/wizard/netCore/NetCoreGatherInformationStep.ts
@@ -20,6 +20,7 @@ const netSdkImage = 'mcr.microsoft.com/dotnet/sdk';
 
 const cSharpConfigId = 'csharp';
 const cSharpPromptSetting = 'suppressBuildAssetsNotification';
+const NetCorePreviewVersion = 9;
 
 export class NetCoreGatherInformationStep extends GatherInformationStep<NetCoreScaffoldingWizardContext> {
     private targetFramework: string;
@@ -53,7 +54,7 @@ export class NetCoreGatherInformationStep extends GatherInformationStep<NetCoreS
             wizardContext.netCoreRuntimeBaseImage = wizardContext.platform === '.NET: ASP.NET Core' ? `${aspNetBaseImage}:${netCoreVersion.major}.${netCoreVersion.minor}` : `${consoleNetBaseImage}:${netCoreVersion.major}.${netCoreVersion.minor}`;
             wizardContext.netCoreSdkBaseImage = `${netSdkImage}:${netCoreVersion.major}.${netCoreVersion.minor}`;
 
-            if (netCoreVersion.major === 9) {
+            if (netCoreVersion.major >= NetCorePreviewVersion) {
                 wizardContext.netCoreRuntimeBaseImage = `${wizardContext.netCoreRuntimeBaseImage}-preview`;
                 wizardContext.netCoreSdkBaseImage = `${wizardContext.netCoreSdkBaseImage}-preview`;
             }