Bootstrapper missed an update resulting in FindDDLMViaEnumeration() looking for DDLM packages named ...ddlm-version... rather than ...ddlm.version... Local tests passed as they were named with dash but product DDLMs are named with . causing toplevel tests using production packages to fail. Fixed and updated local tests to use naming consistent with product to prevent future confusion (#5106)

DrusTheAxe · web-flow · commit 882cd4d21c9f · 2025-02-06T09:44:22.000-08:00
diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp
@@ -840,9 +840,9 @@ void FindDDLMViaEnumeration(
     // We need to look for DDLM packages in the package family for release <major>.<minor> and <versiontag>
     // But we have no single (simple) enumeration to match that so our logic's more involved compared
     // to FindDDLMViaAppExtension():
-    // 1. Look for Framework packages with Name="microsoft.winappruntime.ddlm-<minorversion>*[-shorttag]"
+    // 1. Look for Framework packages with Name="microsoft.winappruntime.ddlm.<minorversion>*[-shorttag]"
     // 1a. Enumerate all Framework packages registered to the user
-    // 1b. Only consider packages whose Name starts with "microsoft.winappruntime.ddlm-<minorversion>."
+    // 1b. Only consider packages whose Name starts with "microsoft.winappruntime.ddlm.<minorversion>."
     // 1c. If versiontag is specified, Only consider packages whose Name ends with [-shorttag]
     // 1d. Only consider packages whose PublisherID = "8wekyb3d8bbwe"
     // 2. Check if the package is in the <majorversion>.<minorversion> release
@@ -859,7 +859,7 @@ void FindDDLMViaEnumeration(
     }
     else
     {
-        packageNamePrefix = L"microsoft.winappruntime.ddlm-";
+        packageNamePrefix = L"microsoft.winappruntime.ddlm.";
     }
     const auto packageNamePrefixLength{ wcslen(packageNamePrefix) };
 
diff --git a/test/DynamicDependency/Test_Win32/TestPackages.h b/test/DynamicDependency/Test_Win32/TestPackages.h
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 namespace Test::Packages
@@ -37,7 +37,7 @@ namespace FrameworkWidgets
 #else
 #   error "Unknown processor architecture"
 #endif
-#define TEST_PACKAGE_DDLM_NAME          TEST_PACKAGE_DDLM_NAMEPREFIX L"-" TEST_PACKAGE_DDLM_VERSION L"-" TEST_PACKAGE_DDLM_ARCHITECTURE
+#define TEST_PACKAGE_DDLM_NAME          TEST_PACKAGE_DDLM_NAMEPREFIX L"." TEST_PACKAGE_DDLM_VERSION L"-" TEST_PACKAGE_DDLM_ARCHITECTURE
 #define TEST_PACKAGE_DDLM_PUBLISHERID   L"8wekyb3d8bbwe"
 #define TEST_PACKAGE_DDLM_FAMILYNAME    TEST_PACKAGE_DDLM_NAME L"_" TEST_PACKAGE_DDLM_PUBLISHERID
 #define TEST_PACKAGE_DDLM_FULLNAME      TEST_PACKAGE_DDLM_NAME L"_" TEST_PACKAGE_DDLM_VERSION L"_" TEST_PACKAGE_DDLM_ARCHITECTURE L"__" TEST_PACKAGE_DDLM_PUBLISHERID
@@ -73,7 +73,7 @@ namespace DynamicDependencyLifetimeManagerGC
     constexpr PCWSTR c_PackagePublisherId = TEST_PACKAGE_DDLM_PUBLISHERID;
 }
 
-#define TEST_PACKAGE_DDLMGC1000_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L"-1.0.0.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
+#define TEST_PACKAGE_DDLMGC1000_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L".1.0.0.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
 namespace DynamicDependencyLifetimeManagerGC1000
 {
     constexpr PCWSTR c_PackageDirName = L"DynamicDependencyLifetimeManagerGC1000";
@@ -99,7 +99,7 @@ namespace DynamicDependencyLifetimeManagerGC1000
     constexpr const UINT32 c_Version_MajorMinor = GetPackageVersionMajorMinor();
 }
 
-#define TEST_PACKAGE_DDLMGC1010_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L"-1.0.1.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
+#define TEST_PACKAGE_DDLMGC1010_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L".1.0.1.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
 namespace DynamicDependencyLifetimeManagerGC1010
 {
     constexpr PCWSTR c_PackageDirName = L"DynamicDependencyLifetimeManagerGC1010";
diff --git a/test/DynamicDependency/Test_WinRT/TestPackages.h b/test/DynamicDependency/Test_WinRT/TestPackages.h
@@ -73,7 +73,7 @@ namespace DynamicDependencyLifetimeManagerGC
     constexpr PCWSTR c_PackagePublisherId = TEST_PACKAGE_DDLM_PUBLISHERID;
 }
 
-#define TEST_PACKAGE_DDLMGC1000_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L"-1.0.0.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
+#define TEST_PACKAGE_DDLMGC1000_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L".1.0.0.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
 namespace DynamicDependencyLifetimeManagerGC1000
 {
     constexpr PCWSTR c_PackageDirName = L"DynamicDependencyLifetimeManagerGC1000";
@@ -99,7 +99,7 @@ namespace DynamicDependencyLifetimeManagerGC1000
     constexpr const UINT32 c_Version_MajorMinor = GetPackageVersionMajorMinor();
 }
 
-#define TEST_PACKAGE_DDLMGC1010_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L"-1.0.1.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
+#define TEST_PACKAGE_DDLMGC1010_NAME    TEST_PACKAGE_DDLMGC_NAMEPREFIX L".1.0.1.0-" TEST_PACKAGE_DDLM_ARCHITECTURE
 namespace DynamicDependencyLifetimeManagerGC1010
 {
     constexpr PCWSTR c_PackageDirName = L"DynamicDependencyLifetimeManagerGC1010";
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManager.Msix/appxmanifest-arm64.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManager.Msix/appxmanifest-arm64.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM-4.1.1967.333-arm64"
+    Name="WindowsAppRuntime.Test.DDLM.4.1.1967.333-arm64"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="4.1.1967.333"
     ProcessorArchitecture="arm64" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManager.Msix/appxmanifest-x64.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManager.Msix/appxmanifest-x64.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM-4.1.1967.333-x64"
+    Name="WindowsAppRuntime.Test.DDLM.4.1.1967.333-x64"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="4.1.1967.333"
     ProcessorArchitecture="x64" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManager.Msix/appxmanifest-x86.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManager.Msix/appxmanifest-x86.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM-4.1.1967.333-x86"
+    Name="WindowsAppRuntime.Test.DDLM.4.1.1967.333-x86"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="4.1.1967.333"
     ProcessorArchitecture="x86" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1000.Msix/appxmanifest-arm64.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1000.Msix/appxmanifest-arm64.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM.GC-1.0.0.0-arm64"
+    Name="WindowsAppRuntime.Test.DDLM.GC.1.0.0.0-arm64"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="1.0.0.0"
     ProcessorArchitecture="arm64" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1000.Msix/appxmanifest-x64.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1000.Msix/appxmanifest-x64.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM.GC-1.0.0.0-x64"
+    Name="WindowsAppRuntime.Test.DDLM.GC.1.0.0.0-x64"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="1.0.0.0"
     ProcessorArchitecture="x64" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1000.Msix/appxmanifest-x86.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1000.Msix/appxmanifest-x86.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM.GC-1.0.0.0-x86"
+    Name="WindowsAppRuntime.Test.DDLM.GC.1.0.0.0-x86"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="1.0.0.0"
     ProcessorArchitecture="x86" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1010.Msix/appxmanifest-arm64.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1010.Msix/appxmanifest-arm64.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM.GC-1.0.1.0-arm64"
+    Name="WindowsAppRuntime.Test.DDLM.GC.1.0.1.0-arm64"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="1.0.1.0"
     ProcessorArchitecture="arm64" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1010.Msix/appxmanifest-x64.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1010.Msix/appxmanifest-x64.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM.GC-1.0.1.0-x64"
+    Name="WindowsAppRuntime.Test.DDLM.GC.1.0.1.0-x64"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="1.0.1.0"
     ProcessorArchitecture="x64" />
diff --git a/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1010.Msix/appxmanifest-x86.xml b/test/DynamicDependency/data/DynamicDependencyLifetimeManagerGC1010.Msix/appxmanifest-x86.xml
@@ -10,7 +10,7 @@
   IgnorableNamespaces="uap uap3 uap5 com rescap">
 
   <Identity
-    Name="WindowsAppRuntime.Test.DDLM.GC-1.0.1.0-x86"
+    Name="WindowsAppRuntime.Test.DDLM.GC.1.0.1.0-x86"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="1.0.1.0"
     ProcessorArchitecture="x86" />
diff --git a/test/inc/WindowsAppRuntime.Test.Metadata.h b/test/inc/WindowsAppRuntime.Test.Metadata.h
@@ -40,7 +40,7 @@
 #else
 #   error "Unknown processor architecture"
 #endif
-#define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME           WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAMEPREFIX L"-" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_VERSION_STRING  L"-" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_ARCHITECTURE
+#define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME           WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAMEPREFIX L"." WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_VERSION_STRING  L"-" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_ARCHITECTURE
 #define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_PUBLISHERID    WINDOWSAPPRUNTIME_TEST_MSIX_PUBLISHERID
 #define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_FAMILYNAME     WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME L"_" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_PUBLISHERID
 #define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_FULLNAME       WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME L"_" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_VERSION_STRING L"_" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_ARCHITECTURE L"__" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_PUBLISHERID
diff --git a/test/inc/WindowsAppRuntime.Test.Package.h b/test/inc/WindowsAppRuntime.Test.Package.h
@@ -49,7 +49,7 @@
 #else
 #   error "Unknown processor architecture"
 #endif
-#define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME           WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAMEPREFIX L"-" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_VERSION_STRING L"-" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_ARCHITECTURE
+#define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME           WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAMEPREFIX L"." WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_VERSION_STRING L"-" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_ARCHITECTURE
 #define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_PUBLISHERID    WINDOWSAPPRUNTIME_TEST_MSIX_PUBLISHERID
 #define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_FAMILYNAME     WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME L"_" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_PUBLISHERID
 #define WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_FULLNAME       WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_NAME L"_" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_VERSION_STRING L"_" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_ARCHITECTURE L"__" WINDOWSAPPRUNTIME_TEST_PACKAGE_DDLM_PUBLISHERID

Original file line number	Diff line number	Diff line change
`@@ -840,9 +840,9 @@ void FindDDLMViaEnumeration(`
`840`	`840`	`// We need to look for DDLM packages in the package family for release <major>.<minor> and <versiontag>`
`841`	`841`	`// But we have no single (simple) enumeration to match that so our logic's more involved compared`
`842`	`842`	`// to FindDDLMViaAppExtension():`
`843`		`- // 1. Look for Framework packages with Name="microsoft.winappruntime.ddlm-<minorversion>*[-shorttag]"`
	`843`	`+ // 1. Look for Framework packages with Name="microsoft.winappruntime.ddlm.<minorversion>*[-shorttag]"`
`844`	`844`	`// 1a. Enumerate all Framework packages registered to the user`
`845`		`- // 1b. Only consider packages whose Name starts with "microsoft.winappruntime.ddlm-<minorversion>."`
	`845`	`+ // 1b. Only consider packages whose Name starts with "microsoft.winappruntime.ddlm.<minorversion>."`
`846`	`846`	`// 1c. If versiontag is specified, Only consider packages whose Name ends with [-shorttag]`
`847`	`847`	`// 1d. Only consider packages whose PublisherID = "8wekyb3d8bbwe"`
`848`	`848`	`// 2. Check if the package is in the <majorversion>.<minorversion> release`
`@@ -859,7 +859,7 @@ void FindDDLMViaEnumeration(`
`859`	`859`	`}`
`860`	`860`	`else`
`861`	`861`	`{`
`862`		`- packageNamePrefix = L"microsoft.winappruntime.ddlm-";`
	`862`	`+ packageNamePrefix = L"microsoft.winappruntime.ddlm.";`
`863`	`863`	`}`
`864`	`864`	`const auto packageNamePrefixLength{ wcslen(packageNamePrefix) };`
`865`	`865`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ namespace DynamicDependencyLifetimeManagerGC`
`73`	`73`	`constexpr PCWSTR c_PackagePublisherId = TEST_PACKAGE_DDLM_PUBLISHERID;`
`74`	`74`	`}`
`75`	`75`
`76`		`-#define TEST_PACKAGE_DDLMGC1000_NAME TEST_PACKAGE_DDLMGC_NAMEPREFIX L"-1.0.0.0-" TEST_PACKAGE_DDLM_ARCHITECTURE`
	`76`	`+#define TEST_PACKAGE_DDLMGC1000_NAME TEST_PACKAGE_DDLMGC_NAMEPREFIX L".1.0.0.0-" TEST_PACKAGE_DDLM_ARCHITECTURE`
`77`	`77`	`namespace DynamicDependencyLifetimeManagerGC1000`
`78`	`78`	`{`
`79`	`79`	`constexpr PCWSTR c_PackageDirName = L"DynamicDependencyLifetimeManagerGC1000";`
`@@ -99,7 +99,7 @@ namespace DynamicDependencyLifetimeManagerGC1000`
`99`	`99`	`constexpr const UINT32 c_Version_MajorMinor = GetPackageVersionMajorMinor();`
`100`	`100`	`}`
`101`	`101`
`102`		`-#define TEST_PACKAGE_DDLMGC1010_NAME TEST_PACKAGE_DDLMGC_NAMEPREFIX L"-1.0.1.0-" TEST_PACKAGE_DDLM_ARCHITECTURE`
	`102`	`+#define TEST_PACKAGE_DDLMGC1010_NAME TEST_PACKAGE_DDLMGC_NAMEPREFIX L".1.0.1.0-" TEST_PACKAGE_DDLM_ARCHITECTURE`
`103`	`103`	`namespace DynamicDependencyLifetimeManagerGC1010`
`104`	`104`	`{`
`105`	`105`	`constexpr PCWSTR c_PackageDirName = L"DynamicDependencyLifetimeManagerGC1010";`