From e5d2c0e9ac74bc231d8fbe37b1008e492223cfb8 Mon Sep 17 00:00:00 2001
From: Vinay Narayana <vinnarayana@microsoft.com>
Date: Mon, 13 Apr 2026 14:12:13 +0530
Subject: [PATCH 1/4] Remove /clr:pure from WPF C++/CLI projects

Migrate DirectWriteForwarder and System.Printing from /clr:pure to
/clr:netcore (IJW mixed mode) in preparation for MSVC 14.51 which
removes /clr:pure + /clr:netcore support.

Changes:
- CLRSupport and CompileAsManaged changed from pure to NetCore
- Removed pure to NetCore conversion logic in Wpf.Cpp.props
- Removed ijwhost.dll packaging exclusion (required for mixed-mode)
- Added _M_ARM64 to architecture check in intsafe_private_copy.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/WpfArcadeSdk/tools/Wpf.Cpp.props                  |  6 +++---
 .../TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h |  2 +-
 .../DirectWriteForwarder/DirectWriteForwarder.vcxproj | 11 +++--------
 .../src/System.Printing/System.Printing.vcxproj       | 11 +++--------
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index 6076423b7a6..f44a8b51b5d 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -48,16 +48,16 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ManagedCxx Condition="'$(CLRSupport)'!='true'">false</ManagedCxx>
+    <ManagedCxx Condition="'$(CLRSupport)'!='true' and '$(CLRSupport)'!='NetCore'">false</ManagedCxx>
     <ManagedCxx Condition="'$(CLRSupport)'=='true'">true</ManagedCxx>
-    <ManagedCxx Condition="'$(CLRSupport)'=='pure'">true</ManagedCxx>
+    <ManagedCxx Condition="'$(CLRSupport)'=='NetCore'">true</ManagedCxx>
   </PropertyGroup>
   
   <!-- 
     Enable IDE support for C++/CLI .NET Core builds
     -->
   <PropertyGroup>
-    <CLRSupport Condition="'$(CLRSupport)' == 'pure'">NetCore</CLRSupport>
+  
   </PropertyGroup>
   
   <!-- 
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h
index 7fe53745b72..7128dfe5eb4 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h
@@ -19,7 +19,7 @@ typedef unsigned __int64    ULONGLONG;
 //
 #if defined(MIDL_PASS) || defined(RC_INVOKED) || defined(_M_CEE_PURE) \
     || defined(_68K_) || defined(_MPPC_) \
-    || defined(_M_IA64) || defined(_M_AMD64)
+    || defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM64)
 // DevDiv LKG RC Changes
 // Description: Define only if it is not already defined.
 // added conditional to note conflict with public\ddk\inc\ntdef.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
index f1091cbad02..fa961964860 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
@@ -39,7 +39,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>
     <Keyword>NetCoreCProj</Keyword>
-    <CLRSupport>pure</CLRSupport>
+    <CLRSupport>NetCore</CLRSupport>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
@@ -57,7 +57,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions) /clr:initLocals</AdditionalOptions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\;.\CPP</AdditionalIncludeDirectories>
-      <CompileAsManaged>pure</CompileAsManaged>
+      <CompileAsManaged>NetCore</CompileAsManaged>
       <PreprocessorDefinitions>$(CDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>precomp.hxx</PrecompiledHeaderFile>
       <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
@@ -92,12 +92,7 @@
   <ItemGroup>
     <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
   </ItemGroup>
-  <!--
-    Ignore ijwhost.dll during packaging
-  -->
-  <ItemGroup>
-    <FileNamesExcludedFromPackaging Include="ijwhost.dll" />
-  </ItemGroup>
+  <!-- ijwhost.dll is required for mixed-mode C++/CLI assemblies -->
   <Target Name="AddWindowsBaseDefine" AfterTargets="ResolveProjectReferences">
     <Error Text="Unexpected result from _WindowsBaseReference '@(_WindowsBaseReference->Count())'" Condition="'@(_WindowsBaseReference->Count())' != '1'" />
     <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
index d2fe5dc40de..16c743024d6 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -40,7 +40,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>
     <Keyword>NetCoreCProj</Keyword>
-    <CLRSupport>pure</CLRSupport>
+    <CLRSupport>NetCore</CLRSupport>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
@@ -57,7 +57,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\CPP;.\CPP\inc;.\CPP\inc\GDIExporter</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(CDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CompileAsManaged>pure</CompileAsManaged>
+      <CompileAsManaged>NetCore</CompileAsManaged>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Win32Inc.hpp</PrecompiledHeaderFile>
       <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
@@ -161,12 +161,7 @@
   <ItemGroup>
     <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
   </ItemGroup>
-  <!--
-    Ignore ijwhost.dll during packaging
-  -->
-  <ItemGroup>
-    <FileNamesExcludedFromPackaging Include="ijwhost.dll" />
-  </ItemGroup>
+  <!-- ijwhost.dll is required for mixed-mode C++/CLI assemblies -->
   <Target Name="AddDefineReferences" BeforeTargets="ClCompile" AfterTargets="ResolveReferences" Returns="@(CLCompile)">
     <PropertyGroup>
       <_defineReferences>@(_defineReference->'%(Define)=&lt;%(Identity)&gt;')</_defineReferences>

From 5f0341edfbce67c6b780b475e1ef093269bbe75c Mon Sep 17 00:00:00 2001
From: Vinay Narayana <vinnarayana@microsoft.com>
Date: Wed, 22 Apr 2026 12:03:47 +0530
Subject: [PATCH 2/4] Remove empty PropertyGroup left from /clr:pure removal

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/WpfArcadeSdk/tools/Wpf.Cpp.props | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index f44a8b51b5d..e7a517b0e29 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -53,13 +53,6 @@
     <ManagedCxx Condition="'$(CLRSupport)'=='NetCore'">true</ManagedCxx>
   </PropertyGroup>
   
-  <!-- 
-    Enable IDE support for C++/CLI .NET Core builds
-    -->
-  <PropertyGroup>
-  
-  </PropertyGroup>
-  
   <!-- 
     When building C++/CLI..
       ... Disable C# CoreGenerateSatelliteAssemblies target

From 2aad7eea4f7efaf8b8bfb8c97d1672a9e0b8b075 Mon Sep 17 00:00:00 2001
From: Vinay Narayana <vinnarayana@microsoft.com>
Date: Fri, 8 May 2026 11:54:58 +0530
Subject: [PATCH 3/4] Remove dead CLRSupport==pure reference from
 DllRenameClause

Address PR review nit: remove CLRSupport=='pure' from DllRenameClause
condition since no project sets CLRSupport to 'pure' anymore. Update
comment to reference /clr:netcore instead of /clr:pure.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/WpfArcadeSdk/tools/Wpf.Cpp.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index e7a517b0e29..1dcb33c8f62 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -151,13 +151,13 @@
           - Supported only on Release builds 
           - WPF will carry a privatized copy of vcruntime with it - renamed with suffix _cor3
           - Debug builds normally link to Static VCRT by default, and linking to a privatized vcruntime is not required
-          - Managed C++ assemblies that utilize /clr:pure always link to vcruntime implicitly, and should employ this 
+          - Managed C++ assemblies that utilize /clr:netcore always link to vcruntime implicitly, and should employ this 
             DLL renaming at link time and reference the privatized copy of vcruntime.
           - It is in fact possible to create private builds of WPF that links to debug builds of redistributable vcruntime. We do not support
             linking to a privatized copy of vcruntime140d.dll here. Such build should simply copy over the debug version of vcruntime DLL's 
             to the appropriate location for testing purposes.
     -->
-    <DllRenameClause Condition="('$(UseStaticVCRT)'!='true' or '$(CLRSupport)'=='pure' or '$(CLRSupport)' == 'NetCore') And '$(Configuration)'=='Release'">/dllrename:$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)=$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)$(WpfVersionSuffix)</DllRenameClause>
+    <DllRenameClause Condition="('$(UseStaticVCRT)'!='true' or '$(CLRSupport)' == 'NetCore') And '$(Configuration)'=='Release'">/dllrename:$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)=$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)$(WpfVersionSuffix)</DllRenameClause>
 
 
     <StandardLibrariesForNativeCpp Condition="'$(ManagedCxx)'=='false'">$(StaticUCRTLibrary);$(StaticVCRTLibrary);$(StaticCRTStartupLibrary);$(StaticStandardCppLibrary);$(DynamicUCRTLibrary);$(DynamicVCRTLibrary);$(DynamicCRTStartupLibrary);$(DynamicStandardCppLibrary)</StandardLibrariesForNativeCpp>

From 1fec6c83d158390ff130f6d217dfc2497583e9f7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 May 2026 08:10:55 +0000
Subject: [PATCH 4/4] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20260512.2 On
 relative base path root Microsoft.DotNet.Wpf.DncEng From Version
 11.0.0-preview.2.26165.1 -> To Version 11.0.0-preview.2.26262.2

---
 eng/Version.Details.props | 2 +-
 eng/Version.Details.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 42345044cc9..5509fa51b2e 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props
     <SystemSecurityPermissionsPackageVersion>11.0.0-preview.5.26229.113</SystemSecurityPermissionsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>11.0.0-preview.5.26229.113</SystemWindowsExtensionsPackageVersion>
     <!-- dotnet-wpf-int dependencies -->
-    <MicrosoftDotNetWpfDncEngPackageVersion>11.0.0-preview.2.26165.1</MicrosoftDotNetWpfDncEngPackageVersion>
+    <MicrosoftDotNetWpfDncEngPackageVersion>11.0.0-preview.2.26262.2</MicrosoftDotNetWpfDncEngPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 319274ed6e6..0f841adfce1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -22,9 +22,9 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="11.0.0-preview.2.26165.1">
+    <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="11.0.0-preview.2.26262.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
-      <Sha>6e4ce3f54f3417a3bd31e9631ee20afb3a9ed0a3</Sha>
+      <Sha>0f3efdfc3b5fe2e9ff10112b632914d6c26b230b</Sha>
     </Dependency>
     <Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.5.26229.113">
       <Uri>https://github.com/dotnet/dotnet</Uri>