Skip to content

Commit f53a14c

Browse files
authored
Change API template to only use Invariant Globalization in Native AOT… (#48238)
* Change API template to only use Invariant Globalization in Native AOT mode.
1 parent f56c242 commit f53a14c

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

src/ProjectTemplates/Web.ProjectTemplates/Api-CSharp.csproj.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">true</NoDefaultLaunchSettingsFile>
88
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
99
<ServerGarbageCollection>false</ServerGarbageCollection>
10-
<InvariantGlobalization>true</InvariantGlobalization>
1110
<!--#if (NativeAot) -->
11+
<InvariantGlobalization>true</InvariantGlobalization>
1212
<PublishAot>true</PublishAot>
1313
<!--#endif -->
1414
</PropertyGroup>

src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<InvariantGlobalization>true</InvariantGlobalization>
87
<!--#if (NativeAot) -->
8+
<InvariantGlobalization>true</InvariantGlobalization>
99
<PublishAot>true</PublishAot>
1010
<!--#endif -->
1111
</PropertyGroup>

src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<InvariantGlobalization>true</InvariantGlobalization>
87
<!--#if (NativeAot) -->
8+
<InvariantGlobalization>true</InvariantGlobalization>
99
<PublishAot>true</PublishAot>
1010
<!--#endif -->
1111
<UserSecretsId>dotnet-Company.Application1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>

src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ private async Task ApiTemplateCore(string languageOverride, string[] args = null
7373
: new[] { "http", "IIS Express" };
7474
await project.VerifyLaunchSettings(expectedLaunchProfileNames);
7575

76-
await project.VerifyHasProperty("InvariantGlobalization", "true");
76+
if (nativeAot)
77+
{
78+
await project.VerifyHasProperty("InvariantGlobalization", "true");
79+
}
7780

7881
// Avoid the F# compiler. See https://github.com/dotnet/aspnetcore/issues/14022
7982
if (languageOverride != null)

src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ private async Task GrpcTemplateCore(string[] args = null)
8585
var expectedLaunchProfileNames = new[] { "http", "https" };
8686
await project.VerifyLaunchSettings(expectedLaunchProfileNames);
8787

88-
await project.VerifyHasProperty("InvariantGlobalization", "true");
88+
if (nativeAot)
89+
{
90+
await project.VerifyHasProperty("InvariantGlobalization", "true");
91+
}
8992

9093
// Force a restore if native AOT so that RID-specific assets are restored
9194
await project.RunDotNetPublishAsync(noRestore: !nativeAot);

src/ProjectTemplates/test/Templates.Tests/WorkerTemplateTest.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ private async Task WorkerTemplateCoreAsync(string language, string[] args)
5858

5959
await project.RunDotNetNewAsync("worker", language: language, args: args);
6060

61-
await project.VerifyHasProperty("InvariantGlobalization", "true");
61+
if (nativeAot)
62+
{
63+
await project.VerifyHasProperty("InvariantGlobalization", "true");
64+
}
6265

6366
// Force a restore if native AOT so that RID-specific assets are restored
6467
await project.RunDotNetPublishAsync(noRestore: !nativeAot);

0 commit comments

Comments
 (0)