Fix win-x86 windowsdesktop and aspnetcore builds (#45162)

Author: ViktorHofer

src/SourceBuild/patches/aspnetcore/0002-Set-target-platform-for-wixproj-and-vcxproj-correctl.patch

@@ -0,0 +1,69 @@
+From a2e9089dca596cacf235242fbfb3189d3f037b68 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <[email protected]>
+Date: Wed, 27 Nov 2024 10:32:11 +0100
+Subject: [PATCH] Set target platform for wixproj and vcxproj correctly
+
+wixprojs allow x86, x64 and arm64 (idetical to the TargetArchitecture platform)
+vcxprojs allow Win32, x64 and ARM64
+
+Backport: https://github.com/dotnet/aspnetcore/pull/59194
+
+---
+ eng/Build.props                               | 19 ++++++++++---------
+ .../SharedFrameworkBundle.wixproj             |  2 +-
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/eng/Build.props b/eng/Build.props
+index b3ead4d694..7828cca441 100644
+--- a/eng/Build.props
++++ b/eng/Build.props
+@@ -218,9 +218,10 @@
+       <!-- BuildInstallers -->
+       <PropertyGroup>
+         <_BuildWindowsInstallers Condition="'$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">true</_BuildWindowsInstallers>
+-        <_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'x86' ">Win32</_WixTargetPlatform>
+-        <_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'x64' ">x64</_WixTargetPlatform>
+-        <_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64' ">ARM64</_WixTargetPlatform>
++
++        <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'x86'">Win32</_VcxTargetPlatform>
++        <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'x64'">x64</_VcxTargetPlatform>
++        <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
+       </PropertyGroup>
+ 
+       <ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
+@@ -262,16 +263,16 @@
+       <!-- In a vertical build, only build the MSIs for the current vertical in the first pass and build the hosting bundle in the second pass -->
+       <ItemGroup Condition="'$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') and '$(_BuildWindowsInstallers)' == 'true'">
+         <!-- Build the ANCM custom action -->
+-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
++        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=$(_VcxTargetPlatform)" />
+         <!-- Build the ANCM msis -->
+-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
+-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
++        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
++        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
+         <!-- Build the targeting pack installers -->
+-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
++        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
+         <!-- Build the SharedFramework installers -->
+-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
++        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
+         <!-- Build the SharedFramework wixlib -->
+-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=$(_WixTargetPlatform)" />
++        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
+       </ItemGroup>
+ 
+       <ItemGroup Condition="'$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '2') and '$(TargetOsName)' == 'win' and '$(TargetArchitecture)' == 'x64'">
+diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
+index c308442b3f..a0782dea75 100644
+--- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
++++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
+@@ -48,7 +48,7 @@
+       <ItemGroup>
+         <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
+                           SetPlatform="Platform=x86"
+-                          Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'Win32'">
++                          Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x86'">
+           <Name>SharedFrameworkLib</Name>
+           <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
+           <Private>True</Private>

src/SourceBuild/patches/wpf/0001-fix-winx86-build.patch

@@ -0,0 +1,28 @@
+From 4332beffccfc3cf080350c507a163bd20852dea6 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <[email protected]>
+Date: Wed, 27 Nov 2024 00:09:18 +0100
+Subject: [PATCH] Correctly reference ref project for Windows.Primitives.csproj
+
+Backport: https://github.com/dotnet/wpf/pull/10122
+
+---
+ .../System.Windows.Primitives.csproj                        | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Primitives/System.Windows.Primitives.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Primitives/System.Windows.Primitives.csproj
+index 04d26172a..b84ce21ef 100644
+--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Primitives/System.Windows.Primitives.csproj
++++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Primitives/System.Windows.Primitives.csproj
+@@ -29,6 +29,10 @@
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" PrivateAssets="all" />
+     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
++
++    <ProjectReference Include="$(WpfSourceDir)System.Windows.Primitives\ref\System.Windows.Primitives-ref.csproj">
++      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
++    </ProjectReference>
+   </ItemGroup>
+ 
+-</Project>
+\ No newline at end of file
++</Project>