Merged PR 9371: Revive support for globalization and localization in …

…Blazor WASM Revive support for globalization and localization in Blazor WASM * Load icu and timezone data files * Unskip tests Fixes dotnet/aspnetcore#24174 Fixes dotnet/aspnetcore#22975 Fixes dotnet/aspnetcore#23260 Commit migrated from dotnet/aspnetcore@3e7a10649154
dougbu · Jul 28, 2020 · 0a7ab2f · 0a7ab2f
1 parent 0d5b0bb
commit 0a7ab2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/BlazorWasm.web.config b/src/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/BlazorWasm.web.config
@@ -2,6 +2,7 @@
 <configuration>
   <system.webServer>
     <staticContent>
+      <remove fileExtension=".blat" />
       <remove fileExtension=".dat" />
       <remove fileExtension=".dll" />
       <remove fileExtension=".json" />

diff --git a/...ft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets b/...ft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
@@ -106,6 +106,9 @@ Copyright (c) .NET Foundation. All rights reserved.
       <!-- Clear out temporary build artifacts that the runtime packages -->
       <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Extension)' == '.a'" />
 
+      <!-- Remove the timezone file if time-zone support is disabled -->
+      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'$(BlazorEnableTimeZoneSupport)' == 'false' AND '%(ReferenceCopyLocalPaths.FileName)' == 'dotnet.timezones'" />
+
       <!--
         ReferenceCopyLocalPaths includes satellite assemblies from referenced projects but are inexpicably missing
         any metadata that might allow them to be differentiated. We'll explicitly add those