From b00423f1a8bf77366156f0e2ab921857dbdfc13a Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Mon, 15 May 2023 22:48:24 +1000
Subject: [PATCH 1/3] Change API template to only use Invariant Globalization
 in Native AOT mode.

---
 src/ProjectTemplates/Web.ProjectTemplates/Api-CSharp.csproj.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Api-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/Api-CSharp.csproj.in
index ae3d10f13686..29f63b2c6e5b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/Api-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/Api-CSharp.csproj.in
@@ -7,8 +7,8 @@
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">true</NoDefaultLaunchSettingsFile>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
     <ServerGarbageCollection>false</ServerGarbageCollection>
-    <InvariantGlobalization>true</InvariantGlobalization>
     <!--#if (NativeAot) -->
+    <InvariantGlobalization>true</InvariantGlobalization>
     <PublishAot>true</PublishAot>
     <!--#endif -->
   </PropertyGroup>

From 6b2ce3d92ce69e44fd69d29887438bb6a9c4b55a Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Thu, 25 May 2023 12:22:57 +1000
Subject: [PATCH 2/3] Updated gRPC and worker templates as well.

---
 .../Web.ProjectTemplates/GrpcService-CSharp.csproj.in           | 2 +-
 .../Web.ProjectTemplates/Worker-CSharp.csproj.in                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in
index f676e5c9f08d..6c6f9d130021 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in
@@ -4,8 +4,8 @@
     <TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <InvariantGlobalization>true</InvariantGlobalization>
     <!--#if (NativeAot) -->
+    <InvariantGlobalization>true</InvariantGlobalization>
     <PublishAot>true</PublishAot>
     <!--#endif -->
   </PropertyGroup>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in
index 718f5ad3a152..e16c7d8505a1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in
@@ -4,8 +4,8 @@
     <TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <InvariantGlobalization>true</InvariantGlobalization>
     <!--#if (NativeAot) -->
+    <InvariantGlobalization>true</InvariantGlobalization>
     <PublishAot>true</PublishAot>
     <!--#endif -->
     <UserSecretsId>dotnet-Company.Application1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>

From 621bcde4bfbca6154e383238eeeefb893b08fa1b Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Fri, 26 May 2023 11:00:22 +1000
Subject: [PATCH 3/3] Tweak template tests to only test for
 InvariantGlobalization is -aot is specified.

---
 src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs | 5 ++++-
 .../test/Templates.Tests/GrpcTemplateTest.cs                 | 5 ++++-
 .../test/Templates.Tests/WorkerTemplateTest.cs               | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs
index 1922f3516239..90bbfffe12a9 100644
--- a/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs
@@ -73,7 +73,10 @@ private async Task ApiTemplateCore(string languageOverride, string[] args = null
             : new[] { "http", "IIS Express" };
         await project.VerifyLaunchSettings(expectedLaunchProfileNames);
 
-        await project.VerifyHasProperty("InvariantGlobalization", "true");
+        if (nativeAot)
+        {
+            await project.VerifyHasProperty("InvariantGlobalization", "true");
+        }
 
         // Avoid the F# compiler. See https://github.com/dotnet/aspnetcore/issues/14022
         if (languageOverride != null)
diff --git a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs
index 2f4a01b39e62..13cb09f79b85 100644
--- a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs
@@ -85,7 +85,10 @@ private async Task GrpcTemplateCore(string[] args = null)
         var expectedLaunchProfileNames = new[] { "http", "https" };
         await project.VerifyLaunchSettings(expectedLaunchProfileNames);
 
-        await project.VerifyHasProperty("InvariantGlobalization", "true");
+        if (nativeAot)
+        {
+            await project.VerifyHasProperty("InvariantGlobalization", "true");
+        }
 
         // Force a restore if native AOT so that RID-specific assets are restored
         await project.RunDotNetPublishAsync(noRestore: !nativeAot);
diff --git a/src/ProjectTemplates/test/Templates.Tests/WorkerTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/WorkerTemplateTest.cs
index 8206e8a78e58..d948a1c34551 100644
--- a/src/ProjectTemplates/test/Templates.Tests/WorkerTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/WorkerTemplateTest.cs
@@ -58,7 +58,10 @@ private async Task WorkerTemplateCoreAsync(string language, string[] args)
 
         await project.RunDotNetNewAsync("worker", language: language, args: args);
 
-        await project.VerifyHasProperty("InvariantGlobalization", "true");
+        if (nativeAot)
+        {
+            await project.VerifyHasProperty("InvariantGlobalization", "true");
+        }
 
         // Force a restore if native AOT so that RID-specific assets are restored
         await project.RunDotNetPublishAsync(noRestore: !nativeAot);