From dac93066c5c03fb755c343257fb9f1d52b738065 Mon Sep 17 00:00:00 2001
From: "Maria Manolova (INFRAGISTICS INC)" <b-mmanolova@microsoft.com>
Date: Tue, 26 May 2026 12:40:57 +0300
Subject: [PATCH 1/2] Package ijwhost.dll as native asset for self-contained
 publish

After the /clr:pure to /clr:NetCore migration (#11575), DirectWriteForwarder
and System.Printing became mixed-mode C++/CLI assemblies that require
ijwhost.dll at runtime. The DLL was being placed in the managed lib/ folder
where it is not recognized by RuntimeList.xml, causing it to be missing from
self-contained publish output.

Exclude ijwhost.dll from the lib/ packaging and add it as a native asset
under runtimes/win-{arch}/native/ so it is properly included in the runtime
pack manifest.

Fixes #11651

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../DirectWriteForwarder.vcxproj              | 20 ++++++++++++++++++-
 .../System.Printing/System.Printing.vcxproj   | 20 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
index fa961964860..4c7e1aad485 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
@@ -92,7 +92,25 @@
   <ItemGroup>
     <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
   </ItemGroup>
-  <!-- ijwhost.dll is required for mixed-mode C++/CLI assemblies -->
+  <!--
+    Exclude ijwhost.dll from the managed (lib/) folder packaging.
+    It must be placed in runtimes/win-{arch}/native/ instead so that it is
+    recognized as a native asset and included in RuntimeList.xml for
+    self-contained publish scenarios.
+  -->
+  <ItemGroup>
+    <FileNamesExcludedFromPackaging Include="ijwhost.dll" />
+  </ItemGroup>
+  <Target Name="_PackageIjwHostAsNativeAsset" BeforeTargets="CopyPackageAssets" AfterTargets="IdentifyPackageAssets" Condition="'$(PackageName)'!='' and Exists('$(OutDir)ijwhost.dll')">
+    <PropertyGroup>
+      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</_IjwHostNativeDestFolder>
+      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</_IjwHostNativeDestFolder>
+      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</_IjwHostNativeDestFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <PackageAsset Include="$(OutDir)ijwhost.dll" RelativePath="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(_IjwHostNativeDestFolder)" />
+    </ItemGroup>
+  </Target>
   <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 16c743024d6..dac303d328a 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -161,7 +161,25 @@
   <ItemGroup>
     <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
   </ItemGroup>
-  <!-- ijwhost.dll is required for mixed-mode C++/CLI assemblies -->
+  <!--
+    Exclude ijwhost.dll from the managed (lib/) folder packaging.
+    It must be placed in runtimes/win-{arch}/native/ instead so that it is
+    recognized as a native asset and included in RuntimeList.xml for
+    self-contained publish scenarios.
+  -->
+  <ItemGroup>
+    <FileNamesExcludedFromPackaging Include="ijwhost.dll" />
+  </ItemGroup>
+  <Target Name="_PackageIjwHostAsNativeAsset" BeforeTargets="CopyPackageAssets" AfterTargets="IdentifyPackageAssets" Condition="'$(PackageName)'!='' and Exists('$(OutDir)ijwhost.dll')">
+    <PropertyGroup>
+      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</_IjwHostNativeDestFolder>
+      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</_IjwHostNativeDestFolder>
+      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</_IjwHostNativeDestFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <PackageAsset Include="$(OutDir)ijwhost.dll" RelativePath="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(_IjwHostNativeDestFolder)" />
+    </ItemGroup>
+  </Target>
   <Target Name="AddDefineReferences" BeforeTargets="ClCompile" AfterTargets="ResolveReferences" Returns="@(CLCompile)">
     <PropertyGroup>
       <_defineReferences>@(_defineReference->'%(Define)=&lt;%(Identity)&gt;')</_defineReferences>

From 9b4e90b00dfd3a9746079f14355ec40331156e43 Mon Sep 17 00:00:00 2001
From: "Maria Manolova (INFRAGISTICS INC)" <b-mmanolova@microsoft.com>
Date: Mon, 1 Jun 2026 12:23:49 +0300
Subject: [PATCH 2/2] Move ijwhost.dll packaging logic to Packaging.targets

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/WpfArcadeSdk/tools/Packaging.targets      | 22 +++++++++++++++++++
 .../DirectWriteForwarder.vcxproj              | 20 +----------------
 .../System.Printing/System.Printing.vcxproj   | 20 +----------------
 3 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Packaging.targets b/eng/WpfArcadeSdk/tools/Packaging.targets
index 20956d37781..a069bdc8c70 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.targets
+++ b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -89,6 +89,21 @@ $(PreparePackageAssetsDependsOn):
       <DestinationSubFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</DestinationSubFolder>
     </PropertyGroup>
 
+    <!--
+      For managed C++/CLI projects (vcxproj with UseDestinationLibFolder), ijwhost.dll is automatically
+      produced in the output directory but must be packaged as a native assembly under runtimes\<rid>\native\
+      rather than alongside managed assemblies under lib\<tfm>\.
+    -->
+    <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(UseDestinationLibFolder)' != ''">
+      <NativeRuntimeSubFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</NativeRuntimeSubFolder>
+      <NativeRuntimeSubFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</NativeRuntimeSubFolder>
+      <NativeRuntimeSubFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</NativeRuntimeSubFolder>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(UseDestinationLibFolder)' != ''">
+      <FileNamesExcludedFromPackaging Include="ijwhost.dll" />
+    </ItemGroup>
+
     <!--
         Instead of showing an error when $(TargetFramework) or $(RuntimeIdentifier) cannot be identified
         we simply do no further work
@@ -118,6 +133,13 @@ $(PreparePackageAssetsDependsOn):
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
 
+    <!-- Route ijwhost.dll to runtimes\<rid>\native\ for managed C++/CLI projects -->
+    <CreateItem Include="$(OutDir)ijwhost.dll"
+                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(NativeRuntimeSubFolder)"
+                Condition="'$(NativeRuntimeSubFolder)'!='' and '$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and Exists('$(OutDir)ijwhost.dll')">
+      <Output ItemName="PackageAsset" TaskParameter="Include"/>
+    </CreateItem>
+
     <!--
       Normally, .lib files are not included in packaging - projects have to opt in by setting
         <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
index 4c7e1aad485..a2ff827ffff 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
@@ -92,25 +92,7 @@
   <ItemGroup>
     <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
   </ItemGroup>
-  <!--
-    Exclude ijwhost.dll from the managed (lib/) folder packaging.
-    It must be placed in runtimes/win-{arch}/native/ instead so that it is
-    recognized as a native asset and included in RuntimeList.xml for
-    self-contained publish scenarios.
-  -->
-  <ItemGroup>
-    <FileNamesExcludedFromPackaging Include="ijwhost.dll" />
-  </ItemGroup>
-  <Target Name="_PackageIjwHostAsNativeAsset" BeforeTargets="CopyPackageAssets" AfterTargets="IdentifyPackageAssets" Condition="'$(PackageName)'!='' and Exists('$(OutDir)ijwhost.dll')">
-    <PropertyGroup>
-      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</_IjwHostNativeDestFolder>
-      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</_IjwHostNativeDestFolder>
-      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</_IjwHostNativeDestFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <PackageAsset Include="$(OutDir)ijwhost.dll" RelativePath="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(_IjwHostNativeDestFolder)" />
-    </ItemGroup>
-  </Target>
+  <!-- ijwhost.dll packaging is handled centrally in eng/WpfArcadeSdk/tools/Packaging.targets -->
   <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 dac303d328a..3bb8c085842 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -161,25 +161,7 @@
   <ItemGroup>
     <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
   </ItemGroup>
-  <!--
-    Exclude ijwhost.dll from the managed (lib/) folder packaging.
-    It must be placed in runtimes/win-{arch}/native/ instead so that it is
-    recognized as a native asset and included in RuntimeList.xml for
-    self-contained publish scenarios.
-  -->
-  <ItemGroup>
-    <FileNamesExcludedFromPackaging Include="ijwhost.dll" />
-  </ItemGroup>
-  <Target Name="_PackageIjwHostAsNativeAsset" BeforeTargets="CopyPackageAssets" AfterTargets="IdentifyPackageAssets" Condition="'$(PackageName)'!='' and Exists('$(OutDir)ijwhost.dll')">
-    <PropertyGroup>
-      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</_IjwHostNativeDestFolder>
-      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</_IjwHostNativeDestFolder>
-      <_IjwHostNativeDestFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</_IjwHostNativeDestFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <PackageAsset Include="$(OutDir)ijwhost.dll" RelativePath="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(_IjwHostNativeDestFolder)" />
-    </ItemGroup>
-  </Target>
+  <!-- ijwhost.dll packaging is handled centrally in eng/WpfArcadeSdk/tools/Packaging.targets -->
   <Target Name="AddDefineReferences" BeforeTargets="ClCompile" AfterTargets="ResolveReferences" Returns="@(CLCompile)">
     <PropertyGroup>
       <_defineReferences>@(_defineReference->'%(Define)=&lt;%(Identity)&gt;')</_defineReferences>