Fix Installer singleton support. Don't try to copy obsolete .pri files to the TRansport package (#1344)

* Fixed copy/paste error for singleton

* Remove obsolete Microsoft.WindowsAppSDK.pri

Author: DrusTheAxe

build/NuSpecs/build-nupkg.ps1

@@ -109,11 +109,8 @@ function ConfigureNugetCommandLine {
 ConfigureNugetCommandLine("Microsoft.WindowsAppSDK")
 
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.WindowsAppRuntime\Microsoft.WindowsAppRuntime.dll "$runtimesDir\win10-x86\native"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.WindowsAppRuntime\Microsoft.WindowsAppSDK.pri "$runtimesDir\win10-x86\native"
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.WindowsAppRuntime\Microsoft.WindowsAppRuntime.dll "$runtimesDir\win10-x64\native"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.WindowsAppRuntime\Microsoft.WindowsAppSDK.pri "$runtimesDir\win10-x64\native"
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.WindowsAppRuntime\Microsoft.WindowsAppRuntime.dll "$runtimesDir\win10-arm64\native"
-Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.WindowsAppRuntime\Microsoft.WindowsAppSDK.pri "$runtimesDir\win10-arm64\native"
 
 #
 # Build Windows App SDK package (with actual contents, i.e. not metapackage)

installer/dev/windowsappruntime_definitions.h

@@ -78,34 +78,34 @@
     #define WAR_MAIN_ARM64_PATH "..\\test\\testpackages\\main_arm64.msix"
 #endif
 
-// x86 Main
+// x86 Singleton
 #define WAR_SINGLETON_X86_ID L"WAR_SINGLETONPACKAGE_X86"
 #define WAR_SINGLETON_X86_RCID WAR_SINGLETONPACKAGE_X86
 #define WAR_SINGLETON_X86_TYPE L"PACKAGE"
 #define WAR_SINGLETON_X86_RCTYPE PACKAGE
 #define WAR_SINGLETON_X86_BEHAVIOR DeploymentBehavior::Default
 #ifndef WAR_SINGLETON_X86_PATH
-    #define WAR_SINGLETON_X86_PATH "..\\test\\testpackages\\main_x86.msix"
+    #define WAR_SINGLETON_X86_PATH "..\\test\\testpackages\\singleton_x86.msix"
 #endif
 
-// x64 Main
+// x64 Singleton
 #define WAR_SINGLETON_X64_ID L"WAR_SINGLETONPACKAGE_X64"
 #define WAR_SINGLETON_X64_RCID WAR_SINGLETONPACKAGE_X64
 #define WAR_SINGLETON_X64_TYPE L"PACKAGE"
 #define WAR_SINGLETON_X64_RCTYPE PACKAGE
 #define WAR_SINGLETON_X64_BEHAVIOR DeploymentBehavior::Default
 #ifndef WAR_SINGLETON_X64_PATH
-    #define WAR_SINGLETON_X64_PATH "..\\test\\testpackages\\main_x64.msix"
+    #define WAR_SINGLETON_X64_PATH "..\\test\\testpackages\\singleton_x64.msix"
 #endif
 
-// arm64 Main
+// arm64 Singleton
 #define WAR_SINGLETON_ARM64_ID L"WAR_SINGLETONPACKAGE_ARM64"
 #define WAR_SINGLETON_ARM64_RCID WAR_SINGLETONPACKAGE_ARM64
 #define WAR_SINGLETON_ARM64_TYPE L"PACKAGE"
 #define WAR_SINGLETON_ARM64_RCTYPE PACKAGE
 #define WAR_SINGLETON_ARM64_BEHAVIOR DeploymentBehavior::Default
 #ifndef WAR_SINGLETON_ARM64_PATH
-    #define WAR_SINGLETON_ARM64_PATH "..\\test\\testpackages\\main_arm64.msix"
+    #define WAR_SINGLETON_ARM64_PATH "..\\test\\testpackages\\singleton_arm64.msix"
 #endif
 
 // x86 DDLM
@@ -167,6 +167,18 @@
     #define WAR_MAIN_ARM64_RCENTRY WAR_MAIN_ARM64_RC WAR_MAIN_ARM64_RCTYPE WAR_MAIN_ARM64_PATH
 #endif
 
+#define WAR_SINGLETON_X86_LISTENTRY { WAR_SINGLETON_X86_ID, WAR_SINGLETON_X86_TYPE, WAR_SINGLETON_X86_BEHAVIOR },
+#define WAR_SINGLETON_X86_RCENTRY WAR_SINGLETON_X86_RCID WAR_SINGLETON_X86_RCTYPE WAR_SINGLETON_X86_PATH
+
+#define WAR_SINGLETON_X64_LISTENTRY  { WAR_SINGLETON_X64_ID, WAR_SINGLETON_X64_TYPE, WAR_SINGLETON_X64_BEHAVIOR },
+#define WAR_SINGLETON_X64_RCENTRY WAR_SINGLETON_X64_RCID WAR_SINGLETON_X64_RCTYPE WAR_SINGLETON_X64_PATH
+
+// arm64 is included only on arm64 builds
+#if defined(_M_ARM64)
+    #define WAR_SINGLETON_ARM64_LISTENTRY { WAR_SINGLETON_ARM64_ID, WAR_SINGLETON_ARM64_TYPE, WAR_SINGLETON_ARM64_BEHAVIOR },
+    #define WAR_SINGLETON_ARM64_RCENTRY WAR_SINGLETON_ARM64_RC WAR_SINGLETON_ARM64_RCTYPE WAR_SINGLETON_ARM64_PATH
+#endif
+
 #define WAR_DDLM_X86_LISTENTRY { WAR_DDLM_X86_ID, WAR_DDLM_X86_TYPE, WAR_DDLM_X86_BEHAVIOR },
 #define WAR_DDLM_X86_RCENTRY WAR_DDLM_X86_RCID WAR_DDLM_X86_RCTYPE WAR_DDLM_X86_PATH