Skip to content

Change API template to only use Invariant Globalization in Native AOT… #48238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 26, 2023
Merged

Change API template to only use Invariant Globalization in Native AOT… #48238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b00423f
Change API template to only use Invariant Globalization in Native AOT…
mitchdenny May 15, 2023
6b2ce3d
Updated gRPC and worker templates as well.
mitchdenny May 25, 2023
621bcde
Tweak template tests to only test for InvariantGlobalization is -aot …
mitchdenny May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ProjectTemplates/Web.ProjectTemplates/Api-CSharp.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion src/ProjectTemplates/test/Templates.Tests/ApiTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 4 additions & 1 deletion src/ProjectTemplates/test/Templates.Tests/WorkerTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down