Issue #28846: Various installer fixes

diff --cc PCbuild/build.bat
Simple merge

diff --cc Tools/msi/buildrelease.bat
Simple merge

diff --cc Tools/msi/bundle/bundle.wxs
Simple merge

diff --cc Tools/msi/make_zip.proj
index d2e031f6b6aba14a6afd6602582a1af30c5d4153,1af6dd2868a1b9e4ecb2db3d1cdedb10fa192349..f78e6ffa28fb72dce40348b18996e39e0f50ded3
--- 1/Tools/msi/make_zip.proj
--- 2/Tools/msi/make_zip.proj
+++ b/Tools/msi/make_zip.proj
@@@ -13,10 -13,10 +13,10 @@@
          <SignOutput>false</SignOutput>
          <TargetName>python-$(PythonVersion)-embed-$(ArchName)</TargetName>
          <TargetExt>.zip</TargetExt>
-         <TargetPath>$(OutputPath)\en-us\$(TargetName)$(TargetExt)</TargetPath>
+         <TargetPath>$(OutputPath)\$(TargetName)$(TargetExt)</TargetPath>
          <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand>
          <Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments>
 -        <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -b "$(BuildPath.TrimEnd('\'))"</Arguments>
 +        <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments>
          <Environment>set DOC_FILENAME=python$(PythonVersion).chm
  set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment>
      </PropertyGroup>

diff --cc Tools/nuget/make_pkg.proj
Simple merge