From d95c6a2dcc0ffa62f67223f5ef10bbd06c3c69f4 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Fri, 17 May 2019 11:58:15 -0700
Subject: [PATCH 1/3] Fix packaging to produce native assemblies under
 runtimes\<rid>\native per spec at
 https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks

---
 eng/WpfArcadeSdk/tools/Packaging.targets | 71 ++++++++++++++++--------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Packaging.targets b/eng/WpfArcadeSdk/tools/Packaging.targets
index 49dcc63aaa0..2f595a17dc5 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.targets
+++ b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -5,6 +5,12 @@
   <PropertyGroup>
     <!-- Projects can override the name of the 'lib' folder to something else - for e.g., 'tools'-->
     <LibFolder Condition="'$(LibFolder)'==''">lib</LibFolder>
+    
+    <!-- 
+      Architecture-specific assembies go under runtimes\<rid>\ 
+      https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks
+    -->
+    <RuntimesFolder>runtimes</RuntimesFolder>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -74,21 +80,20 @@ $(PreparePackageAssetsDependsOn):
           Returns="@(PackageAsset)"
           Condition="'$(PackageName)'!=''">
 
-    <!-- Identify $(TargetFrameworkOrRuntimeIdentifier) property -->
     <PropertyGroup>
-      <TargetFrameworkOrRuntimeIdentifier Condition="'$(TargetFrameworkOrRuntimeIdentifier)'=='' and '$(TargetFramework)'!=''">$(TargetFramework)</TargetFrameworkOrRuntimeIdentifier>
+      <DestinationSubFolder Condition="'$(DestinationSubFolder)'=='' and '$(TargetFramework)'!=''">$(LibFolder)\$(TargetFramework)\</DestinationSubFolder>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(TargetFrameworkOrRuntimeIdentifier)'==''">
-      <TargetFrameworkOrRuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">win-x86</TargetFrameworkOrRuntimeIdentifier>
-      <TargetFrameworkOrRuntimeIdentifier Condition="'$(Platform)'=='x64'">win-x64</TargetFrameworkOrRuntimeIdentifier>
+    <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(DestinationSubFolder)'==''">
+      <DestinationSubFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</DestinationSubFolder>
+      <DestinationSubFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</DestinationSubFolder>
     </PropertyGroup>
 
     <!--
-        Instead of showing an error when $(TargetFrameworkOrRuntimeIdentifier) cannot be identified
+        Instead of showing an error when $(TargetFramework) or $(RuntimeIdentifier) cannot be identified
         we simply do no further work
 
-        Include all the DLL's, EXE's and PDB's under lib\
+        Include all the DLL's, EXE's and PDB's under $(DestinationSubFolder), i.e., either under lib\$(TargetFramework) or runtimes\$(RuntimeIdentifier)\native
         Include all reference assemblies under ref\
         Include all content files under content\
 
@@ -97,37 +102,37 @@ $(PreparePackageAssetsDependsOn):
     
     The CreateItem tasks below is equivalent to this: 
     
-    <ItemGroup Condition="'$(TargetFrameworkOrRuntimeIdentifier)'!='' and '$(IsPackagingProject)'!='true'">
-      <PackageAsset Include="$(OutDir)*.dll" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\lib\$(TargetFrameworkOrRuntimeIdentifier)"/>
-      <PackageAsset Include="$(OutDir)*.exe" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\lib\$(TargetFrameworkOrRuntimeIdentifier)"/>
-      <PackageAsset Include="$(OutDir)*.pdb" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\lib\$(TargetFrameworkOrRuntimeIdentifier)"/>
-      <PackageAsset Include="$(ReferenceAssemblyDir)*.dll" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\ref\$(TargetFrameworkOrRuntimeIdentifier)"/>
+    <ItemGroup Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true'">
+      <PackageAsset Include="$(OutDir)*.dll" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\$(DestinationSubFolder)"/>
+      <PackageAsset Include="$(OutDir)*.exe" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\$(DestinationSubFolder)"/>
+      <PackageAsset Include="$(OutDir)*.pdb" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\$(DestinationSubFolder)"/>
+      <PackageAsset Include="$(ReferenceAssemblyDir)*.dll" RelativePath="$(ArtifactsPackagingDir)\$(DestinationSubFolder)"/>
     </ItemGroup>
     -->
     <CreateItem Include="$(OutDir)*.dll"
-                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\$(TargetFrameworkOrRuntimeIdentifier)"
-                Condition="'$(TargetFrameworkOrRuntimeIdentifier)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'==''">
+                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)"
+                Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'==''">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
     <CreateItem Include="$(OutDir)*.exe"
-                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\$(TargetFrameworkOrRuntimeIdentifier)"
-                Condition="'$(TargetFrameworkOrRuntimeIdentifier)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'==''">
+                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)"
+                Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'==''">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
     <CreateItem Include="$(OutDir)*.pdb"
-                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\$(TargetFrameworkOrRuntimeIdentifier)"
-                Condition="'$(TargetFrameworkOrRuntimeIdentifier)'!='' and '$(IsPackagingProject)'!='true' and '$(ExcludePdbs)'!='true' and '@(PackagingAssemblyContent)'==''">
+                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)"
+                Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '$(ExcludePdbs)'!='true' and '@(PackagingAssemblyContent)'==''">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
     <CreateItem Include="$(ReferenceAssemblyDir)*.dll"
-                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\ref\$(TargetFrameworkOrRuntimeIdentifier)"
-                Condition="'$(TargetFrameworkOrRuntimeIdentifier)'!='' and '$(IsPackagingProject)'!='true' and '$(ExcludeRefAssemblies)'!='true'">
+                AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\ref\$(TargetFramework)"
+                Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '$(ExcludeRefAssemblies)'!='true'">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
 
     <CreateItem Include="$(OutDir)%(PackagingAssemblyContent.Identity)"
-            AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\$(TargetFrameworkOrRuntimeIdentifier)"
-            Condition="'$(TargetFrameworkOrRuntimeIdentifier)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'!=''">
+            AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)"
+            Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'!=''">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
     <!-- 
@@ -144,10 +149,10 @@ $(PreparePackageAssetsDependsOn):
       <PackageAssetCultures Include="$(XlfLanguages)" />
 
       <PackageAsset Include="$(OutDir)%(PackageAssetCultures.Identity)\*.dll"
-                    RelativePath="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\$(TargetFrameworkOrRuntimeIdentifier)\%(PackageAssetCultures.Identity)" />
+                    RelativePath="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)\%(PackageAssetCultures.Identity)" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFrameworkOrRuntimeIdentifier)'!=''">
+    <ItemGroup Condition="'$(DestinationSubFolder)'!=''">
 
       <!-- %(PackagingContent.SubFolder) not StartsWith 'root' -->
       <PackageAsset Condition="'%(PackagingContent.SubFolder)'!='' And !$([System.String]::Copy(&quot;%(PackagingContent.SubFolder)&quot;).StartsWith(&quot;root&quot;))"
@@ -275,6 +280,24 @@ $(PreparePackageAssetsDependsOn):
         <PackagePath>$(LibFolder)</PackagePath>
       </Content>
 
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\**\*.dll"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\')" >
+        <Pack>true</Pack>
+        <PackagePath>runtimes</PackagePath>
+      </Content>
+
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\**\*.exe"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\')" >
+        <Pack>true</Pack>
+        <PackagePath>runtimes</PackagePath>
+      </Content>
+
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\**\*.pdb"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\')" >
+        <Pack>true</Pack>
+        <PackagePath>runtimes</PackagePath>
+      </Content>
+
       <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\ref\**\*.dll"
          Condition="Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\ref\')">
         <Pack>true</Pack>

From 94eaf9818b602bf7f4cf762c230a9708e1c80ed7 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Fri, 17 May 2019 12:15:44 -0700
Subject: [PATCH 2/3] 'runtimes' is a constant - doesn't need a property
 definition.

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

diff --git a/eng/WpfArcadeSdk/tools/Packaging.targets b/eng/WpfArcadeSdk/tools/Packaging.targets
index 2f595a17dc5..7183ebfb264 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.targets
+++ b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -10,7 +10,6 @@
       Architecture-specific assembies go under runtimes\<rid>\ 
       https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks
     -->
-    <RuntimesFolder>runtimes</RuntimesFolder>
   </PropertyGroup>
 
   <PropertyGroup>

From d0c0b7d4536fdc3947ba23da126d334a6a9ca99e Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Fri, 17 May 2019 12:16:30 -0700
Subject: [PATCH 3/3] Fix typo

---
 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 7183ebfb264..1debe3ec317 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.targets
+++ b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -7,7 +7,7 @@
     <LibFolder Condition="'$(LibFolder)'==''">lib</LibFolder>
     
     <!-- 
-      Architecture-specific assembies go under runtimes\<rid>\ 
+      Architecture-specific assemblies go under runtimes\<rid>\native\ 
       https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks
     -->
   </PropertyGroup>