Skip to content

Commit c6c2234

Browse files
DrusTheAxeDrusTheAxe
authored
PackageDeploymentManager: IsReadyOrNewerAvailable(), FrameworkUdk update, Implement not-implemented functions, Tests! (#4453)
This PR does multiple things * Add Is*ReadyOrNewerAvailable*() * Add EnsureReadyOptions.RegisterNewerIfAvailable=bool * Add Is*Provisioned*() * Fix progress updates when PackageSet.Items.Count>=2 (was (re)set to 0-1.0 for each item, not collectively for the whole operation) * Update to recent FrameworkUdk * Implement previously not-implemented functions (Remove, Repair, Reset) * Expanded test coverage * Update TAEF to 10.92.240405002 * DevCheck * Added -InstallWindowsSDK option to install Windows (Platform) SDK if desired * Fix DevUnlock check on a machine w/o DeveloperMode enabled (last registry access doing registry access the unsafe way error'ing if the value doesn't exist in the registry) KNOWN ISSUES: * Need updated Platform SDK to resolve known issues * Register*Async() errors on 20H2/Vb3. * Reset*Async() succeeds but ends w/o the package being registered * RemovePackageByUriAsync() throws E_NOTIMPL * RemovePackageSetAsync() throws E_NOTIMPL if PackageUri=ms-uup * Provision*Async() not supported yet * Deprovision*Async() not supported yet https://task.ms/49555034 https://task.ms/48914090 https://task.ms/48964562 Additional changes * Fixed progress reporting incorrect .progress percentage values * Added StringToSid() and SidToString() * Refactored common code into WaitForDeploymentOperation * Added IsPackageRegistrationPending. Removed dead code. Added Black+Blacker test Main packages. * Added PackageFamilyName() property to PackageIdentity * Added IsPackageDeploymentFeatureSupported and initial support for Containment. * Fixed RemovePackageOptions.FailIfNotFound. * Improved logging * Expanded tests. * Fixed RemovePackageOptions.FailIfNotFound default (was true, supposed to be false). Mostly implemented RemovePackageSetAsync; URI handling is blocked awaiting FrameworkUdk update (imminent). * Updated to latest FrameworkUdk * Patched tests to deal with RemovePackage is awaiting updated Platform SDK * Removed dead code. Updated some not-impl to impl :-) * Repair! * Added IsProvisioned * Added Provisioning tests and support * Added Deprovision tests (in progress). * Optimized test code * Upgraded TAEF to 10.92.240405002 * Tweak build logic to support Windows SDK 10.0.26100.0 but not fail if using 10.0.22621.0 * Tweaked SDK detection * Fixed some URI handling * DevCheck: * Add docs re PackageSet properties * Added workaround for tests not wired to work on 20H2/Vb
1 parent 6eb39ea commit c6c2234

File tree

136 files changed

+14686
-2892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+14686
-2892
lines changed

‎WindowsAppRuntime.sln‎

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,13 @@ EndProject
461461
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackageManagerTests", "test\PackageManager\API\PackageManagerTests.vcxproj", "{4A38CB80-3580-4960-9B31-3301058B7AFE}"
462462
ProjectSection(ProjectDependencies) = postProject
463463
{09DDAE21-397F-4263-8561-7F2FF28127CF} = {09DDAE21-397F-4263-8561-7F2FF28127CF}
464+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF} = {28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}
465+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA} = {39277B4C-4FB5-45F6-B0AA-EE8086590CDA}
464466
{4626E11F-A7A4-41A2-B22D-5A108BC369AC} = {4626E11F-A7A4-41A2-B22D-5A108BC369AC}
465467
{58E95711-A12F-4C0E-A978-C6B4A0842AC8} = {58E95711-A12F-4C0E-A978-C6B4A0842AC8}
466468
{66D0D8B1-FAF4-4C6A-8303-07F3BA356FE3} = {66D0D8B1-FAF4-4C6A-8303-07F3BA356FE3}
469+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51} = {AC79B8FF-4C27-4326-AD20-BBC70059FF51}
470+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D} = {AD7D0A19-44B9-41D6-A68A-9FECAC28078D}
467471
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
468472
{D0A1DFB8-8CEE-4CFC-B57B-B7C574B411C2} = {D0A1DFB8-8CEE-4CFC-B57B-B7C574B411C2}
469473
{F2946790-DAF7-4DFF-A754-BA471A12E494} = {F2946790-DAF7-4DFF-A754-BA471A12E494}
@@ -493,6 +497,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Windows.Managemen
493497
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
494498
EndProjectSection
495499
EndProject
500+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManager.Test.M.Black.msix", "PackageManager.Test.M.Black.msix", "{1AC589D7-FA54-470E-8640-AB2477CA844C}"
501+
EndProject
502+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManager.Test.M.Blacker.msix", "PackageManager.Test.M.Blacker.msix", "{4567CD12-A0A7-4E65-8075-B17C09261767}"
503+
EndProject
504+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackageManager.Test.M.Black.msix", "test\PackageManager\data\PackageManager.Test.M.Black.msix\PackageManager.Test.M.Black.msix.vcxproj", "{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}"
505+
EndProject
506+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackageManager.Test.M.Blacker.msix", "test\PackageManager\data\PackageManager.Test.M.Blacker.msix\PackageManager.Test.M.Blacker.msix.vcxproj", "{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}"
507+
EndProject
508+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManager.Test.M.White.msix", "PackageManager.Test.M.White.msix", "{6759ECC6-9381-4172-89E6-853F81A03D28}"
509+
EndProject
510+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManager.Test.M.Whiter.msix", "PackageManager.Test.M.Whiter.msix", "{7C240089-0F22-4247-9C91-51255C8DC18B}"
511+
EndProject
512+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackageManager.Test.M.Whiter.msix", "test\PackageManager\data\PackageManager.Test.M.Whiter.msix\PackageManager.Test.M.Whiter.msix.vcxproj", "{AC79B8FF-4C27-4326-AD20-BBC70059FF51}"
513+
EndProject
514+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackageManager.Test.M.White.msix", "test\PackageManager\data\PackageManager.Test.M.White.msix\PackageManager.Test.M.White.msix.vcxproj", "{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}"
515+
EndProject
496516
Global
497517
GlobalSection(SolutionConfigurationPlatforms) = preSolution
498518
Debug|Any CPU = Debug|Any CPU
@@ -1739,6 +1759,70 @@ Global
17391759
{57E6CCBE-EDEB-4300-8334-98A591D11B3F}.Release|x64.Build.0 = Release|x64
17401760
{57E6CCBE-EDEB-4300-8334-98A591D11B3F}.Release|x86.ActiveCfg = Release|x86
17411761
{57E6CCBE-EDEB-4300-8334-98A591D11B3F}.Release|x86.Build.0 = Release|x86
1762+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|Any CPU.ActiveCfg = Debug|x64
1763+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|Any CPU.Build.0 = Debug|x64
1764+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|ARM64.ActiveCfg = Debug|ARM64
1765+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|ARM64.Build.0 = Debug|ARM64
1766+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|x64.ActiveCfg = Debug|x64
1767+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|x64.Build.0 = Debug|x64
1768+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|x86.ActiveCfg = Debug|Win32
1769+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Debug|x86.Build.0 = Debug|Win32
1770+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|Any CPU.ActiveCfg = Release|x64
1771+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|Any CPU.Build.0 = Release|x64
1772+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|ARM64.ActiveCfg = Release|ARM64
1773+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|ARM64.Build.0 = Release|ARM64
1774+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|x64.ActiveCfg = Release|x64
1775+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|x64.Build.0 = Release|x64
1776+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|x86.ActiveCfg = Release|Win32
1777+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA}.Release|x86.Build.0 = Release|Win32
1778+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|Any CPU.ActiveCfg = Debug|x64
1779+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|Any CPU.Build.0 = Debug|x64
1780+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|ARM64.ActiveCfg = Debug|ARM64
1781+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|ARM64.Build.0 = Debug|ARM64
1782+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|x64.ActiveCfg = Debug|x64
1783+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|x64.Build.0 = Debug|x64
1784+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|x86.ActiveCfg = Debug|Win32
1785+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Debug|x86.Build.0 = Debug|Win32
1786+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|Any CPU.ActiveCfg = Release|x64
1787+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|Any CPU.Build.0 = Release|x64
1788+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|ARM64.ActiveCfg = Release|ARM64
1789+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|ARM64.Build.0 = Release|ARM64
1790+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|x64.ActiveCfg = Release|x64
1791+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|x64.Build.0 = Release|x64
1792+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|x86.ActiveCfg = Release|Win32
1793+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D}.Release|x86.Build.0 = Release|Win32
1794+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|Any CPU.ActiveCfg = Debug|x64
1795+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|Any CPU.Build.0 = Debug|x64
1796+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|ARM64.ActiveCfg = Debug|ARM64
1797+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|ARM64.Build.0 = Debug|ARM64
1798+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|x64.ActiveCfg = Debug|x64
1799+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|x64.Build.0 = Debug|x64
1800+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|x86.ActiveCfg = Debug|Win32
1801+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Debug|x86.Build.0 = Debug|Win32
1802+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|Any CPU.ActiveCfg = Release|x64
1803+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|Any CPU.Build.0 = Release|x64
1804+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|ARM64.ActiveCfg = Release|ARM64
1805+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|ARM64.Build.0 = Release|ARM64
1806+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|x64.ActiveCfg = Release|x64
1807+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|x64.Build.0 = Release|x64
1808+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|x86.ActiveCfg = Release|Win32
1809+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51}.Release|x86.Build.0 = Release|Win32
1810+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|Any CPU.ActiveCfg = Debug|x64
1811+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|Any CPU.Build.0 = Debug|x64
1812+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|ARM64.ActiveCfg = Debug|ARM64
1813+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|ARM64.Build.0 = Debug|ARM64
1814+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|x64.ActiveCfg = Debug|x64
1815+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|x64.Build.0 = Debug|x64
1816+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|x86.ActiveCfg = Debug|Win32
1817+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Debug|x86.Build.0 = Debug|Win32
1818+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|Any CPU.ActiveCfg = Release|x64
1819+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|Any CPU.Build.0 = Release|x64
1820+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|ARM64.ActiveCfg = Release|ARM64
1821+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|ARM64.Build.0 = Release|ARM64
1822+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|x64.ActiveCfg = Release|x64
1823+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|x64.Build.0 = Release|x64
1824+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|x86.ActiveCfg = Release|Win32
1825+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF}.Release|x86.Build.0 = Release|Win32
17421826
EndGlobalSection
17431827
GlobalSection(SolutionProperties) = preSolution
17441828
HideSolutionNode = FALSE
@@ -1885,9 +1969,17 @@ Global
18851969
{4626E11F-A7A4-41A2-B22D-5A108BC369AC} = {266AE21F-0D59-4422-A95C-4B3D2BA32A4C}
18861970
{39A17DBB-F1DB-4D0C-B90E-D5F9BEC2283A} = {6213B1A3-E854-498F-AAFA-4CFC1E71023E}
18871971
{FBAE1876-C50A-4EFC-A686-3008B6438731} = {39A17DBB-F1DB-4D0C-B90E-D5F9BEC2283A}
1888-
{B6B68924-6A0B-457E-AD53-018696EC8889} = {B03C7C69-0A52-4553-B465-04C995161E42}
1972+
{B6B68924-6A0B-457E-AD53-018696EC8889} = {6213B1A3-E854-498F-AAFA-4CFC1E71023E}
18891973
{D0A1DFB8-8CEE-4CFC-B57B-B7C574B411C2} = {B6B68924-6A0B-457E-AD53-018696EC8889}
18901974
{57E6CCBE-EDEB-4300-8334-98A591D11B3F} = {716C26A0-E6B0-4981-8412-D14A4D410531}
1975+
{1AC589D7-FA54-470E-8640-AB2477CA844C} = {6213B1A3-E854-498F-AAFA-4CFC1E71023E}
1976+
{4567CD12-A0A7-4E65-8075-B17C09261767} = {6213B1A3-E854-498F-AAFA-4CFC1E71023E}
1977+
{39277B4C-4FB5-45F6-B0AA-EE8086590CDA} = {1AC589D7-FA54-470E-8640-AB2477CA844C}
1978+
{AD7D0A19-44B9-41D6-A68A-9FECAC28078D} = {4567CD12-A0A7-4E65-8075-B17C09261767}
1979+
{6759ECC6-9381-4172-89E6-853F81A03D28} = {6213B1A3-E854-498F-AAFA-4CFC1E71023E}
1980+
{7C240089-0F22-4247-9C91-51255C8DC18B} = {6213B1A3-E854-498F-AAFA-4CFC1E71023E}
1981+
{AC79B8FF-4C27-4326-AD20-BBC70059FF51} = {7C240089-0F22-4247-9C91-51255C8DC18B}
1982+
{28DCF9CE-D9F4-4A7D-8AD1-F2EFC0D3B4DF} = {6759ECC6-9381-4172-89E6-853F81A03D28}
18911983
EndGlobalSection
18921984
GlobalSection(ExtensibilityGlobals) = postSolution
18931985
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}

‎dev/Common/AppModel.Identity.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,14 @@ class PackageIdentity
372372
return m_packageId->publisherId;
373373
}
374374

375+
std::wstring PackageFamilyName() const
376+
{
377+
WCHAR packageFamilyName[PACKAGE_FAMILY_NAME_MAX_LENGTH + 1]{};
378+
UINT32 packageFamilyNameLength{ ARRAYSIZE(packageFamilyName) };
379+
THROW_IF_WIN32_ERROR_MSG(::PackageFamilyNameFromId(m_packageId, &packageFamilyNameLength, packageFamilyName), "%ls", m_packageFullName.c_str());
380+
return packageFamilyName;
381+
}
382+
375383
explicit operator bool() const
376384
{
377385
return m_packageId != nullptr;
@@ -384,6 +392,15 @@ class PackageIdentity
384392
PACKAGE_RESOURCEID_MAX_LENGTH + 1 +
385393
PACKAGE_PUBLISHERID_MAX_LENGTH + 1) * sizeof(WCHAR)]{};
386394
};
395+
396+
template<typename T>
397+
T ToPackageFamilyName(PCWSTR packageFullName)
398+
{
399+
WCHAR packageFamilyName[PACKAGE_FAMILY_NAME_MAX_LENGTH + 1]{};
400+
UINT32 packageFamilyNameLength{ ARRAYSIZE(packageFamilyName) };
401+
THROW_IF_WIN32_ERROR_MSG(::PackageFamilyNameFromFullName(packageFullName, &packageFamilyNameLength, packageFamilyName), "%ls", packageFullName);
402+
return T{ packageFamilyName };
403+
}
387404
}
388405

389406
#endif // __APPMODEL_IDENTITY_H

‎dev/Common/IsWindowsVersion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ inline bool IsWindows11_22H2OrGreater()
5555
inline bool IsWindows11_23H1OrGreater()
5656
{
5757
// TryCreatePackageDependency2() added to in NTDDI_WIN10_GE (aka Windows 11 23H1)
58-
return IsExportPresent(L"api-ms-win-appmodel-runtime-l1-1-7.dll", "TryCreatePackageDependency2");
58+
return IsExportPresent(L"kernelbase.dll", "TryCreatePackageDependency2");
5959
}
6060
}
6161

‎dev/Common/Security.User.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,32 @@ inline bool IsLocalSystem(HANDLE token = nullptr)
1818

1919
return !!EqualSid(userSid, localSystemSid);
2020
}
21+
22+
/// @return sid. Allocated via LocalAlloc; use LocalFree to deallocate
23+
inline PSID StringToSid(PCWSTR sidString)
24+
{
25+
if (!sidString || (sidString[0] == L'\0'))
26+
{
27+
return nullptr;
28+
}
29+
30+
PSID sid{};
31+
THROW_IF_WIN32_BOOL_FALSE(::ConvertStringSidToSidW(sidString, &sid));
32+
return sid;
33+
}
34+
35+
/// @return sid as a string. Allocated via LocalAlloc; use LocalFree to deallocate
36+
inline PWSTR SidToString(PSID sid)
37+
{
38+
if (!sid)
39+
{
40+
return nullptr;
41+
}
42+
43+
PWSTR sidString{};
44+
THROW_IF_WIN32_BOOL_FALSE(::ConvertSidToStringSidW(sid, &sidString));
45+
return sidString;
46+
}
2147
}
2248

2349
#endif // __SECURITY_USER_H

‎dev/Deployment/DeploymentManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation and Contributors.
1+
// Copyright (c) Microsoft Corporation and Contributors.
22
// Licensed under the MIT License.
33

44
#include <pch.h>
@@ -403,7 +403,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
403403
HRESULT deploymentOperationHResult{};
404404
HRESULT deploymentOperationExtendedHResult{};
405405

406-
if (deploymentOperation.Status() != AsyncStatus::Completed)
406+
if (deploymentOperation.Status() != winrt::Windows::Foundation::AsyncStatus::Completed)
407407
{
408408
deploymentOperationHResult = static_cast<HRESULT>(deploymentOperation.ErrorCode());
409409
deploymentOperationExtendedHResult = deploymentResult.ExtendedErrorCode();

‎dev/MRTCore/mrt/Core/unittests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Taef" version="10.82.230714001" targetFramework="native" />
3+
<package id="Microsoft.Taef" version="10.92.240405002" targetFramework="native" />
44
</packages>

‎dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/UnpackagedTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Taef" version="10.82.230714001" targetFramework="net45" />
3+
<package id="Microsoft.Taef" version="10.92.240405002" targetFramework="net45" />
44
</packages>

‎dev/MRTCore/mrt/mrm/UnitTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
4-
<package id="Microsoft.Taef" version="10.82.230714001" targetFramework="native" />
4+
<package id="Microsoft.Taef" version="10.92.240405002" targetFramework="native" />
55
</packages>

‎dev/PackageManager/API/M.W.M.D.EnsureReadyOptions.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,12 @@ namespace winrt::Microsoft::Windows::Management::Deployment::implementation
1414
{
1515
return m_addPackageOptions;
1616
}
17+
bool EnsureReadyOptions::RegisterNewerIfAvailable()
18+
{
19+
return m_registerNewerIfAvailable;
20+
}
21+
void EnsureReadyOptions::RegisterNewerIfAvailable(bool value)
22+
{
23+
m_registerNewerIfAvailable = value;
24+
}
1725
}

‎dev/PackageManager/API/M.W.M.D.EnsureReadyOptions.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ namespace winrt::Microsoft::Windows::Management::Deployment::implementation
1212
EnsureReadyOptions() = default;
1313

1414
winrt::Microsoft::Windows::Management::Deployment::AddPackageOptions AddPackageOptions();
15+
bool RegisterNewerIfAvailable();
16+
void RegisterNewerIfAvailable(bool value);
1517
private:
1618
winrt::Microsoft::Windows::Management::Deployment::AddPackageOptions m_addPackageOptions{};
19+
bool m_registerNewerIfAvailable{};
1720
};
1821
}
1922
namespace winrt::Microsoft::Windows::Management::Deployment::factory_implementation

0 commit comments

Comments
 (0)