[release/7.0] Fix encoding problem when publishing

NuGet.config

@@ -9,7 +9,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-2a1a284" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2a1a284c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-7fa7119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-7fa7119c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!--

eng/Version.Details.xml

@@ -48,13 +48,13 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.4">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.5">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>2a1a284cb9e62959ed261bba6cfc678612fc4559</Sha>
+      <Sha>7fa7119c1cdf1290aabb2391c3eee6ed42f8851d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.4">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.5">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>2a1a284cb9e62959ed261bba6cfc678612fc4559</Sha>
+      <Sha>7fa7119c1cdf1290aabb2391c3eee6ed42f8851d</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -22,8 +22,8 @@
     <UsingToolIbcOptimization>false</UsingToolIbcOptimization>
     <UsingToolXliff>false</UsingToolXliff>
     <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
-    <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.4</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
-    <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.4</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
+    <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.5</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
+    <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.5</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
   </PropertyGroup>
   <ItemGroup>
     <!-- The bands we want to produce workload manifests for -->

src/tasks/Common/Utils.cs

@@ -64,6 +64,9 @@ static string CreateTemporaryBatchFile(string command)
             using StreamWriter sw = new(file);
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
+                // set encoding to UTF-8 -> full Unicode support is needed for usernames -
+                // `command` contains tmp dir path with the username
+                sw.WriteLine(@"%SystemRoot%\System32\chcp.com 65001>nul");
                 sw.WriteLine("setlocal");
                 sw.WriteLine("set errorlevel=dummy");
                 sw.WriteLine("set errorlevel=");
@@ -187,29 +190,6 @@ public static (int, string) TryRunProcess(
         return (process.ExitCode, outputBuilder.ToString().Trim('\r', '\n'));
     }
 
-    internal static string CreateTemporaryBatchFile(string command)
-    {
-        string extn = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".cmd" : ".sh";
-        string file = Path.Combine(Path.GetTempPath(), $"tmp{Guid.NewGuid():N}{extn}");
-
-        using StreamWriter sw = new(file);
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-                sw.WriteLine("setlocal");
-                sw.WriteLine("set errorlevel=dummy");
-                sw.WriteLine("set errorlevel=");
-        }
-        else
-        {
-            // Use sh rather than bash, as not all 'nix systems necessarily have Bash installed
-            sw.WriteLine("#!/bin/sh");
-        }
-
-        sw.WriteLine(command);
-
-        return file;
-    }
-
     public static bool CopyIfDifferent(string src, string dst, bool useHash)
     {
         if (!File.Exists(src))

src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
         [InlineData("Release")]
         public void DefaultTemplate_WithoutWorkload(string config)
         {
-            string id = $"blz_no_workload_{config}";
+            string id = $"blz_no_workload_{config}{s_unicodeChar}";
             CreateBlazorWasmTemplateProject(id);
 
             // Build

src/tests/BuildWasmApps/Wasm.Build.Tests/BuildPublishTests.cs

@@ -25,7 +25,7 @@ public BuildPublishTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
         [BuildAndRun(host: RunHost.Chrome, aot: false, config: "Debug")]
         public void BuildThenPublishNoAOT(BuildArgs buildArgs, RunHost host, string id)
         {
-            string projectName = $"build_publish_{buildArgs.Config}";
+            string projectName = $"build_publish_{buildArgs.Config}_{s_unicodeChar}";
 
             buildArgs = buildArgs with { ProjectName = projectName };
             buildArgs = ExpandBuildArgs(buildArgs);

src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs

@@ -29,6 +29,7 @@ public abstract class BuildTestBase : IClassFixture<SharedBuildPerTestClassFixtu
     {
         public const string DefaultTargetFramework = "net7.0";
         public static readonly string NuGetConfigFileNameForDefaultFramework = $"nuget7.config";
+        protected static readonly char s_unicodeChar = '\u7149';
         protected static readonly bool s_skipProjectCleanup;
         protected static readonly string s_xharnessRunnerCommand;
         protected string? _projectDir;