From 8774ba7ff2f677798fa558bdd046c472ed370ad7 Mon Sep 17 00:00:00 2001 From: "Chris Wall (WIN SDE)" Date: Mon, 20 Oct 2025 12:43:26 -0600 Subject: [PATCH 1/4] Bootstrap knows how to create verison 2 family name --- .../MddBootstrap.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp index d9e186cdd3..6171a49c99 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp @@ -508,12 +508,24 @@ std::wstring GetFrameworkPackageFamilyName( PCWSTR packageVersionTag{ !versionTag ? L"" : versionTag }; PCWSTR packageVersionTagDelimiter{ (packageVersionTag[0] == L'\0') ? L"" : L"-"}; - const std::wstring packageFamilyName{ std::format(L"{}.{}.{}{}{}_8wekyb3d8bbwe", + if (majorVersion == 1) + { + const std::wstring packageFamilyName{ std::format(L"{}.{}.{}{}{}_8wekyb3d8bbwe", namePrefix, majorVersion, minorVersion, packageVersionTagDelimiter, packageVersionTag) }; - THROW_HR_IF_MSG(E_INVALIDARG, packageFamilyName.length() > PACKAGE_FAMILY_NAME_MAX_LENGTH, "%ls", packageFamilyName.c_str()); + THROW_HR_IF_MSG(E_INVALIDARG, packageFamilyName.length() > PACKAGE_FAMILY_NAME_MAX_LENGTH, "%ls", packageFamilyName.c_str()); - return packageFamilyName; + return packageFamilyName; + } + else + { + const std::wstring packageFamilyName{ std::format(L"{}.{}{}{}_8wekyb3d8bbwe", + namePrefix, majorVersion, + packageVersionTagDelimiter, packageVersionTag) }; + THROW_HR_IF_MSG(E_INVALIDARG, packageFamilyName.length() > PACKAGE_FAMILY_NAME_MAX_LENGTH, "%ls", packageFamilyName.c_str()); + + return packageFamilyName; + } } /// Determine the path for the Windows App Runtime Framework package From d3cd969ddb35c91af6099161ce3c839bee8f968d Mon Sep 17 00:00:00 2001 From: "Chris Wall (WIN SDE)" Date: Fri, 24 Oct 2025 10:21:34 -0600 Subject: [PATCH 2/4] Change to PatchVersion with Revision --- .../WindowsAppSDK-PackTransportPackage-Stage.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml index 164e6f52d9..95164495c1 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml @@ -185,8 +185,7 @@ stages: } $buildType = '$(channel)' - $majorMinorPatchRev = '$(MajorVersion).$(MinorVersion).$(versionMinDate)' - $majorMinorPatchRev = $majorMinorPatchRev + $paddedRevision + $majorMinorPatchRev = '$(MajorVersion).$(MinorVersion).$(PatchVersion)' if ($env:ComponentType) { @@ -219,7 +218,11 @@ stages: $formattedTag = '' if(-not [String]::IsNullOrEmpty($versionTag)) { - $formattedTag = '-' + $versionTag + $formattedTag = '-' + $versionTag + "+" + $(versionMinDate) + $paddedRevision + } + else + { + $formattedTag = "+" + $(versionMinDate) + $paddedRevision } Write-Host "Using Release Versioning" $version = $majorMinorPatchRev + $formattedTag From 96f1713d86324514106847afd342a48dc3069be3 Mon Sep 17 00:00:00 2001 From: "Chris Wall (WIN SDE)" Date: Mon, 27 Oct 2025 11:26:30 -0600 Subject: [PATCH 3/4] Change symbol before Date to '-' --- .../WindowsAppSDK-PackTransportPackage-Stage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml index 95164495c1..3b0002a769 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml @@ -218,11 +218,11 @@ stages: $formattedTag = '' if(-not [String]::IsNullOrEmpty($versionTag)) { - $formattedTag = '-' + $versionTag + "+" + $(versionMinDate) + $paddedRevision + $formattedTag = '-' + $versionTag + "-" + $(versionMinDate) + $paddedRevision } else { - $formattedTag = "+" + $(versionMinDate) + $paddedRevision + $formattedTag = "-" + $(versionMinDate) + $paddedRevision } Write-Host "Using Release Versioning" $version = $majorMinorPatchRev + $formattedTag From d728067de4218d7149c72e5d75b3d83e52e59486 Mon Sep 17 00:00:00 2001 From: "Chris Wall (WIN SDE)" Date: Wed, 29 Oct 2025 13:08:42 -0600 Subject: [PATCH 4/4] Revert back to '+' --- .../WindowsAppSDK-PackTransportPackage-Stage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml index 3b0002a769..95164495c1 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml @@ -218,11 +218,11 @@ stages: $formattedTag = '' if(-not [String]::IsNullOrEmpty($versionTag)) { - $formattedTag = '-' + $versionTag + "-" + $(versionMinDate) + $paddedRevision + $formattedTag = '-' + $versionTag + "+" + $(versionMinDate) + $paddedRevision } else { - $formattedTag = "-" + $(versionMinDate) + $paddedRevision + $formattedTag = "+" + $(versionMinDate) + $paddedRevision } Write-Host "Using Release Versioning" $version = $majorMinorPatchRev + $formattedTag