Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ stages:
}

$buildType = '$(channel)'
$majorMinorPatchRev = '$(MajorVersion).$(MinorVersion).$(versionMinDate)'
$majorMinorPatchRev = $majorMinorPatchRev + $paddedRevision
$majorMinorPatchRev = '$(MajorVersion).$(MinorVersion).$(PatchVersion)'

if ($env:ComponentType)
{
Expand Down Expand Up @@ -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
Expand Down
18 changes: 15 additions & 3 deletions dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down