Skip to content

Cherry-pick: Fixing reset activity data on deployment initialization #6227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guimafelipe merged 4 commits into from
Feb 21, 2026
+24 −3
Merged

Cherry-pick: Fixing reset activity data on deployment initialization #6227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5f9221
Small fix on reset locations
guimafelipe Sep 24, 2025
57501f2
Add containment for reset activity data fix
guimafelipe Feb 19, 2026
4b09683
Merge branch 'release/1.8-stable' into user/felipeda/cherry-pick-rese…
agniuks Feb 21, 2026
57da454
Merge branch 'release/1.8-stable' into user/felipeda/cherry-pick-rese…
agniuks Feb 21, 2026
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
2 changes: 1 addition & 1 deletion dev/Deployment/DeploymentActivityContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#include <pch.h>
Expand Down
25 changes: 23 additions & 2 deletions dev/Deployment/DeploymentManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
// Bug 60760194: [1.8 servicing] DeploymentManager failing with error package downgrade
#define WINAPPSDK_CHANGEID_60760194 60760194, WinAppSDK_1_8_5

// Bug 61124029: [1.8 servicing] Fixing reset activity data on deployment initialization
#define WINAPPSDK_CHANGEID_61124029 61124029, WinAppSDK_1_8_6

using namespace winrt;
using namespace winrt::Windows::Foundation;

Expand Down Expand Up @@ -502,6 +505,10 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem

HRESULT DeploymentManager::InstallLicenses(const std::wstring& frameworkPackageFullName)
{
if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_61124029>())
{
::WindowsAppRuntime::Deployment::Activity::Context::Get().Reset();
}
::WindowsAppRuntime::Deployment::Activity::Context::Get().SetInstallStage(::WindowsAppRuntime::Deployment::Activity::DeploymentStage::GetLicensePath);

// Build path for licenses
Expand Down Expand Up @@ -529,7 +536,10 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
auto licenseFilename{ licensePath };
licenseFilename /= findFileData.cFileName;

::WindowsAppRuntime::Deployment::Activity::Context::Get().Reset();
if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_61124029>())
{
::WindowsAppRuntime::Deployment::Activity::Context::Get().Reset();
}
::WindowsAppRuntime::Deployment::Activity::Context::Get().SetCurrentResourceId(licenseFilename);

RETURN_IF_FAILED_MSG(licenseInstaller.InstallLicenseFile(licenseFilename.c_str()),
Expand All @@ -549,15 +559,26 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
HRESULT DeploymentManager::DeployPackages(const std::wstring& frameworkPackageFullName, const bool forceDeployment)
{
auto initializeActivity{ ::WindowsAppRuntime::Deployment::Activity::Context::Get() };
if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_61124029>())
{
initializeActivity.Reset();
}

initializeActivity.SetInstallStage(::WindowsAppRuntime::Deployment::Activity::DeploymentStage::GetPackagePath);
const auto frameworkPath{ std::filesystem::path(GetPackagePath(frameworkPackageFullName)) };

initializeActivity.SetInstallStage(::WindowsAppRuntime::Deployment::Activity::DeploymentStage::AddPackage);
if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_61124029>())
{
initializeActivity.SetInstallStage(::WindowsAppRuntime::Deployment::Activity::DeploymentStage::AddPackage);
}
for (auto package : c_targetPackages)
{
auto isSingleton{ CompareStringOrdinal(package.identifier.c_str(), -1, WINDOWSAPPRUNTIME_PACKAGE_SUBTYPENAME_SINGLETON, -1, TRUE) == CSTR_EQUAL };
initializeActivity.Reset();
if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_61124029>())
{
initializeActivity.SetInstallStage(::WindowsAppRuntime::Deployment::Activity::DeploymentStage::AddPackage);
}
initializeActivity.SetCurrentResourceId(package.identifier);

std::filesystem::path packagePath{};
Expand Down