Trim Resource Id prefix from WINDOWSAPPRUNTIME_ to MSIX_

microsoft · Apr 26, 2022 · 42ff4f6 · 42ff4f6
1 parent 86fbd6c
commit 42ff4f6
Show file tree

Hide file tree

Showing 5 changed files with 193 additions and 193 deletions.
diff --git a/installer/dev/WindowsAppRuntime-License.h b/installer/dev/WindowsAppRuntime-License.h
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#ifndef __WINDOWSAPPRUNTIME_LICENSE_H
-#define __WINDOWSAPPRUNTIME_LICENSE_H
+#ifndef __MSIX_LICENSE_H
+#define __MSIX_LICENSE_H
 
 namespace Microsoft::Windows::ApplicationModel::Licensing
 {
@@ -54,4 +54,4 @@ class Installer
 };
 }
 
-#endif // __WINDOWSAPPRUNTIME_LICENSE_H
+#endif // __MSIX_LICENSE_H
diff --git a/installer/dev/WindowsAppRuntimeInstall.rc b/installer/dev/WindowsAppRuntimeInstall.rc
@@ -11,54 +11,54 @@
 //
 #include "windowsappruntime_definitions.h"
 
-#if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCENTRY)
-WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCENTRY
+#if defined(MSIX_FRAMEWORK_X86_RCENTRY)
+MSIX_FRAMEWORK_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCENTRY)
-WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCENTRY
+#if defined(MSIX_FRAMEWORK_X64_RCENTRY)
+MSIX_FRAMEWORK_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCENTRY
+#if defined(MSIX_FRAMEWORK_ARM64_RCENTRY)
+MSIX_FRAMEWORK_ARM64_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_MAIN_X86_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_X86_RCENTRY
+#if defined(MSIX_MAIN_X86_RCENTRY)
+MSIX_MAIN_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_MAIN_X64_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_X64_RCENTRY
+#if defined(MSIX_MAIN_X64_RCENTRY)
+MSIX_MAIN_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_MAIN_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_ARM64_RCENTRY
+#if defined(MSIX_MAIN_ARM64_RCENTRY)
+MSIX_MAIN_ARM64_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_X86_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_X86_RCENTRY
+#if defined(MSIX_SINGLETON_X86_RCENTRY)
+MSIX_SINGLETON_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_X64_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_X64_RCENTRY
+#if defined(MSIX_SINGLETON_X64_RCENTRY)
+MSIX_SINGLETON_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCENTRY
+#if defined(MSIX_SINGLETON_ARM64_RCENTRY)
+MSIX_SINGLETON_ARM64_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_DDLM_X86_RCENTRY)
-WINDOWSAPPRUNTIME_DDLM_X86_RCENTRY
+#if defined(MSIX_DDLM_X86_RCENTRY)
+MSIX_DDLM_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_DDLM_X64_RCENTRY)
-WINDOWSAPPRUNTIME_DDLM_X64_RCENTRY
+#if defined(MSIX_DDLM_X64_RCENTRY)
+MSIX_DDLM_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_DDLM_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_DDLM_ARM64_RCENTRY
+#if defined(MSIX_DDLM_ARM64_RCENTRY)
+MSIX_DDLM_ARM64_RCENTRY
 #endif
 
 //--Licenses--
 
-#if defined(WINDOWSAPPRUNTIME_MAIN_LICENSE_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_LICENSE_RCENTRY
+#if defined(MSIX_MAIN_LICENSE_RCENTRY)
+MSIX_MAIN_LICENSE_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_LICENSE_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_LICENSE_RCENTRY
+#if defined(MSIX_SINGLETON_LICENSE_RCENTRY)
+MSIX_SINGLETON_LICENSE_RCENTRY
 #endif
 
 #define APSTUDIO_READONLY_SYMBOLS

diff --git a/installer/dev/install.cpp b/installer/dev/install.cpp
@@ -222,7 +222,7 @@ namespace WindowsAppRuntimeInstaller
             return;
         }
 
-        PCWSTR c_windowsAppRuntimeTempDirectoryPrefix{ L"WAR" };
+        PCWSTR c_windowsAppRuntimeTempDirectoryPrefix{ L"MSIX" };
         wchar_t packageFilename[MAX_PATH];
         THROW_LAST_ERROR_IF(0 == GetTempFileName(std::filesystem::temp_directory_path().c_str(), c_windowsAppRuntimeTempDirectoryPrefix, 0u, packageFilename));
 
@@ -336,7 +336,7 @@ namespace WindowsAppRuntimeInstaller
 
     HRESULT InstallLicenses(const WindowsAppRuntimeInstaller::Options options)
     {
-#if defined(WINDOWSAPPRUNTIME_PROCESS_LICENSES)
+#if defined(MSIX_PROCESS_LICENSES)
         const auto quiet{ WI_IsFlagSet(options, WindowsAppRuntimeInstaller::Options::Quiet) };
 
         if (WI_IsFlagSet(options, WindowsAppRuntimeInstaller::Options::InstallLicenses))
@@ -386,7 +386,7 @@ namespace WindowsAppRuntimeInstaller
 
                 // Restart Push Notifications Long Running Platform when ForceDeployment option is applied.
                 if (WI_IsFlagSet(options, WindowsAppRuntimeInstaller::Options::ForceDeployment) &&
-                    CompareStringOrdinal(package.id.c_str(), static_cast<int>(package.id.size() - 3), WINDOWSAPPRUNTIME_SINGLETON_X86_ID, static_cast<int>(package.id.size() - 3), TRUE) == CSTR_EQUAL)
+                    CompareStringOrdinal(package.id.c_str(), static_cast<int>(package.id.size() - 3), MSIX_SINGLETON_X86_ID, static_cast<int>(package.id.size() - 3), TRUE) == CSTR_EQUAL)
                 {
                     RestartPushNotificationsLRP();
                 }

diff --git a/installer/dev/packages.h b/installer/dev/packages.h
@@ -30,44 +30,44 @@ namespace WindowsAppRuntimeInstaller {
 
     static ResourcePackageInfo c_packages[] =
     {
-    #if defined(WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_LISTENTRY
+    #if defined(MSIX_FRAMEWORK_ARM64_LISTENTRY)
+        MSIX_FRAMEWORK_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_FRAMEWORK_X64_LISTENTRY
+    #if defined(MSIX_FRAMEWORK_X64_LISTENTRY)
+        MSIX_FRAMEWORK_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_FRAMEWORK_X86_LISTENTRY
+    #if defined(MSIX_FRAMEWORK_X86_LISTENTRY)
+        MSIX_FRAMEWORK_X86_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_MAIN_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_ARM64_LISTENTRY
+    #if defined(MSIX_MAIN_ARM64_LISTENTRY)
+        MSIX_MAIN_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_MAIN_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_X64_LISTENTRY
+    #if defined(MSIX_MAIN_X64_LISTENTRY)
+        MSIX_MAIN_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_MAIN_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_X86_LISTENTRY
+    #if defined(MSIX_MAIN_X86_LISTENTRY)
+        MSIX_MAIN_X86_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_ARM64_LISTENTRY
+    #if defined(MSIX_SINGLETON_ARM64_LISTENTRY)
+        MSIX_SINGLETON_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_X64_LISTENTRY
+    #if defined(MSIX_SINGLETON_X64_LISTENTRY)
+        MSIX_SINGLETON_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_X86_LISTENTRY
+    #if defined(MSIX_SINGLETON_X86_LISTENTRY)
+        MSIX_SINGLETON_X86_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_DDLM_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_DDLM_ARM64_LISTENTRY
+    #if defined(MSIX_DDLM_ARM64_LISTENTRY)
+        MSIX_DDLM_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_DDLM_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_DDLM_X64_LISTENTRY
+    #if defined(MSIX_DDLM_X64_LISTENTRY)
+        MSIX_DDLM_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_DDLM_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_DDLM_X86_LISTENTRY
+    #if defined(MSIX_DDLM_X86_LISTENTRY)
+        MSIX_DDLM_X86_LISTENTRY
     #endif
     };
 
@@ -77,23 +77,23 @@ namespace WindowsAppRuntimeInstaller {
         std::wstring resourceType;
     };
 
-    #if !defined(WINDOWSAPPRUNTIME_PROCESS_LICENSES)
-    #if defined(WINDOWSAPPRUNTIME_MAIN_LICENSE_LISTENTRY) || defined(WINDOWSAPPRUNTIME_SINGLETON_LICENSE_LISTENTRY)
-    #define WINDOWSAPPRUNTIME_PROCESS_LICENSES
+    #if !defined(MSIX_PROCESS_LICENSES)
+    #if defined(MSIX_MAIN_LICENSE_LISTENTRY) || defined(MSIX_SINGLETON_LICENSE_LISTENTRY)
+    #define MSIX_PROCESS_LICENSES
     #else
-    #undef WINDOWSAPPRUNTIME_PROCESS_LICENSES
+    #undef MSIX_PROCESS_LICENSES
     #endif
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_PROCESS_LICENSES)
+    #if defined(MSIX_PROCESS_LICENSES)
     static ResourceLicenseInfo c_licenses[] =
     {
-    #if defined(WINDOWSAPPRUNTIME_MAIN_LICENSE_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_LICENSE_LISTENTRY
+    #if defined(MSIX_MAIN_LICENSE_LISTENTRY)
+        MSIX_MAIN_LICENSE_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_LICENSE_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_LICENSE_LISTENTRY
+    #if defined(MSIX_SINGLETON_LICENSE_LISTENTRY)
+        MSIX_SINGLETON_LICENSE_LISTENTRY
     #endif
     };
     #endif