From 0429b746bb425c102cc7ce07feccc5880a1c4df0 Mon Sep 17 00:00:00 2001 From: agniuks Date: Mon, 23 Mar 2026 13:37:41 -0700 Subject: [PATCH 01/10] Fix: Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars --- dev/Common/WindowsAppRuntimeAutoInitializer.cpp | 2 ++ dev/Deployment/DeploymentActivityContext.cpp | 6 +++--- dev/Deployment/DeploymentManager.cpp | 8 ++++---- dev/Deployment/DeploymentManagerAutoInitializer.cpp | 2 ++ .../UndockedRegFreeWinRT-AutoInitializer.cpp | 2 ++ .../MddBootstrapActivity.cpp | 6 +++--- .../MddBootstrapAutoInitializer.cpp | 3 +++ installer/dev/InstallActivityContext.cpp | 4 ++-- 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dev/Common/WindowsAppRuntimeAutoInitializer.cpp b/dev/Common/WindowsAppRuntimeAutoInitializer.cpp index 543e7348e4..7e5abcafb9 100644 --- a/dev/Common/WindowsAppRuntimeAutoInitializer.cpp +++ b/dev/Common/WindowsAppRuntimeAutoInitializer.cpp @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. See LICENSE in the project root for license information. +#include + // Forward-declare the various AutoInitialize functions namespace Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap { diff --git a/dev/Deployment/DeploymentActivityContext.cpp b/dev/Deployment/DeploymentActivityContext.cpp index 73111979d0..68b9dab6d6 100644 --- a/dev/Deployment/DeploymentActivityContext.cpp +++ b/dev/Deployment/DeploymentActivityContext.cpp @@ -37,7 +37,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszFile) { - m_lastFailure.file = *failure.pszFile; + m_lastFailure.file = failure.pszFile; } else { @@ -48,7 +48,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszMessage) { - m_lastFailure.message = *failure.pszMessage; + m_lastFailure.message = failure.pszMessage; } else { @@ -57,7 +57,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszModule) { - m_lastFailure.module = *failure.pszModule; + m_lastFailure.module = failure.pszModule; } else { diff --git a/dev/Deployment/DeploymentManager.cpp b/dev/Deployment/DeploymentManager.cpp index f63eea6e16..a7e478bb9e 100644 --- a/dev/Deployment/DeploymentManager.cpp +++ b/dev/Deployment/DeploymentManager.cpp @@ -209,9 +209,9 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem { deploymentResult = _Initialize(initializeActivityContext, packageFullName, deploymentInitializeOptions, isRepair); } - catch (winrt::hresult_error const& e) + catch (...) { - const HRESULT hr{ e.code() }; + const HRESULT hr{ wil::ResultFromCaughtException() }; auto packageIdentity{ AppModel::Identity::PackageIdentity::FromPackageFullName(packageFullName.c_str()) }; PCWSTR c_packageNamePrefix{ L"microsoft.windowsappruntime." }; @@ -219,7 +219,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem std::wstring release; if (CompareStringOrdinal(packageIdentity.Name(), -1, c_packageNamePrefix, -1, TRUE) == CSTR_EQUAL) { - release = packageIdentity.Name() + c_packageNamePrefixLength; + release = packageIdentity.Name() + c_packageNamePrefixLength; } else { @@ -242,7 +242,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem THROW_HR_MSG(hr, "PackageFullName=%ls Options: ForceDeployment=%c OnErrorShowUI=%c isRepair:%c", packageFullName.c_str(), deploymentInitializeOptions.ForceDeployment() ? 'Y' : 'N', - deploymentInitializeOptions.OnErrorShowUI() ? 'Y' : 'N', isRepair ? 'Y' : 'N' ); + deploymentInitializeOptions.OnErrorShowUI() ? 'Y' : 'N', isRepair ? 'Y' : 'N'); } // Success! diff --git a/dev/Deployment/DeploymentManagerAutoInitializer.cpp b/dev/Deployment/DeploymentManagerAutoInitializer.cpp index 07a3bcaf7e..7840fe2bbb 100644 --- a/dev/Deployment/DeploymentManagerAutoInitializer.cpp +++ b/dev/Deployment/DeploymentManagerAutoInitializer.cpp @@ -4,6 +4,8 @@ #include #include +#include + #include #include diff --git a/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp b/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp index 2ca590db64..8f76e132e3 100644 --- a/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp +++ b/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp @@ -4,6 +4,8 @@ #include #include +#include + // Ensure the including PE file has an import reference to // the WindowsAppSDK runtime DLL and thus gets loaded when // the including PE file gets loaded. diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp index 219a015335..8d4faebdab 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp @@ -18,7 +18,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszFile) { - m_lastFailure.file = *failure.pszFile; + m_lastFailure.file = failure.pszFile; } else { @@ -29,7 +29,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszMessage) { - m_lastFailure.message = *failure.pszMessage; + m_lastFailure.message = failure.pszMessage; } else { @@ -38,7 +38,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszModule) { - m_lastFailure.module = *failure.pszModule; + m_lastFailure.module = failure.pszModule; } else { diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp index f2aa32d42a..fb163c1947 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp @@ -4,6 +4,9 @@ #include #include #include + +#include + #include #include diff --git a/installer/dev/InstallActivityContext.cpp b/installer/dev/InstallActivityContext.cpp index 567098b528..10f091211f 100644 --- a/installer/dev/InstallActivityContext.cpp +++ b/installer/dev/InstallActivityContext.cpp @@ -37,7 +37,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszFile) { - m_lastFailure.file = *failure.pszFile; + m_lastFailure.file = failure.pszFile; } else { @@ -48,7 +48,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszMessage) { - m_lastFailure.message = *failure.pszMessage; + m_lastFailure.message = failure.pszMessage; } else { From 71c38bff5b21e997c0fb68412dfd5e254e7eb880 Mon Sep 17 00:00:00 2001 From: agniuks Date: Mon, 23 Mar 2026 15:59:46 -0700 Subject: [PATCH 02/10] containment --- dev/Deployment/DeploymentActivityContext.cpp | 11 ++++++++--- dev/Deployment/DeploymentManager.cpp | 13 ++++++++++++- .../RuntimeCompatibilityOptions.idl | 3 +++ .../MddBootstrapActivity.cpp | 11 ++++++++--- installer/dev/InstallActivityContext.cpp | 9 +++++++-- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dev/Deployment/DeploymentActivityContext.cpp b/dev/Deployment/DeploymentActivityContext.cpp index 68b9dab6d6..9eb2dc211a 100644 --- a/dev/Deployment/DeploymentActivityContext.cpp +++ b/dev/Deployment/DeploymentActivityContext.cpp @@ -5,6 +5,11 @@ #include "DeploymentActivityContext.h" +#include + +// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 + WindowsAppRuntime::Deployment::Activity::Context& WindowsAppRuntime::Deployment::Activity::Context::Get() { return g_DeploymentActivityContext; @@ -37,7 +42,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszFile) { - m_lastFailure.file = failure.pszFile; + m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); } else { @@ -48,7 +53,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszMessage) { - m_lastFailure.message = failure.pszMessage; + m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); } else { @@ -57,7 +62,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszModule) { - m_lastFailure.module = failure.pszModule; + m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); } else { diff --git a/dev/Deployment/DeploymentManager.cpp b/dev/Deployment/DeploymentManager.cpp index a7e478bb9e..6b93463e5f 100644 --- a/dev/Deployment/DeploymentManager.cpp +++ b/dev/Deployment/DeploymentManager.cpp @@ -18,6 +18,9 @@ // Bug 61124029: [1.8 servicing] Fixing reset activity data on deployment initialization #define WINAPPSDK_CHANGEID_61124029 61124029, WinAppSDK_1_8_6 +// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 + using namespace winrt; using namespace winrt::Windows::Foundation; @@ -211,7 +214,15 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem } catch (...) { - const HRESULT hr{ wil::ResultFromCaughtException() }; + const HRESULT hr = [&]() -> HRESULT { + if (WinAppSdk::Containment::IsChangeEnabled()) + { + return wil::ResultFromCaughtException(); + } + try { throw; } + catch (winrt::hresult_error const& e) { return e.code(); } + // Non-winrt::hresult_error exceptions propagate (old behavior) + }(); auto packageIdentity{ AppModel::Identity::PackageIdentity::FromPackageFullName(packageFullName.c_str()) }; PCWSTR c_packageNamePrefix{ L"microsoft.windowsappruntime." }; diff --git a/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl b/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl index fef275fc8f..38213e96c7 100644 --- a/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl +++ b/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl @@ -34,6 +34,9 @@ namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime AppLifecycle_SharedMemoryRedirectionQueueFix = 60972838, SplitMenuFlyoutItem_Available = 60878987, TextIntelligence_Insights = 61106039, + + // 1.8.7 + DeploymentManager_DiagnosabilityFix = 57688028, }; /// Represents a version of the Windows App Runtime. diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp index 8d4faebdab..b3a1d5205a 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp @@ -6,6 +6,11 @@ #include "pch.h" #include "MddBootstrapActivity.h" +#include + +// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 + WindowsAppRuntime::MddBootstrap::Activity::Context& WindowsAppRuntime::MddBootstrap::Activity::Context::Get() { return g_bootstrapActivityContext; @@ -18,7 +23,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszFile) { - m_lastFailure.file = failure.pszFile; + m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); } else { @@ -29,7 +34,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszMessage) { - m_lastFailure.message = failure.pszMessage; + m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); } else { @@ -38,7 +43,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszModule) { - m_lastFailure.module = failure.pszModule; + m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); } else { diff --git a/installer/dev/InstallActivityContext.cpp b/installer/dev/InstallActivityContext.cpp index 10f091211f..b3e4862862 100644 --- a/installer/dev/InstallActivityContext.cpp +++ b/installer/dev/InstallActivityContext.cpp @@ -4,6 +4,11 @@ #include "pch.h" #include "InstallActivityContext.h" +#include + +// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 + WindowsAppRuntimeInstaller::InstallActivity::Context& WindowsAppRuntimeInstaller::InstallActivity::Context::Get() { return g_installActivityContext; @@ -37,7 +42,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszFile) { - m_lastFailure.file = failure.pszFile; + m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); } else { @@ -48,7 +53,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszMessage) { - m_lastFailure.message = failure.pszMessage; + m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); } else { From 75f791633318c3bf622eb55cdc556dd34c03cd25 Mon Sep 17 00:00:00 2001 From: agniuks Date: Mon, 23 Mar 2026 16:01:41 -0700 Subject: [PATCH 03/10] fix ado id --- dev/Deployment/DeploymentActivityContext.cpp | 10 +++++----- dev/Deployment/DeploymentManager.cpp | 6 +++--- .../RuntimeCompatibilityOptions.idl | 2 +- .../MddBootstrapActivity.cpp | 12 ++++++------ installer/dev/InstallActivityContext.cpp | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dev/Deployment/DeploymentActivityContext.cpp b/dev/Deployment/DeploymentActivityContext.cpp index 9eb2dc211a..af976bf307 100644 --- a/dev/Deployment/DeploymentActivityContext.cpp +++ b/dev/Deployment/DeploymentActivityContext.cpp @@ -7,8 +7,8 @@ #include -// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars -#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 +// Bug 61543987: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_61543987 61543987, WinAppSDK_1_8_7 WindowsAppRuntime::Deployment::Activity::Context& WindowsAppRuntime::Deployment::Activity::Context::Get() { @@ -42,7 +42,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszFile) { - m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); + m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); } else { @@ -53,7 +53,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszMessage) { - m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); + m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); } else { @@ -62,7 +62,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszModule) { - m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); + m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); } else { diff --git a/dev/Deployment/DeploymentManager.cpp b/dev/Deployment/DeploymentManager.cpp index 6b93463e5f..9f223389ea 100644 --- a/dev/Deployment/DeploymentManager.cpp +++ b/dev/Deployment/DeploymentManager.cpp @@ -18,8 +18,8 @@ // Bug 61124029: [1.8 servicing] Fixing reset activity data on deployment initialization #define WINAPPSDK_CHANGEID_61124029 61124029, WinAppSDK_1_8_6 -// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars -#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 +// Bug 61543987: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_61543987 61543987, WinAppSDK_1_8_7 using namespace winrt; using namespace winrt::Windows::Foundation; @@ -215,7 +215,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem catch (...) { const HRESULT hr = [&]() -> HRESULT { - if (WinAppSdk::Containment::IsChangeEnabled()) + if (WinAppSdk::Containment::IsChangeEnabled()) { return wil::ResultFromCaughtException(); } diff --git a/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl b/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl index 38213e96c7..048a74db70 100644 --- a/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl +++ b/dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl @@ -36,7 +36,7 @@ namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime TextIntelligence_Insights = 61106039, // 1.8.7 - DeploymentManager_DiagnosabilityFix = 57688028, + DeploymentManager_DiagnosabilityFix = 61543987, }; /// Represents a version of the Windows App Runtime. diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp index b3a1d5205a..b55c738379 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation and Contributors. +// Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. #pragma once @@ -8,8 +8,8 @@ #include -// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars -#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 +// Bug 61543987: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_61543987 61543987, WinAppSDK_1_8_7 WindowsAppRuntime::MddBootstrap::Activity::Context& WindowsAppRuntime::MddBootstrap::Activity::Context::Get() { @@ -23,7 +23,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszFile) { - m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); + m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); } else { @@ -34,7 +34,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszMessage) { - m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); + m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); } else { @@ -43,7 +43,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszModule) { - m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); + m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); } else { diff --git a/installer/dev/InstallActivityContext.cpp b/installer/dev/InstallActivityContext.cpp index b3e4862862..dd4d90a7ff 100644 --- a/installer/dev/InstallActivityContext.cpp +++ b/installer/dev/InstallActivityContext.cpp @@ -6,8 +6,8 @@ #include -// Bug 57688028: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars -#define WINAPPSDK_CHANGEID_57688028 57688028, WinAppSDK_1_8_7 +// Bug 61543987: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars +#define WINAPPSDK_CHANGEID_61543987 61543987, WinAppSDK_1_8_7 WindowsAppRuntimeInstaller::InstallActivity::Context& WindowsAppRuntimeInstaller::InstallActivity::Context::Get() { @@ -42,7 +42,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszFile) { - m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); + m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); } else { @@ -53,7 +53,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszMessage) { - m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); + m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); } else { From 1cbc80c1a327878787ed30d3b5e29cc14726540d Mon Sep 17 00:00:00 2001 From: agniuks Date: Tue, 24 Mar 2026 09:52:50 -0700 Subject: [PATCH 04/10] address feedback/ --- dev/Deployment/DeploymentActivityContext.cpp | 9 ++++++++- dev/Deployment/DeploymentManager.cpp | 2 +- .../MddBootstrapActivity.cpp | 9 ++++++++- installer/dev/InstallActivityContext.cpp | 9 ++++++++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dev/Deployment/DeploymentActivityContext.cpp b/dev/Deployment/DeploymentActivityContext.cpp index af976bf307..bebba88a03 100644 --- a/dev/Deployment/DeploymentActivityContext.cpp +++ b/dev/Deployment/DeploymentActivityContext.cpp @@ -42,7 +42,14 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszFile) { - m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.file = failure.pszFile; + } + else + { + m_lastFailure.file = std::wstring(1, *failure.pszFile); + } } else { diff --git a/dev/Deployment/DeploymentManager.cpp b/dev/Deployment/DeploymentManager.cpp index 9f223389ea..11ad21001b 100644 --- a/dev/Deployment/DeploymentManager.cpp +++ b/dev/Deployment/DeploymentManager.cpp @@ -214,7 +214,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem } catch (...) { - const HRESULT hr = [&]() -> HRESULT { + const HRESULT hr = []() -> HRESULT { if (WinAppSdk::Containment::IsChangeEnabled()) { return wil::ResultFromCaughtException(); diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp index b55c738379..82cd4691a5 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp @@ -23,7 +23,14 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszFile) { - m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.file = failure.pszFile; + } + else + { + m_lastFailure.file = std::wstring(1, *failure.pszFile); + } } else { diff --git a/installer/dev/InstallActivityContext.cpp b/installer/dev/InstallActivityContext.cpp index dd4d90a7ff..a4acf929e6 100644 --- a/installer/dev/InstallActivityContext.cpp +++ b/installer/dev/InstallActivityContext.cpp @@ -42,7 +42,14 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszFile) { - m_lastFailure.file = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszFile : std::wstring(1, *failure.pszFile); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.file = failure.pszFile; + } + else + { + m_lastFailure.file = std::wstring(1, *failure.pszFile); + } } else { From 566b1153061a6d485a8d55b63929d5a9bc3d6e4f Mon Sep 17 00:00:00 2001 From: agniuks Date: Tue, 24 Mar 2026 09:58:36 -0700 Subject: [PATCH 05/10] better containment --- dev/Deployment/DeploymentActivityContext.cpp | 18 ++++++++++++++++-- .../MddBootstrapActivity.cpp | 18 ++++++++++++++++-- installer/dev/InstallActivityContext.cpp | 9 ++++++++- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dev/Deployment/DeploymentActivityContext.cpp b/dev/Deployment/DeploymentActivityContext.cpp index bebba88a03..3a4c34ef1e 100644 --- a/dev/Deployment/DeploymentActivityContext.cpp +++ b/dev/Deployment/DeploymentActivityContext.cpp @@ -60,7 +60,14 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszMessage) { - m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.message = failure.pszMessage; + } + else + { + m_lastFailure.message = std::wstring(1, *failure.pszMessage); + } } else { @@ -69,7 +76,14 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: if (failure.pszModule) { - m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.module = failure.pszModule; + } + else + { + m_lastFailure.module = std::wstring(1, *failure.pszModule); + } } else { diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp index 82cd4691a5..351d92db0c 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp @@ -41,7 +41,14 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszMessage) { - m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.message = failure.pszMessage; + } + else + { + m_lastFailure.message = std::wstring(1, *failure.pszMessage); + } } else { @@ -50,7 +57,14 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszModule) { - m_lastFailure.module = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszModule : std::wstring(1, *failure.pszModule); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.module = failure.pszModule; + } + else + { + m_lastFailure.module = std::wstring(1, *failure.pszModule); + } } else { diff --git a/installer/dev/InstallActivityContext.cpp b/installer/dev/InstallActivityContext.cpp index a4acf929e6..0b3f009279 100644 --- a/installer/dev/InstallActivityContext.cpp +++ b/installer/dev/InstallActivityContext.cpp @@ -60,7 +60,14 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const if (failure.pszMessage) { - m_lastFailure.message = WinAppSdk::Containment::IsChangeEnabled() ? failure.pszMessage : std::wstring(1, *failure.pszMessage); + if (WinAppSdk::Containment::IsChangeEnabled()) + { + m_lastFailure.message = failure.pszMessage; + } + else + { + m_lastFailure.message = std::wstring(1, *failure.pszMessage); + } } else { From 6aa6dcde1660e2327da19c963d65fde24a71bb3e Mon Sep 17 00:00:00 2001 From: agniuks Date: Tue, 24 Mar 2026 16:21:13 -0700 Subject: [PATCH 06/10] fix containment --- dev/Deployment/DeploymentActivityContext.cpp | 6 +++--- dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp | 6 +++--- installer/dev/InstallActivityContext.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/Deployment/DeploymentActivityContext.cpp b/dev/Deployment/DeploymentActivityContext.cpp index 3a4c34ef1e..40de107756 100644 --- a/dev/Deployment/DeploymentActivityContext.cpp +++ b/dev/Deployment/DeploymentActivityContext.cpp @@ -48,7 +48,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: } else { - m_lastFailure.file = std::wstring(1, *failure.pszFile); + m_lastFailure.file = *failure.pszFile; } } else @@ -66,7 +66,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: } else { - m_lastFailure.message = std::wstring(1, *failure.pszMessage); + m_lastFailure.message = *failure.pszMessage; } } else @@ -82,7 +82,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil: } else { - m_lastFailure.module = std::wstring(1, *failure.pszModule); + m_lastFailure.module = *failure.pszModule; } } else diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp index 351d92db0c..e2ad294942 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp @@ -29,7 +29,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi } else { - m_lastFailure.file = std::wstring(1, *failure.pszFile); + m_lastFailure.file = *failure.pszFile; } } else @@ -47,7 +47,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi } else { - m_lastFailure.message = std::wstring(1, *failure.pszMessage); + m_lastFailure.message = *failure.pszMessage; } } else @@ -63,7 +63,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi } else { - m_lastFailure.module = std::wstring(1, *failure.pszModule); + m_lastFailure.module = *failure.pszModule; } } else diff --git a/installer/dev/InstallActivityContext.cpp b/installer/dev/InstallActivityContext.cpp index 0b3f009279..2fb196a181 100644 --- a/installer/dev/InstallActivityContext.cpp +++ b/installer/dev/InstallActivityContext.cpp @@ -48,7 +48,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const } else { - m_lastFailure.file = std::wstring(1, *failure.pszFile); + m_lastFailure.file = *failure.pszFile; } } else @@ -66,7 +66,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const } else { - m_lastFailure.message = std::wstring(1, *failure.pszMessage); + m_lastFailure.message = *failure.pszMessage; } } else From b8c3103bb2bd4f20a90fc3b39c580deafb690b0f Mon Sep 17 00:00:00 2001 From: agniuks Date: Wed, 25 Mar 2026 10:45:39 -0700 Subject: [PATCH 07/10] Add FrameworkUdk NuGet reference to BootstrapDLL for Containment.h --- .../WindowsAppRuntime_BootstrapDLL.vcxproj | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj index 2e468ebae2..cf8c8336ea 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj +++ b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj @@ -133,7 +133,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -156,7 +156,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -179,7 +179,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -202,7 +202,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -225,7 +225,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -248,7 +248,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -295,6 +295,7 @@ + @@ -306,6 +307,7 @@ + From 51499d0f0a313057ee5b7ea3af9eed5aef06d565 Mon Sep 17 00:00:00 2001 From: agniuks Date: Wed, 25 Mar 2026 13:11:35 -0700 Subject: [PATCH 08/10] Copy FrameworkUdk.dll to DynamicDependency test output dirs --- .../Test_Win32/DynamicDependency_Test_Win32.vcxproj | 1 + .../Test_WinRT/DynamicDependency_Test_WinRT.vcxproj | 1 + 2 files changed, 2 insertions(+) diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index 9ef52159d2..7cff966e2b 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -247,6 +247,7 @@ + diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 9007764baa..85520c0544 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -244,6 +244,7 @@ + From dc4ac2d994256ac98c3831a6400b1dd79285da84 Mon Sep 17 00:00:00 2001 From: agniuks Date: Mon, 30 Mar 2026 13:39:26 -0700 Subject: [PATCH 09/10] remove frameworkudk import in bootstrapper --- .../MddBootstrapActivity.cpp | 34 +++---------------- .../WindowsAppRuntime_BootstrapDLL.vcxproj | 14 ++++---- .../DynamicDependency_Test_Win32.vcxproj | 1 - .../DynamicDependency_Test_WinRT.vcxproj | 1 - 4 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp index e2ad294942..8d4faebdab 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation and Contributors. +// Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. #pragma once @@ -6,11 +6,6 @@ #include "pch.h" #include "MddBootstrapActivity.h" -#include - -// Bug 61543987: [1.8 servicing] Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars -#define WINAPPSDK_CHANGEID_61543987 61543987, WinAppSDK_1_8_7 - WindowsAppRuntime::MddBootstrap::Activity::Context& WindowsAppRuntime::MddBootstrap::Activity::Context::Get() { return g_bootstrapActivityContext; @@ -23,14 +18,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszFile) { - if (WinAppSdk::Containment::IsChangeEnabled()) - { - m_lastFailure.file = failure.pszFile; - } - else - { - m_lastFailure.file = *failure.pszFile; - } + m_lastFailure.file = failure.pszFile; } else { @@ -41,14 +29,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszMessage) { - if (WinAppSdk::Containment::IsChangeEnabled()) - { - m_lastFailure.message = failure.pszMessage; - } - else - { - m_lastFailure.message = *failure.pszMessage; - } + m_lastFailure.message = failure.pszMessage; } else { @@ -57,14 +38,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi if (failure.pszModule) { - if (WinAppSdk::Containment::IsChangeEnabled()) - { - m_lastFailure.module = failure.pszModule; - } - else - { - m_lastFailure.module = *failure.pszModule; - } + m_lastFailure.module = failure.pszModule; } else { diff --git a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj index cf8c8336ea..2e468ebae2 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj +++ b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj @@ -133,7 +133,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -156,7 +156,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -179,7 +179,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -202,7 +202,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -225,7 +225,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -248,7 +248,7 @@ %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) WindowsAppRuntime.Bootstrap.def - Microsoft.Internal.FrameworkUdk.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) None @@ -295,7 +295,6 @@ - @@ -307,7 +306,6 @@ - diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index 7cff966e2b..9ef52159d2 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -247,7 +247,6 @@ - diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 85520c0544..9007764baa 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -244,7 +244,6 @@ - From 5a0beccb73f85b9de1388462740d77bb9c2fc674 Mon Sep 17 00:00:00 2001 From: agniuks Date: Mon, 30 Mar 2026 16:42:32 -0700 Subject: [PATCH 10/10] Remove wil/cppwinrt.h from NuGet-shipped auto-initializer files --- dev/Common/WindowsAppRuntimeAutoInitializer.cpp | 2 -- dev/Deployment/DeploymentManagerAutoInitializer.cpp | 2 -- .../UndockedRegFreeWinRT-AutoInitializer.cpp | 2 -- .../MddBootstrapAutoInitializer.cpp | 2 -- 4 files changed, 8 deletions(-) diff --git a/dev/Common/WindowsAppRuntimeAutoInitializer.cpp b/dev/Common/WindowsAppRuntimeAutoInitializer.cpp index 7e5abcafb9..543e7348e4 100644 --- a/dev/Common/WindowsAppRuntimeAutoInitializer.cpp +++ b/dev/Common/WindowsAppRuntimeAutoInitializer.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. See LICENSE in the project root for license information. -#include - // Forward-declare the various AutoInitialize functions namespace Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap { diff --git a/dev/Deployment/DeploymentManagerAutoInitializer.cpp b/dev/Deployment/DeploymentManagerAutoInitializer.cpp index 7840fe2bbb..07a3bcaf7e 100644 --- a/dev/Deployment/DeploymentManagerAutoInitializer.cpp +++ b/dev/Deployment/DeploymentManagerAutoInitializer.cpp @@ -4,8 +4,6 @@ #include #include -#include - #include #include diff --git a/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp b/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp index 8f76e132e3..2ca590db64 100644 --- a/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp +++ b/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp @@ -4,8 +4,6 @@ #include #include -#include - // Ensure the including PE file has an import reference to // the WindowsAppSDK runtime DLL and thus gets loaded when // the including PE file gets loaded. diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp index fb163c1947..3077f4add0 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp @@ -5,8 +5,6 @@ #include #include -#include - #include #include