From accf26f6970c0f2b160cf74c684f4628384f842f Mon Sep 17 00:00:00 2001
From: Jeremy Kuhne <jeremy.kuhne@microsoft.com>
Date: Thu, 31 Oct 2024 13:11:43 -0700
Subject: [PATCH] Make PresentationBuildTasks always AnyCPU

---
 Microsoft.Dotnet.Wpf.sln                      | 24 +++++++++----------
 eng/Versions.props                            |  1 -
 .../PresentationBuildTasks.csproj             |  9 +++----
 .../src/WindowsBase/LibraryAssemblyInfo.cs    |  2 +-
 .../src/WindowsBase/WindowsBase.csproj        |  1 -
 .../PresentationCore.Tests.csproj             |  3 ---
 6 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln
index 6f17c6e6904..e9ce7737af5 100644
--- a/Microsoft.Dotnet.Wpf.sln
+++ b/Microsoft.Dotnet.Wpf.sln
@@ -439,18 +439,18 @@ Global
 		{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}.Release|x64.Build.0 = Release|x64
 		{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}.Release|x86.ActiveCfg = Release|x86
 		{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}.Release|x86.Build.0 = Release|x86
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x64.ActiveCfg = Debug|x64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x64.Build.0 = Debug|x64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x86.ActiveCfg = Debug|x86
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x86.Build.0 = Debug|x86
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|ARM64.Build.0 = Release|ARM64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x64.ActiveCfg = Release|x64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x64.Build.0 = Release|x64
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x86.ActiveCfg = Release|x86
-		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x86.Build.0 = Release|x86
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|ARM64.ActiveCfg = Debug|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|ARM64.Build.0 = Debug|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x64.ActiveCfg = Debug|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x64.Build.0 = Debug|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x86.ActiveCfg = Debug|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x86.Build.0 = Debug|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|ARM64.ActiveCfg = Release|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|ARM64.Build.0 = Release|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x64.ActiveCfg = Release|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x64.Build.0 = Release|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x86.ActiveCfg = Release|AnyCPU
+		{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x86.Build.0 = Release|AnyCPU
 		{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/eng/Versions.props b/eng/Versions.props
index 93b1d7a2653..e66d132e4f0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,6 +124,5 @@
   </PropertyGroup>
   <PropertyGroup>
     <MicrosoftDotNetWpfDncEngVersion>10.0.0-alpha.1.24474.3</MicrosoftDotNetWpfDncEngVersion>
-    <MicrosoftWindowsCsWin32PackageVersion>0.3.106</MicrosoftWindowsCsWin32PackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
index 6ae32ad15e6..5ef22f90621 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
@@ -26,7 +26,7 @@
     <BinPlaceRuntime>false</BinPlaceRuntime>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <Platforms>x86;x64;arm64</Platforms>
+    <Platforms>AnyCPU</Platforms>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
@@ -39,7 +39,6 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
-
   <!--
     Incorporate Microsoft.WinFX.targets in nuget packages under
     content\targets\
@@ -60,14 +59,13 @@
     <PackagingAssemblyContent Include="System.Reflection.MetadataLoadContext.dll" />
     <PackagingAssemblyContent Include="System.Runtime.CompilerServices.Unsafe.dll" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
     <PackagingAssemblyContent Include="PresentationBuildTasks.dll" />
     <PackagingAssemblyContent Include="System.Reflection.MetadataLoadContext.dll" />
   </ItemGroup>
 
-
   <ItemGroup>
-      <EmbeddedResource Include="Resources\Strings.resx" />
+    <EmbeddedResource Include="Resources\Strings.resx" />
   </ItemGroup>
 
   <ItemGroup>
@@ -77,7 +75,6 @@
     <Compile Include="MS\Internal\BuildTasksAppContextSwitches.cs" />
   </ItemGroup>
 
-
   <ItemGroup>
     <Compile Include="SR.cs" />
     <Compile Include="$(WpfCommonDir)src\System\SR.cs" >
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/LibraryAssemblyInfo.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/LibraryAssemblyInfo.cs
index 3c3b00a18a0..ef11e0b67f3 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/LibraryAssemblyInfo.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/LibraryAssemblyInfo.cs
@@ -4,4 +4,4 @@
 using System;
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo($"WindowsBase.Tests, PublicKey={PublicKeys.Ecma}")]
+[assembly: InternalsVisibleTo("WindowsBase.Tests, PublicKey=00000000000000000400000000000000")]
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
index c780609cd5a..e3aa0622062 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
@@ -378,7 +378,6 @@
 
   <ItemGroup>
     <MicrosoftPrivateWinFormsReference Include="Accessibility" />
-    <MicrosoftPrivateWinFormsReference Include="System.Private.Windows.Core" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj b/src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj
index 3f324427e36..0beabfc7588 100644
--- a/src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj
+++ b/src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj
@@ -5,9 +5,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <Nullable>enable</Nullable>
-    <!--
-      AnyCPU isn't really valid for this project as tests implicitly load the DirectWriteForwarder.
-    -->
     <Platforms>x64;x86;ARM64</Platforms>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <!-- SYSLIB5005: System.Formats.Nrbf is experimental -->