From 75657aa11716e1f742575106000712810d86bd40 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh <SINGHASHISH@MICROSOFT.COM>
Date: Fri, 21 Jan 2022 14:41:50 +0530
Subject: [PATCH 1/2] Fix dlls not generated in native directory

---
 eng/WpfArcadeSdk/tools/Packaging.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/Packaging.targets b/eng/WpfArcadeSdk/tools/Packaging.targets
index e52e94640f8..76516d3a56f 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.targets
+++ b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -80,7 +80,7 @@ $(PreparePackageAssetsDependsOn):
           Condition="'$(PackageName)'!=''">
 
     <PropertyGroup>
-      <DestinationSubFolder Condition="'$(DestinationSubFolder)'=='' and '$(TargetFramework)'!=''">$(LibFolder)\$(TargetFramework)\</DestinationSubFolder>
+      <DestinationSubFolder Condition="'$(DestinationSubFolder)'=='' and '$(TargetFramework)'!='' and '$(MSBuildProjectExtension)'!='.vcxproj'">$(LibFolder)\$(TargetFramework)\</DestinationSubFolder>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(DestinationSubFolder)'==''">

From f5020f0058e65eecc7c285e93039d8734e6fe6b8 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh <SINGHASHISH@MICROSOFT.COM>
Date: Fri, 21 Jan 2022 17:31:25 +0530
Subject: [PATCH 2/2] Update lib folder condition

---
 eng/WpfArcadeSdk/tools/Packaging.targets                        | 2 +-
 .../src/DirectWriteForwarder/DirectWriteForwarder.vcxproj       | 2 +-
 .../src/System.Printing/System.Printing.vcxproj                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Packaging.targets b/eng/WpfArcadeSdk/tools/Packaging.targets
index 76516d3a56f..2332a5efccf 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.targets
+++ b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -80,7 +80,7 @@ $(PreparePackageAssetsDependsOn):
           Condition="'$(PackageName)'!=''">
 
     <PropertyGroup>
-      <DestinationSubFolder Condition="'$(DestinationSubFolder)'=='' and '$(TargetFramework)'!='' and '$(MSBuildProjectExtension)'!='.vcxproj'">$(LibFolder)\$(TargetFramework)\</DestinationSubFolder>
+      <DestinationSubFolder Condition="'$(DestinationSubFolder)'=='' and '$(TargetFramework)'!='' and !('$(MSBuildProjectExtension)'=='.vcxproj' and '$(UseDestinationLibFolder)' == '')">$(LibFolder)\$(TargetFramework)\</DestinationSubFolder>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(DestinationSubFolder)'==''">
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
index fdb4c372b81..33ccdf80556 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup>
-    
+    <UseDestinationLibFolder>true</UseDestinationLibFolder>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <RestoreProjectStyle>Unknown</RestoreProjectStyle>
   </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 3ea30e2294e..f71cf035853 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup>
-    
+    <UseDestinationLibFolder>true</UseDestinationLibFolder>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
     <RestoreProjectStyle>Unknown</RestoreProjectStyle>