1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn
zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~MY-
zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA
za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR
zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s
z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi
z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C
ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3
z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3
z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94
zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V
zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N
z$SQMX^AK6(fA catalogs = packageManager.GetPackageCatalogs();
+ Assert.IsTrue(catalogs.Count > 0);
+ bool foundDefaultCatalog = false;
+ for(int i = 0; i < catalogs.Count; i++)
+ {
+ if (catalogs[i].Info.Name.Equals("winget"))
+ {
+ foundDefaultCatalog = true;
+ break;
+ }
+ }
+ // TODO: Investigate why casting fails here.
+ /*foreach (var catalog in catalogs)
+ {
+ if (catalog.Info.Name.Equals("winget"))e
+ {
+ foundDefaultCatalog = true;
+ break;
+ }
+ }*/
+ Assert.IsTrue(foundDefaultCatalog);
+ }
+
+ [TestMethod]
+ public void OpenPredefinedStoreCatalog()
+ {
+ PackageManager packageManager = new PackageManager();
+ PackageCatalogReference catalogRef = packageManager.GetPredefinedPackageCatalog(PredefinedPackageCatalog.OpenWindowsCatalog);
+ Assert.IsTrue(catalogRef.Info.Name.Equals("winget"));
+ IReadOnlyList catalogs = packageManager.GetPackageCatalogs();
+ Assert.IsTrue(catalogs.Count > 0);
+ bool foundDefaultCatalog = false;
+ for (int i = 0; i < catalogs.Count; i++)
+ {
+ if (catalogs[i].Info.Name.Equals("winget"))
+ {
+ foundDefaultCatalog = true;
+ break;
+ }
+ }
+ // TODO: Investigate why casting fails here.
+ /*foreach (var catalog in catalogs)
+ {
+ if (catalog.Info.Name.Equals("winget"))e
+ {
+ foundDefaultCatalog = true;
+ break;
+ }
+ }*/
+ Assert.IsTrue(foundDefaultCatalog);
+ }
+
+ public void PopulateInstallOptions()
+ {
+ InstallOptions installOptions = new InstallOptions();
+ //Assert.IsTrue(foundDefaultCatalog);
+ }
+ }
+}
diff --git a/src/PackagedTests/Package.appxmanifest b/src/PackagedTests/Package.appxmanifest
new file mode 100644
index 0000000000..d8c34a8b5f
--- /dev/null
+++ b/src/PackagedTests/Package.appxmanifest
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+ PackagedUnitTests
+ sreading
+ Assets\StoreLogo.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Microsoft.Management.Deployment.dll
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
new file mode 100644
index 0000000000..9485af49e3
--- /dev/null
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -0,0 +1,183 @@
+
+
+
+
+ Debug
+ x86
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}
+ AppContainerExe
+ Properties
+ PackagedUnitTests
+ PackagedUnitTests
+ en-US
+ UAP
+ 10.0.19041.0
+ 10.0.17763.0
+ 14
+ 512
+ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ $(VisualStudioVersion)
+ false
+ False
+ True
+ True
+ Always
+ x64
+ 0
+
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ x86
+ false
+ prompt
+ true
+
+
+ bin\x86\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x86
+ false
+ prompt
+ true
+ true
+
+
+ true
+ bin\ARM\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM
+ false
+ prompt
+ true
+
+
+ bin\ARM\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM
+ false
+ prompt
+ true
+ true
+
+
+ true
+ bin\ARM64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM64
+ false
+ prompt
+ true
+ true
+
+
+ bin\ARM64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM64
+ false
+ prompt
+ true
+ true
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ x64
+ false
+ prompt
+ true
+
+
+ bin\x64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x64
+ false
+ prompt
+ true
+ true
+
+
+ PackageReference
+
+
+
+
+
+
+
+ UnitTestApp.xaml
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6.2.12
+
+
+ 2.2.3
+
+
+ 2.2.3
+
+
+
+
+ {4bc1f40b-36c2-4bbb-8306-76e490b13bbd}
+ Microsoft.Management.Deployment.Client
+
+
+
+ 14.0
+
+
+
+
\ No newline at end of file
diff --git a/src/PackagedTests/Properties/AssemblyInfo.cs b/src/PackagedTests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..8d2eca9a02
--- /dev/null
+++ b/src/PackagedTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,18 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("PackagedUnitTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HP Inc.")]
+[assembly: AssemblyProduct("PackagedUnitTests")]
+[assembly: AssemblyCopyright("Copyright © HP Inc. 2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyMetadata("TargetPlatform","UAP")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/src/PackagedTests/Properties/Default.rd.xml b/src/PackagedTests/Properties/Default.rd.xml
new file mode 100644
index 0000000000..e019b9308c
--- /dev/null
+++ b/src/PackagedTests/Properties/Default.rd.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/PackagedTests/UnitTestApp.xaml b/src/PackagedTests/UnitTestApp.xaml
new file mode 100644
index 0000000000..d3311c10d1
--- /dev/null
+++ b/src/PackagedTests/UnitTestApp.xaml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/PackagedTests/UnitTestApp.xaml.cs b/src/PackagedTests/UnitTestApp.xaml.cs
new file mode 100644
index 0000000000..17b374b022
--- /dev/null
+++ b/src/PackagedTests/UnitTestApp.xaml.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace PackagedUnitTests
+{
+ ///
+ /// Provides application-specific behavior to supplement the default Application class.
+ ///
+ sealed partial class App : Application
+ {
+ ///
+ /// Initializes the singleton application object. This is the first line of authored code
+ /// executed, and as such is the logical equivalent of main() or WinMain().
+ ///
+ public App()
+ {
+ this.InitializeComponent();
+ this.Suspending += OnSuspending;
+ }
+
+ ///
+ /// Invoked when the application is launched normally by the end user. Other entry points
+ /// will be used such as when the application is launched to open a specific file.
+ ///
+ /// Details about the launch request and process.
+ protected override void OnLaunched(LaunchActivatedEventArgs e)
+ {
+
+#if DEBUG
+ if (System.Diagnostics.Debugger.IsAttached)
+ {
+ this.DebugSettings.EnableFrameRateCounter = true;
+ }
+#endif
+
+ Frame rootFrame = Window.Current.Content as Frame;
+
+ // Do not repeat app initialization when the Window already has content,
+ // just ensure that the window is active
+ if (rootFrame == null)
+ {
+ // Create a Frame to act as the navigation context and navigate to the first page
+ rootFrame = new Frame();
+
+ rootFrame.NavigationFailed += OnNavigationFailed;
+
+ if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
+ {
+ //TODO: Load state from previously suspended application
+ }
+
+ // Place the frame in the current Window
+ Window.Current.Content = rootFrame;
+ }
+
+ Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();
+
+ // Ensure the current window is active
+ Window.Current.Activate();
+
+ Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments);
+ }
+
+ ///
+ /// Invoked when Navigation to a certain page fails
+ ///
+ /// The Frame which failed navigation
+ /// Details about the navigation failure
+ void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+ {
+ throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+ }
+
+ ///
+ /// Invoked when application execution is being suspended. Application state is saved
+ /// without knowing whether the application will be terminated or resumed with the contents
+ /// of memory still intact.
+ ///
+ /// The source of the suspend request.
+ /// Details about the suspend request.
+ private void OnSuspending(object sender, SuspendingEventArgs e)
+ {
+ var deferral = e.SuspendingOperation.GetDeferral();
+ //TODO: Save application state and stop any background activity
+ deferral.Complete();
+ }
+ }
+}
From 214f6b83a47e1fc1122c242c8bad7bc80f59820a Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Sat, 14 Aug 2021 19:07:30 -0700
Subject: [PATCH 03/53] Override factory to return objects.
---
.../CatalogPackage.cpp | 80 +++++++++---------
.../CatalogPackage.h | 4 -
.../ConnectResult.cpp | 34 ++++----
.../ConnectResult.h | 30 +++----
.../CreateCompositePackageCatalogOptions.cpp | 6 +-
.../CreateCompositePackageCatalogOptions.h | 11 ++-
.../FindPackagesOptions.cpp | 8 +-
.../FindPackagesOptions.h | 11 ++-
.../FindPackagesResult.cpp | 42 +++++-----
.../FindPackagesResult.h | 32 +++----
.../InstallOptions.cpp | 52 ++++++------
.../InstallOptions.h | 11 ++-
.../PackageCatalog.cpp | 51 ++++++------
.../PackageCatalog.h | 34 ++++----
.../PackageCatalogInfo.cpp | 74 ++++++++---------
.../PackageCatalogReference.cpp | 50 +++++------
.../PackageCatalogReference.h | 34 ++++----
.../PackageManager.cpp | 22 ++---
.../PackageManager.h | 11 ++-
.../PackageMatchFilter.cpp | 18 ++--
.../PackageMatchFilter.h | 11 ++-
.../PackageVersionId.cpp | 42 +++++-----
.../PackageVersionId.h | 32 +++----
.../PackageVersionInfo.cpp | 83 +++++++++----------
.../PackageVersionInfo.h | 42 +++++-----
25 files changed, 404 insertions(+), 421 deletions(-)
diff --git a/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp b/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp
index df0caa2d02..b89293c930 100644
--- a/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp
+++ b/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp
@@ -1,43 +1,37 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "CatalogPackage.h"
-#include "CatalogPackage.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- hstring CatalogPackage::Id()
- {
- throw hresult_not_implemented();
- }
- hstring CatalogPackage::Name()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::InstalledVersion()
- {
- throw hresult_not_implemented();
- }
- winrt::Windows::Foundation::Collections::IVectorView CatalogPackage::AvailableVersions()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::DefaultInstallVersion()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::GetPackageVersionInfo(winrt::Microsoft::Management::Deployment::PackageVersionId const& versionKey)
- {
- UNREFERENCED_PARAMETER(versionKey);
- throw hresult_not_implemented();
- }
- bool CatalogPackage::IsUpdateAvailable()
- {
- throw hresult_not_implemented();
- }
-
- winrt::Microsoft::Management::Deployment::CatalogPackage CatalogPackage::GetServerPackage()
- {
- return m_catalogPackage;
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "CatalogPackage.h"
+#include "CatalogPackage.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ hstring CatalogPackage::Id()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring CatalogPackage::Name()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::InstalledVersion()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Windows::Foundation::Collections::IVectorView CatalogPackage::AvailableVersions()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::DefaultInstallVersion()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::GetPackageVersionInfo(winrt::Microsoft::Management::Deployment::PackageVersionId const&)
+ {
+ throw hresult_not_implemented();
+ }
+ bool CatalogPackage::IsUpdateAvailable()
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/CatalogPackage.h b/src/Microsoft.Management.Deployment.Client/CatalogPackage.h
index bb463e9752..79738d946d 100644
--- a/src/Microsoft.Management.Deployment.Client/CatalogPackage.h
+++ b/src/Microsoft.Management.Deployment.Client/CatalogPackage.h
@@ -16,9 +16,5 @@ namespace winrt::Microsoft::Management::Deployment::implementation
winrt::Microsoft::Management::Deployment::PackageVersionInfo DefaultInstallVersion();
winrt::Microsoft::Management::Deployment::PackageVersionInfo GetPackageVersionInfo(winrt::Microsoft::Management::Deployment::PackageVersionId const& versionKey);
bool IsUpdateAvailable();
-
- winrt::Microsoft::Management::Deployment::CatalogPackage GetServerPackage();
- private:
- winrt::Microsoft::Management::Deployment::CatalogPackage m_catalogPackage{ nullptr };
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp b/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp
index 9c957d489c..40dd27204a 100644
--- a/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp
+++ b/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp
@@ -1,17 +1,17 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "ConnectResult.h"
-#include "ConnectResult.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- winrt::Microsoft::Management::Deployment::ConnectResultStatus ConnectResult::Status()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageCatalog ConnectResult::PackageCatalog()
- {
- throw hresult_not_implemented();
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "ConnectResult.h"
+#include "ConnectResult.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ winrt::Microsoft::Management::Deployment::ConnectResultStatus ConnectResult::Status()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageCatalog ConnectResult::PackageCatalog()
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/ConnectResult.h b/src/Microsoft.Management.Deployment.Client/ConnectResult.h
index bec80cc105..b0ff6b47e3 100644
--- a/src/Microsoft.Management.Deployment.Client/ConnectResult.h
+++ b/src/Microsoft.Management.Deployment.Client/ConnectResult.h
@@ -1,15 +1,15 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "ConnectResult.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct ConnectResult : ConnectResultT
- {
- ConnectResult() = default;
-
- winrt::Microsoft::Management::Deployment::ConnectResultStatus Status();
- winrt::Microsoft::Management::Deployment::PackageCatalog PackageCatalog();
- };
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "ConnectResult.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ struct ConnectResult : ConnectResultT
+ {
+ ConnectResult() = default;
+
+ winrt::Microsoft::Management::Deployment::ConnectResultStatus Status();
+ winrt::Microsoft::Management::Deployment::PackageCatalog PackageCatalog();
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
index 5f5855557f..d732a70564 100644
--- a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
@@ -8,14 +8,14 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
winrt::Windows::Foundation::Collections::IVector CreateCompositePackageCatalogOptions::Catalogs()
{
- return m_createCompositePackageCatalogOptions.Catalogs();
+ throw hresult_not_implemented();
}
winrt::Microsoft::Management::Deployment::CompositeSearchBehavior CreateCompositePackageCatalogOptions::CompositeSearchBehavior()
{
- return m_createCompositePackageCatalogOptions.CompositeSearchBehavior();
+ throw hresult_not_implemented();
}
void CreateCompositePackageCatalogOptions::CompositeSearchBehavior(winrt::Microsoft::Management::Deployment::CompositeSearchBehavior const& value)
{
- m_createCompositePackageCatalogOptions.CompositeSearchBehavior(value);
+ throw hresult_not_implemented();
}
}
diff --git a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
index 6e1757a16e..0a4befcdbb 100644
--- a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
@@ -9,21 +9,20 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
struct CreateCompositePackageCatalogOptions : CreateCompositePackageCatalogOptionsT
{
- CreateCompositePackageCatalogOptions()
- {
- m_createCompositePackageCatalogOptions = winrt::create_instance(CLSID_CreateCompositePackageCatalogOptions2, CLSCTX_ALL);
- }
+ CreateCompositePackageCatalogOptions() = default;
winrt::Windows::Foundation::Collections::IVector Catalogs();
winrt::Microsoft::Management::Deployment::CompositeSearchBehavior CompositeSearchBehavior();
void CompositeSearchBehavior(winrt::Microsoft::Management::Deployment::CompositeSearchBehavior const& value);
- private:
- winrt::Microsoft::Management::Deployment::CreateCompositePackageCatalogOptions m_createCompositePackageCatalogOptions{ nullptr };
};
}
namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
struct CreateCompositePackageCatalogOptions : CreateCompositePackageCatalogOptionsT
{
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(CLSID_CreateCompositePackageCatalogOptions2, CLSCTX_ALL);
+ }
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
index e814328b34..37180ed522 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
@@ -8,18 +8,18 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
winrt::Windows::Foundation::Collections::IVector FindPackagesOptions::Selectors()
{
- return m_findPackagesOptions.Selectors();
+ throw hresult_not_implemented();
}
winrt::Windows::Foundation::Collections::IVector FindPackagesOptions::Filters()
{
- return m_findPackagesOptions.Filters();
+ throw hresult_not_implemented();
}
uint32_t FindPackagesOptions::ResultLimit()
{
- return m_findPackagesOptions.ResultLimit();
+ throw hresult_not_implemented();
}
void FindPackagesOptions::ResultLimit(uint32_t value)
{
- m_findPackagesOptions.ResultLimit(value);
+ throw hresult_not_implemented();
}
}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
index a248081484..4401c4d7fe 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
@@ -9,22 +9,21 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
struct FindPackagesOptions : FindPackagesOptionsT
{
- FindPackagesOptions()
- {
- m_findPackagesOptions = winrt::create_instance(CLSID_FindPackagesOptions2, CLSCTX_ALL);
- }
+ FindPackagesOptions() = default;
winrt::Windows::Foundation::Collections::IVector Selectors();
winrt::Windows::Foundation::Collections::IVector Filters();
uint32_t ResultLimit();
void ResultLimit(uint32_t value);
- private:
- winrt::Microsoft::Management::Deployment::FindPackagesOptions m_findPackagesOptions{ nullptr };
};
}
namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
struct FindPackagesOptions : FindPackagesOptionsT
{
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(CLSID_FindPackagesOptions2, CLSCTX_ALL);
+ }
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp b/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp
index 3ae321d3a2..75fc89335f 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp
@@ -1,21 +1,21 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "FindPackagesResult.h"
-#include "FindPackagesResult.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- winrt::Microsoft::Management::Deployment::FindPackagesResultStatus FindPackagesResult::Status()
- {
- throw hresult_not_implemented();
- }
- winrt::Windows::Foundation::Collections::IVectorView FindPackagesResult::Matches()
- {
- throw hresult_not_implemented();
- }
- bool FindPackagesResult::WasLimitExceeded()
- {
- throw hresult_not_implemented();
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "FindPackagesResult.h"
+#include "FindPackagesResult.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ winrt::Microsoft::Management::Deployment::FindPackagesResultStatus FindPackagesResult::Status()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Windows::Foundation::Collections::IVectorView FindPackagesResult::Matches()
+ {
+ throw hresult_not_implemented();
+ }
+ bool FindPackagesResult::WasLimitExceeded()
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.h b/src/Microsoft.Management.Deployment.Client/FindPackagesResult.h
index 28add522d0..83dafaff84 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.h
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesResult.h
@@ -1,16 +1,16 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "FindPackagesResult.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct FindPackagesResult : FindPackagesResultT
- {
- FindPackagesResult() = default;
-
- winrt::Microsoft::Management::Deployment::FindPackagesResultStatus Status();
- winrt::Windows::Foundation::Collections::IVectorView Matches();
- bool WasLimitExceeded();
- };
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "FindPackagesResult.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ struct FindPackagesResult : FindPackagesResultT
+ {
+ FindPackagesResult() = default;
+
+ winrt::Microsoft::Management::Deployment::FindPackagesResultStatus Status();
+ winrt::Windows::Foundation::Collections::IVectorView Matches();
+ bool WasLimitExceeded();
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp b/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
index 1e537db030..33a034d376 100644
--- a/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
@@ -8,74 +8,74 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
winrt::Microsoft::Management::Deployment::PackageVersionId InstallOptions::PackageVersionId()
{
- return m_installOptions.PackageVersionId();
+ throw hresult_not_implemented();
}
- void InstallOptions::PackageVersionId(winrt::Microsoft::Management::Deployment::PackageVersionId const& value)
+ void InstallOptions::PackageVersionId(winrt::Microsoft::Management::Deployment::PackageVersionId const&)
{
- return m_installOptions.PackageVersionId(value);
+ throw hresult_not_implemented();
}
hstring InstallOptions::PreferredInstallLocation()
{
- return m_installOptions.PreferredInstallLocation();
+ throw hresult_not_implemented();
}
void InstallOptions::PreferredInstallLocation(hstring const& value)
{
- return m_installOptions.PreferredInstallLocation(value);
+ throw hresult_not_implemented();
}
winrt::Microsoft::Management::Deployment::PackageInstallScope InstallOptions::PackageInstallScope()
{
- return m_installOptions.PackageInstallScope();
+ throw hresult_not_implemented();
}
- void InstallOptions::PackageInstallScope(winrt::Microsoft::Management::Deployment::PackageInstallScope const& value)
+ void InstallOptions::PackageInstallScope(winrt::Microsoft::Management::Deployment::PackageInstallScope const&)
{
- return m_installOptions.PackageInstallScope(value);
+ throw hresult_not_implemented();
}
winrt::Microsoft::Management::Deployment::PackageInstallMode InstallOptions::PackageInstallMode()
{
- return m_installOptions.PackageInstallMode();
+ throw hresult_not_implemented();
}
- void InstallOptions::PackageInstallMode(winrt::Microsoft::Management::Deployment::PackageInstallMode const& value)
+ void InstallOptions::PackageInstallMode(winrt::Microsoft::Management::Deployment::PackageInstallMode const&)
{
- return m_installOptions.PackageInstallMode(value);
+ throw hresult_not_implemented();
}
hstring InstallOptions::LogOutputPath()
{
- return m_installOptions.LogOutputPath();
+ throw hresult_not_implemented();
}
- void InstallOptions::LogOutputPath(hstring const& value)
+ void InstallOptions::LogOutputPath(hstring const&)
{
- return m_installOptions.LogOutputPath(value);
+ throw hresult_not_implemented();
}
bool InstallOptions::AllowHashMismatch()
{
- return m_installOptions.AllowHashMismatch();
+ throw hresult_not_implemented();
}
- void InstallOptions::AllowHashMismatch(bool value)
+ void InstallOptions::AllowHashMismatch(bool)
{
- return m_installOptions.AllowHashMismatch(value);
+ throw hresult_not_implemented();
}
hstring InstallOptions::ReplacementInstallerArguments()
{
- return m_installOptions.ReplacementInstallerArguments();
+ throw hresult_not_implemented();
}
- void InstallOptions::ReplacementInstallerArguments(hstring const& value)
+ void InstallOptions::ReplacementInstallerArguments(hstring const&)
{
- return m_installOptions.ReplacementInstallerArguments(value);
+ throw hresult_not_implemented();
}
hstring InstallOptions::CorrelationData()
{
- return m_installOptions.CorrelationData();
+ throw hresult_not_implemented();
}
- void InstallOptions::CorrelationData(hstring const& value)
+ void InstallOptions::CorrelationData(hstring const&)
{
- return m_installOptions.CorrelationData(value);
+ throw hresult_not_implemented();
}
hstring InstallOptions::AdditionalPackageCatalogArguments()
{
- return m_installOptions.AdditionalPackageCatalogArguments();
+ throw hresult_not_implemented();
}
- void InstallOptions::AdditionalPackageCatalogArguments(hstring const& value)
+ void InstallOptions::AdditionalPackageCatalogArguments(hstring const&)
{
- return m_installOptions.AdditionalPackageCatalogArguments(value);
+ throw hresult_not_implemented();
}
}
diff --git a/src/Microsoft.Management.Deployment.Client/InstallOptions.h b/src/Microsoft.Management.Deployment.Client/InstallOptions.h
index fb39f7d7f4..2116f6a6f8 100644
--- a/src/Microsoft.Management.Deployment.Client/InstallOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/InstallOptions.h
@@ -9,10 +9,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
struct InstallOptions : InstallOptionsT
{
- InstallOptions()
- {
- m_installOptions = winrt::create_instance(CLSID_InstallOptions2, CLSCTX_ALL);
- }
+ InstallOptions() = default;
winrt::Microsoft::Management::Deployment::PackageVersionId PackageVersionId();
void PackageVersionId(winrt::Microsoft::Management::Deployment::PackageVersionId const& value);
@@ -32,13 +29,15 @@ namespace winrt::Microsoft::Management::Deployment::implementation
void CorrelationData(hstring const& value);
hstring AdditionalPackageCatalogArguments();
void AdditionalPackageCatalogArguments(hstring const& value);
- private:
- winrt::Microsoft::Management::Deployment::InstallOptions m_installOptions{ nullptr };
};
}
namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
struct InstallOptions : InstallOptionsT
{
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(CLSID_InstallOptions2, CLSCTX_ALL);
+ }
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp b/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp
index 0f65ae4648..948a159d40 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp
@@ -1,26 +1,25 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "PackageCatalog.h"
-#include "PackageCatalog.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- bool PackageCatalog::IsComposite()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageCatalogInfo PackageCatalog::Info()
- {
- throw hresult_not_implemented();
- }
- winrt::Windows::Foundation::IAsyncOperation PackageCatalog::FindPackagesAsync(winrt::Microsoft::Management::Deployment::FindPackagesOptions options)
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::FindPackagesResult PackageCatalog::FindPackages(winrt::Microsoft::Management::Deployment::FindPackagesOptions const& options)
- {
- UNREFERENCED_PARAMETER(options);
- throw hresult_not_implemented();
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "PackageCatalog.h"
+#include "PackageCatalog.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ bool PackageCatalog::IsComposite()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageCatalogInfo PackageCatalog::Info()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Windows::Foundation::IAsyncOperation PackageCatalog::FindPackagesAsync(winrt::Microsoft::Management::Deployment::FindPackagesOptions)
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::FindPackagesResult PackageCatalog::FindPackages(winrt::Microsoft::Management::Deployment::FindPackagesOptions const&)
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalog.h b/src/Microsoft.Management.Deployment.Client/PackageCatalog.h
index 0299a0b45f..648d6ca7a1 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalog.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalog.h
@@ -1,17 +1,17 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageCatalog.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageCatalog : PackageCatalogT
- {
- PackageCatalog() = default;
-
- bool IsComposite();
- winrt::Microsoft::Management::Deployment::PackageCatalogInfo Info();
- winrt::Windows::Foundation::IAsyncOperation FindPackagesAsync(winrt::Microsoft::Management::Deployment::FindPackagesOptions options);
- winrt::Microsoft::Management::Deployment::FindPackagesResult FindPackages(winrt::Microsoft::Management::Deployment::FindPackagesOptions const& options);
- };
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "PackageCatalog.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ struct PackageCatalog : PackageCatalogT
+ {
+ PackageCatalog() = default;
+
+ bool IsComposite();
+ winrt::Microsoft::Management::Deployment::PackageCatalogInfo Info();
+ winrt::Windows::Foundation::IAsyncOperation FindPackagesAsync(winrt::Microsoft::Management::Deployment::FindPackagesOptions options);
+ winrt::Microsoft::Management::Deployment::FindPackagesResult FindPackages(winrt::Microsoft::Management::Deployment::FindPackagesOptions const& options);
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp b/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp
index 98a723b34d..56b197726b 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp
@@ -1,37 +1,37 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "PackageCatalogInfo.h"
-#include "PackageCatalogInfo.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- hstring PackageCatalogInfo::Id()
- {
- throw hresult_not_implemented();
- }
- hstring PackageCatalogInfo::Name()
- {
- throw hresult_not_implemented();
- }
- hstring PackageCatalogInfo::Type()
- {
- throw hresult_not_implemented();
- }
- hstring PackageCatalogInfo::Argument()
- {
- throw hresult_not_implemented();
- }
- winrt::Windows::Foundation::DateTime PackageCatalogInfo::LastUpdateTime()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageCatalogOrigin PackageCatalogInfo::Origin()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageCatalogTrustLevel PackageCatalogInfo::TrustLevel()
- {
- throw hresult_not_implemented();
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "PackageCatalogInfo.h"
+#include "PackageCatalogInfo.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ hstring PackageCatalogInfo::Id()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageCatalogInfo::Name()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageCatalogInfo::Type()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageCatalogInfo::Argument()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Windows::Foundation::DateTime PackageCatalogInfo::LastUpdateTime()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageCatalogOrigin PackageCatalogInfo::Origin()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageCatalogTrustLevel PackageCatalogInfo::TrustLevel()
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp b/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp
index 6c41a5dd91..3fe12edd6d 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp
@@ -1,25 +1,25 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "PackageCatalogReference.h"
-#include "PackageCatalogReference.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- bool PackageCatalogReference::IsComposite()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageCatalogInfo PackageCatalogReference::Info()
- {
- throw hresult_not_implemented();
- }
- winrt::Windows::Foundation::IAsyncOperation PackageCatalogReference::ConnectAsync()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::ConnectResult PackageCatalogReference::Connect()
- {
- throw hresult_not_implemented();
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "PackageCatalogReference.h"
+#include "PackageCatalogReference.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ bool PackageCatalogReference::IsComposite()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageCatalogInfo PackageCatalogReference::Info()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Windows::Foundation::IAsyncOperation PackageCatalogReference::ConnectAsync()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::ConnectResult PackageCatalogReference::Connect()
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h b/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h
index 5d02f35e2b..2c76518841 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h
@@ -1,17 +1,17 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageCatalogReference.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageCatalogReference : PackageCatalogReferenceT
- {
- PackageCatalogReference() = default;
-
- bool IsComposite();
- winrt::Microsoft::Management::Deployment::PackageCatalogInfo Info();
- winrt::Windows::Foundation::IAsyncOperation ConnectAsync();
- winrt::Microsoft::Management::Deployment::ConnectResult Connect();
- };
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "PackageCatalogReference.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ struct PackageCatalogReference : PackageCatalogReferenceT
+ {
+ PackageCatalogReference() = default;
+
+ bool IsComposite();
+ winrt::Microsoft::Management::Deployment::PackageCatalogInfo Info();
+ winrt::Windows::Foundation::IAsyncOperation ConnectAsync();
+ winrt::Microsoft::Management::Deployment::ConnectResult Connect();
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.cpp b/src/Microsoft.Management.Deployment.Client/PackageManager.cpp
index caaef1f95c..d7b816db96 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageManager.cpp
@@ -6,26 +6,26 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
winrt::Windows::Foundation::Collections::IVectorView PackageManager::GetPackageCatalogs()
{
- return m_packageManager.GetPackageCatalogs();
+ throw hresult_not_implemented();
}
- winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::GetPredefinedPackageCatalog(winrt::Microsoft::Management::Deployment::PredefinedPackageCatalog const& predefinedPackageCatalog)
+ winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::GetPredefinedPackageCatalog(winrt::Microsoft::Management::Deployment::PredefinedPackageCatalog const&)
{
- return m_packageManager.GetPredefinedPackageCatalog(predefinedPackageCatalog);
+ throw hresult_not_implemented();
}
- winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::GetLocalPackageCatalog(winrt::Microsoft::Management::Deployment::LocalPackageCatalog const& localPackageCatalog)
+ winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::GetLocalPackageCatalog(winrt::Microsoft::Management::Deployment::LocalPackageCatalog const&)
{
- return m_packageManager.GetLocalPackageCatalog(localPackageCatalog);
+ throw hresult_not_implemented();
}
- winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::GetPackageCatalogByName(hstring const& catalogName)
+ winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::GetPackageCatalogByName(hstring const&)
{
- return m_packageManager.GetPackageCatalogByName(catalogName);
+ throw hresult_not_implemented();
}
- winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::CreateCompositePackageCatalog(winrt::Microsoft::Management::Deployment::CreateCompositePackageCatalogOptions const& options)
+ winrt::Microsoft::Management::Deployment::PackageCatalogReference PackageManager::CreateCompositePackageCatalog(winrt::Microsoft::Management::Deployment::CreateCompositePackageCatalogOptions const&)
{
- return m_packageManager.CreateCompositePackageCatalog(options);
+ throw hresult_not_implemented();
}
- winrt::Windows::Foundation::IAsyncOperationWithProgress PackageManager::InstallPackageAsync(winrt::Microsoft::Management::Deployment::CatalogPackage package, winrt::Microsoft::Management::Deployment::InstallOptions options)
+ winrt::Windows::Foundation::IAsyncOperationWithProgress PackageManager::InstallPackageAsync(winrt::Microsoft::Management::Deployment::CatalogPackage package, winrt::Microsoft::Management::Deployment::InstallOptions)
{
- return m_packageManager.InstallPackageAsync(package, options);
+ throw hresult_not_implemented();
}
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.h b/src/Microsoft.Management.Deployment.Client/PackageManager.h
index eac430757a..00ccdc2bb3 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageManager.h
@@ -7,10 +7,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
struct PackageManager : PackageManagerT
{
- PackageManager()
- {
- return m_packageManager = winrt::create_instance(CLSID_PackageManager2, CLSCTX_ALL);
- }
+ PackageManager() = default;
winrt::Windows::Foundation::Collections::IVectorView GetPackageCatalogs();
winrt::Microsoft::Management::Deployment::PackageCatalogReference GetPredefinedPackageCatalog(winrt::Microsoft::Management::Deployment::PredefinedPackageCatalog const& predefinedPackageCatalog);
@@ -18,13 +15,15 @@ namespace winrt::Microsoft::Management::Deployment::implementation
winrt::Microsoft::Management::Deployment::PackageCatalogReference GetPackageCatalogByName(hstring const& catalogName);
winrt::Microsoft::Management::Deployment::PackageCatalogReference CreateCompositePackageCatalog(winrt::Microsoft::Management::Deployment::CreateCompositePackageCatalogOptions const& options);
winrt::Windows::Foundation::IAsyncOperationWithProgress InstallPackageAsync(winrt::Microsoft::Management::Deployment::CatalogPackage package, winrt::Microsoft::Management::Deployment::InstallOptions options);
- private:
- winrt::Microsoft::Management::Deployment::PackageManager m_packageManager{ nullptr };
};
}
namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
struct PackageManager : PackageManagerT
{
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(CLSID_PackageManager2, CLSCTX_ALL);
+ }
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp
index 76afca043e..028270abd2 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp
@@ -8,26 +8,26 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
winrt::Microsoft::Management::Deployment::PackageFieldMatchOption PackageMatchFilter::Option()
{
- return m_packageMatchFilter.Option();
+ throw hresult_not_implemented();;
}
- void PackageMatchFilter::Option(winrt::Microsoft::Management::Deployment::PackageFieldMatchOption const& value)
+ void PackageMatchFilter::Option(winrt::Microsoft::Management::Deployment::PackageFieldMatchOption const&)
{
- m_packageMatchFilter.Option(value);
+ throw hresult_not_implemented();
}
winrt::Microsoft::Management::Deployment::PackageMatchField PackageMatchFilter::Field()
{
- return m_packageMatchFilter.Field();
+ throw hresult_not_implemented();
}
- void PackageMatchFilter::Field(winrt::Microsoft::Management::Deployment::PackageMatchField const& value)
+ void PackageMatchFilter::Field(winrt::Microsoft::Management::Deployment::PackageMatchField const&)
{
- m_packageMatchFilter.Field(value);
+ throw hresult_not_implemented();
}
hstring PackageMatchFilter::Value()
{
- return m_packageMatchFilter.Value();
+ throw hresult_not_implemented();
}
- void PackageMatchFilter::Value(hstring const& value)
+ void PackageMatchFilter::Value(hstring const&)
{
- m_packageMatchFilter.Value(value);
+ throw hresult_not_implemented();
}
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
index 003bb363a5..4a6fdb5a69 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
@@ -9,10 +9,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
struct PackageMatchFilter : PackageMatchFilterT
{
- PackageMatchFilter()
- {
- m_packageMatchFilter = winrt::create_instance(CLSID_PackageMatchFilter2, CLSCTX_ALL);
- }
+ PackageMatchFilter() = default;
winrt::Microsoft::Management::Deployment::PackageFieldMatchOption Option();
void Option(winrt::Microsoft::Management::Deployment::PackageFieldMatchOption const& value);
@@ -20,13 +17,15 @@ namespace winrt::Microsoft::Management::Deployment::implementation
void Field(winrt::Microsoft::Management::Deployment::PackageMatchField const& value);
hstring Value();
void Value(hstring const& value);
- private:
- winrt::Microsoft::Management::Deployment::PackageMatchFilter m_packageMatchFilter{ nullptr };
};
}
namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
struct PackageMatchFilter : PackageMatchFilterT
{
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(CLSID_PackageMatchFilter2, CLSCTX_ALL);
+ }
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp b/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp
index d9bad834f9..e5e3f8708d 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp
@@ -1,21 +1,21 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "PackageVersionId.h"
-#include "PackageVersionId.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- hstring PackageVersionId::PackageCatalogId()
- {
- throw hresult_not_implemented();
- }
- hstring PackageVersionId::Version()
- {
- throw hresult_not_implemented();
- }
- hstring PackageVersionId::Channel()
- {
- throw hresult_not_implemented();
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "PackageVersionId.h"
+#include "PackageVersionId.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ hstring PackageVersionId::PackageCatalogId()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageVersionId::Version()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageVersionId::Channel()
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageVersionId.h b/src/Microsoft.Management.Deployment.Client/PackageVersionId.h
index 739f7da547..57518126a0 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageVersionId.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageVersionId.h
@@ -1,16 +1,16 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageVersionId.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageVersionId : PackageVersionIdT
- {
- PackageVersionId() = default;
-
- hstring PackageCatalogId();
- hstring Version();
- hstring Channel();
- };
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "PackageVersionId.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ struct PackageVersionId : PackageVersionIdT
+ {
+ PackageVersionId() = default;
+
+ hstring PackageCatalogId();
+ hstring Version();
+ hstring Channel();
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.cpp b/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.cpp
index f7cf643de5..401e62722b 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.cpp
@@ -1,42 +1,41 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-#include "PackageVersionInfo.h"
-#include "PackageVersionInfo.g.cpp"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- hstring PackageVersionInfo::GetMetadata(winrt::Microsoft::Management::Deployment::PackageVersionMetadataField const& metadataField)
- {
- UNREFERENCED_PARAMETER(metadataField);
- throw hresult_not_implemented();
- }
- hstring PackageVersionInfo::Id()
- {
- throw hresult_not_implemented();
- }
- hstring PackageVersionInfo::DisplayName()
- {
- throw hresult_not_implemented();
- }
- hstring PackageVersionInfo::Version()
- {
- throw hresult_not_implemented();
- }
- hstring PackageVersionInfo::Channel()
- {
- throw hresult_not_implemented();
- }
- winrt::Windows::Foundation::Collections::IVectorView PackageVersionInfo::PackageFamilyNames()
- {
- throw hresult_not_implemented();
- }
- winrt::Windows::Foundation::Collections::IVectorView PackageVersionInfo::ProductCodes()
- {
- throw hresult_not_implemented();
- }
- winrt::Microsoft::Management::Deployment::PackageCatalog PackageVersionInfo::PackageCatalog()
- {
- throw hresult_not_implemented();
- }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "PackageVersionInfo.h"
+#include "PackageVersionInfo.g.cpp"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ hstring PackageVersionInfo::GetMetadata(winrt::Microsoft::Management::Deployment::PackageVersionMetadataField const&)
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageVersionInfo::Id()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageVersionInfo::DisplayName()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageVersionInfo::Version()
+ {
+ throw hresult_not_implemented();
+ }
+ hstring PackageVersionInfo::Channel()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Windows::Foundation::Collections::IVectorView PackageVersionInfo::PackageFamilyNames()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Windows::Foundation::Collections::IVectorView PackageVersionInfo::ProductCodes()
+ {
+ throw hresult_not_implemented();
+ }
+ winrt::Microsoft::Management::Deployment::PackageCatalog PackageVersionInfo::PackageCatalog()
+ {
+ throw hresult_not_implemented();
+ }
+}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.h b/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.h
index 7eef08e22e..f17ac1ffb6 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageVersionInfo.h
@@ -1,21 +1,21 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageVersionInfo.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageVersionInfo : PackageVersionInfoT
- {
- PackageVersionInfo() = default;
-
- hstring GetMetadata(winrt::Microsoft::Management::Deployment::PackageVersionMetadataField const& metadataField);
- hstring Id();
- hstring DisplayName();
- hstring Version();
- hstring Channel();
- winrt::Windows::Foundation::Collections::IVectorView PackageFamilyNames();
- winrt::Windows::Foundation::Collections::IVectorView ProductCodes();
- winrt::Microsoft::Management::Deployment::PackageCatalog PackageCatalog();
- };
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "PackageVersionInfo.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+ struct PackageVersionInfo : PackageVersionInfoT
+ {
+ PackageVersionInfo() = default;
+
+ hstring GetMetadata(winrt::Microsoft::Management::Deployment::PackageVersionMetadataField const& metadataField);
+ hstring Id();
+ hstring DisplayName();
+ hstring Version();
+ hstring Channel();
+ winrt::Windows::Foundation::Collections::IVectorView PackageFamilyNames();
+ winrt::Windows::Foundation::Collections::IVectorView ProductCodes();
+ winrt::Microsoft::Management::Deployment::PackageCatalog PackageCatalog();
+ };
+}
From b1af5364d9cf316229f219fb9c34d387c02f03bf Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Sat, 14 Aug 2021 19:17:51 -0700
Subject: [PATCH 04/53] Fix unreferenced parameters.
---
.../CreateCompositePackageCatalogOptions.cpp | 2 +-
.../FindPackagesOptions.cpp | 2 +-
.../InstallOptions.cpp | 2 +-
.../PackageManager.idl | 1 +
src/PackagedTests/ComInterfaceUnitTest.cs | 40 +------------------
5 files changed, 6 insertions(+), 41 deletions(-)
diff --git a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
index d732a70564..c8f60de369 100644
--- a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
@@ -14,7 +14,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
throw hresult_not_implemented();
}
- void CreateCompositePackageCatalogOptions::CompositeSearchBehavior(winrt::Microsoft::Management::Deployment::CompositeSearchBehavior const& value)
+ void CreateCompositePackageCatalogOptions::CompositeSearchBehavior(winrt::Microsoft::Management::Deployment::CompositeSearchBehavior const&)
{
throw hresult_not_implemented();
}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
index 37180ed522..749e98268b 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
@@ -18,7 +18,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
throw hresult_not_implemented();
}
- void FindPackagesOptions::ResultLimit(uint32_t value)
+ void FindPackagesOptions::ResultLimit(uint32_t)
{
throw hresult_not_implemented();
}
diff --git a/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp b/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
index 33a034d376..7ee258963c 100644
--- a/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
@@ -18,7 +18,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
throw hresult_not_implemented();
}
- void InstallOptions::PreferredInstallLocation(hstring const& value)
+ void InstallOptions::PreferredInstallLocation(hstring const&)
{
throw hresult_not_implemented();
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.idl b/src/Microsoft.Management.Deployment.Client/PackageManager.idl
index d81eb01279..2b85fce4b6 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.idl
+++ b/src/Microsoft.Management.Deployment.Client/PackageManager.idl
@@ -401,6 +401,7 @@ namespace Microsoft.Management.Deployment
enum PredefinedPackageCatalog
{
OpenWindowsCatalog,
+ MicrosoftStore,
};
/// Local Catalogs with PackageCatalogOrigin Predefined
diff --git a/src/PackagedTests/ComInterfaceUnitTest.cs b/src/PackagedTests/ComInterfaceUnitTest.cs
index bc39a10876..31807e88e9 100644
--- a/src/PackagedTests/ComInterfaceUnitTest.cs
+++ b/src/PackagedTests/ComInterfaceUnitTest.cs
@@ -26,15 +26,6 @@ public void OpenPredefinedCatalog()
break;
}
}
- // TODO: Investigate why casting fails here.
- /*foreach (var catalog in catalogs)
- {
- if (catalog.Info.Name.Equals("winget"))e
- {
- foundDefaultCatalog = true;
- break;
- }
- }*/
Assert.IsTrue(foundDefaultCatalog);
}
@@ -42,35 +33,8 @@ public void OpenPredefinedCatalog()
public void OpenPredefinedStoreCatalog()
{
PackageManager packageManager = new PackageManager();
- PackageCatalogReference catalogRef = packageManager.GetPredefinedPackageCatalog(PredefinedPackageCatalog.OpenWindowsCatalog);
- Assert.IsTrue(catalogRef.Info.Name.Equals("winget"));
- IReadOnlyList catalogs = packageManager.GetPackageCatalogs();
- Assert.IsTrue(catalogs.Count > 0);
- bool foundDefaultCatalog = false;
- for (int i = 0; i < catalogs.Count; i++)
- {
- if (catalogs[i].Info.Name.Equals("winget"))
- {
- foundDefaultCatalog = true;
- break;
- }
- }
- // TODO: Investigate why casting fails here.
- /*foreach (var catalog in catalogs)
- {
- if (catalog.Info.Name.Equals("winget"))e
- {
- foundDefaultCatalog = true;
- break;
- }
- }*/
- Assert.IsTrue(foundDefaultCatalog);
- }
-
- public void PopulateInstallOptions()
- {
- InstallOptions installOptions = new InstallOptions();
- //Assert.IsTrue(foundDefaultCatalog);
+ PackageCatalogReference catalogRef = packageManager.GetPredefinedPackageCatalog(PredefinedPackageCatalog.MicrosoftStore);
+ Assert.IsTrue(catalogRef.Info.Name.Equals("storepreview"));
}
}
}
From e9afd2322333a954cabc3818bb125298c714a332 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Mon, 16 Aug 2021 10:59:08 -0700
Subject: [PATCH 05/53] Guid name updates.
---
.../CreateCompositePackageCatalogOptions.h | 4 ++--
.../FindPackagesOptions.h | 4 ++--
src/Microsoft.Management.Deployment.Client/InstallOptions.h | 4 ++--
src/Microsoft.Management.Deployment.Client/PackageManager.h | 4 ++--
.../PackageMatchFilter.h | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
index 0a4befcdbb..dec3e02d46 100644
--- a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
@@ -3,7 +3,7 @@
#pragma once
#include "CreateCompositePackageCatalogOptions.g.h"
-const CLSID CLSID_CreateCompositePackageCatalogOptions2 = { 0x6444B10D, 0xFE84, 0x430F, { 0x93, 0x2B, 0x3D, 0x4F, 0xE5, 0x19, 0x5B, 0xDF } }; //6444B10D-FE84-430F-932B-3D4FE5195BDF
+const CLSID CLSID_CreateCompositePackageCatalogOptions = { 0x6444B10D, 0xFE84, 0x430F, { 0x93, 0x2B, 0x3D, 0x4F, 0xE5, 0x19, 0x5B, 0xDF } }; //6444B10D-FE84-430F-932B-3D4FE5195BDF
namespace winrt::Microsoft::Management::Deployment::implementation
{
@@ -22,7 +22,7 @@ namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
auto ActivateInstance() const
{
- return winrt::create_instance(CLSID_CreateCompositePackageCatalogOptions2, CLSCTX_ALL);
+ return winrt::create_instance(CLSID_CreateCompositePackageCatalogOptions, CLSCTX_ALL);
}
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
index 4401c4d7fe..ea8b5b612e 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
@@ -3,7 +3,7 @@
#pragma once
#include "FindPackagesOptions.g.h"
-const CLSID CLSID_FindPackagesOptions2 = { 0x2CAD6C15, 0xDF8E, 0x49DD, { 0xA7, 0x48, 0x96, 0xAD, 0xE0, 0xFE, 0x31, 0xB7 } }; //2CAD6C15-DF8E-49DD-A748-96ADE0FE31B7
+const CLSID CLSID_FindPackagesOptions = { 0x2CAD6C15, 0xDF8E, 0x49DD, { 0xA7, 0x48, 0x96, 0xAD, 0xE0, 0xFE, 0x31, 0xB7 } }; //2CAD6C15-DF8E-49DD-A748-96ADE0FE31B7
namespace winrt::Microsoft::Management::Deployment::implementation
{
@@ -23,7 +23,7 @@ namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
auto ActivateInstance() const
{
- return winrt::create_instance(CLSID_FindPackagesOptions2, CLSCTX_ALL);
+ return winrt::create_instance(CLSID_FindPackagesOptions, CLSCTX_ALL);
}
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/InstallOptions.h b/src/Microsoft.Management.Deployment.Client/InstallOptions.h
index 2116f6a6f8..148beaae16 100644
--- a/src/Microsoft.Management.Deployment.Client/InstallOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/InstallOptions.h
@@ -3,7 +3,7 @@
#pragma once
#include "InstallOptions.g.h"
-const CLSID CLSID_InstallOptions2 = { 0x05F7019A, 0x8FAC, 0x4422, 0xBC, 0xD5, 0x4C, 0xB3, 0x4F, 0xFB, 0x44, 0xA8 }; //05F7019A-8FAC-4422-BCD5-4CB34FFB44A8
+const CLSID CLSID_InstallOptions = { 0x05F7019A, 0x8FAC, 0x4422, 0xBC, 0xD5, 0x4C, 0xB3, 0x4F, 0xFB, 0x44, 0xA8 }; //05F7019A-8FAC-4422-BCD5-4CB34FFB44A8
namespace winrt::Microsoft::Management::Deployment::implementation
{
@@ -37,7 +37,7 @@ namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
auto ActivateInstance() const
{
- return winrt::create_instance(CLSID_InstallOptions2, CLSCTX_ALL);
+ return winrt::create_instance(CLSID_InstallOptions, CLSCTX_ALL);
}
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.h b/src/Microsoft.Management.Deployment.Client/PackageManager.h
index 00ccdc2bb3..c81ea112da 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageManager.h
@@ -1,7 +1,7 @@
#pragma once
#include "PackageManager.g.h"
-const CLSID CLSID_PackageManager2 = { 0xE65C7D5A, 0x95AF, 0x4A98, { 0xBE, 0x5F, 0xA7, 0x93, 0x02, 0x9C, 0xEB, 0x56 } }; //E65C7D5A-95AF-4A98-BE5F-A793029CEB56
+const CLSID CLSID_PackageManager = { 0xE65C7D5A, 0x95AF, 0x4A98, { 0xBE, 0x5F, 0xA7, 0x93, 0x02, 0x9C, 0xEB, 0x56 } }; //E65C7D5A-95AF-4A98-BE5F-A793029CEB56
namespace winrt::Microsoft::Management::Deployment::implementation
{
@@ -23,7 +23,7 @@ namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
auto ActivateInstance() const
{
- return winrt::create_instance(CLSID_PackageManager2, CLSCTX_ALL);
+ return winrt::create_instance(CLSID_PackageManager, CLSCTX_ALL);
}
};
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
index 4a6fdb5a69..7a83afa9c7 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
@@ -3,7 +3,7 @@
#pragma once
#include "PackageMatchFilter.g.h"
-const CLSID CLSID_PackageMatchFilter2 = { 0xADBF3B4A, 0xDB8A, 0x496C, { 0xA5, 0x79, 0x62, 0xB5, 0x8F, 0x5F, 0xB1, 0x30 } }; //ADBF3B4A-DB8A-496C-A579-62B58F5FB13F
+const CLSID CLSID_PackageMatchFilter = { 0xADBF3B4A, 0xDB8A, 0x496C, { 0xA5, 0x79, 0x62, 0xB5, 0x8F, 0x5F, 0xB1, 0x30 } }; //ADBF3B4A-DB8A-496C-A579-62B58F5FB13F
namespace winrt::Microsoft::Management::Deployment::implementation
{
@@ -25,7 +25,7 @@ namespace winrt::Microsoft::Management::Deployment::factory_implementation
{
auto ActivateInstance() const
{
- return winrt::create_instance(CLSID_PackageMatchFilter2, CLSCTX_ALL);
+ return winrt::create_instance(CLSID_PackageMatchFilter, CLSCTX_ALL);
}
};
}
From 8c312265180f6375f8c24d2f6a45b4765f735fd4 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Mon, 16 Aug 2021 12:31:16 -0700
Subject: [PATCH 06/53] Undo unneccessary changes.
---
.../AppInstallerCLIE2ETests.csproj | 13 +------------
.../PackageManager.idl | 4 ----
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj
index 20d75ab75b..328c16546a 100644
--- a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj
+++ b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj
@@ -1,7 +1,7 @@
- net5.0-windows10.0.19041.0
+ net5.0
$(SolutionDir)$(Platform)\$(Configuration)\AppInstallerCLIE2ETests\
false
x64;x86
@@ -10,10 +10,7 @@
-
-
-
@@ -40,16 +37,8 @@
-
-
- PreserveNewest
-
-
-
-
-
diff --git a/src/Microsoft.Management.Deployment/PackageManager.idl b/src/Microsoft.Management.Deployment/PackageManager.idl
index bc0263fa79..6f34e9aa99 100644
--- a/src/Microsoft.Management.Deployment/PackageManager.idl
+++ b/src/Microsoft.Management.Deployment/PackageManager.idl
@@ -533,9 +533,5 @@ namespace Microsoft.Management.Deployment
interface Windows.Foundation.Collections.IVectorView;
interface Windows.Foundation.Collections.IVector;
interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
}
}
From b3d3a07a47b1831ed73a0eb88f627297dc3a68b1 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Thu, 19 Aug 2021 14:29:58 -0700
Subject: [PATCH 07/53] Remove projection.
---
src/AppInstallerCLI.sln | 33 -------------------
...ft.Management.Deployment.Projection.csproj | 24 --------------
2 files changed, 57 deletions(-)
delete mode 100644 src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
index cc39a2781e..cfff2a2bc8 100644
--- a/src/AppInstallerCLI.sln
+++ b/src/AppInstallerCLI.sln
@@ -6,7 +6,6 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AppInstallerCLIPackage", "A
ProjectSection(ProjectDependencies) = postProject
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD} = {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}
{1CC41A9A-AE66-459D-9210-1E572DD7BE69} = {1CC41A9A-AE66-459D-9210-1E572DD7BE69}
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340} = {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppInstallerCLI", "AppInstallerCLI\AppInstallerCLI.vcxproj", "{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}"
@@ -127,8 +126,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinGetServer", "WinGetServe
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Management.Deployment.Client", "Microsoft.Management.Deployment.Client\Microsoft.Management.Deployment.Client.vcxproj", "{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Management.Deployment.Projection", "Microsoft.Management.Deployment.Projection\Microsoft.Management.Deployment.Projection.csproj", "{EAF57FF2-A05A-4E73-80A7-CF686CE2D340}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackagedTests", "PackagedTests\PackagedTests.csproj", "{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}"
EndProject
Global
@@ -657,36 +654,6 @@ Global
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x64.Build.0 = Release|x64
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.ActiveCfg = Release|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.Build.0 = Release|Win32
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|Any CPU.ActiveCfg = Debug|x86
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|Any CPU.Build.0 = Debug|x86
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|ARM.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|ARM64.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|x64.ActiveCfg = Debug|x64
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|x64.Build.0 = Debug|x64
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|x86.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Debug|x86.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|Any CPU.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|Any CPU.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|ARM.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|ARM.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|ARM64.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|ARM64.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|x64.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|x64.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|x86.ActiveCfg = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Fuzzing|x86.Build.0 = Debug|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|Any CPU.ActiveCfg = Release|x64
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|Any CPU.Build.0 = Release|x64
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|ARM.ActiveCfg = Release|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|ARM.Build.0 = Release|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|ARM64.ActiveCfg = Release|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|ARM64.Build.0 = Release|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|x64.ActiveCfg = Release|x64
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|x64.Build.0 = Release|x64
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|x86.ActiveCfg = Release|Any CPU
- {EAF57FF2-A05A-4E73-80A7-CF686CE2D340}.Release|x86.Build.0 = Release|Any CPU
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|Any CPU.ActiveCfg = Debug|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.ActiveCfg = Debug|ARM
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.Build.0 = Debug|ARM
diff --git a/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj b/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
deleted file mode 100644
index d1d09b46f7..0000000000
--- a/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- net5.0-windows10.0.19041.0
- 10.0.19041.0
- x64;x86
-
-
-
-
-
-
-
-
-
-
-
- Microsoft.Management.Deployment
- $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\Microsoft.Management.Deployment.Projection\
- $(OutDir)
-
-
- TRACE;fl
-
-
From dc2d71e4cc062a1c396778d879f8cc10834de615 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Thu, 19 Aug 2021 14:40:36 -0700
Subject: [PATCH 08/53] Spelling changes.
---
.github/actions/spelling/allow.txt | 7 +++++++
.github/actions/spelling/expect.txt | 5 +++++
src/PackagedTests/Package.appxmanifest | 4 ++--
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index f7838c493d..e1083854ee 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -4,6 +4,7 @@ addmanifest
addstore
admins
alloc
+altform
anonymize
api
appdata
@@ -123,6 +124,7 @@ ETW
EVENTTAG
exe
executables
+executionengine
exeenus
exeinteractive
exelog
@@ -306,6 +308,7 @@ PBYTE
pch
PCWSTR
pdb
+pdbonly
PEVENT
pfp
PGP
@@ -444,6 +447,7 @@ TARG
TARGETDIR
targetentrypoint
targetnametoken
+targetsize
tdbuild
tdd
tellg
@@ -459,6 +463,7 @@ there're
Timeline
todo
tolower
+Toolchain
toupper
towlower
TRACELOGGING
@@ -529,6 +534,7 @@ wcsicmp
webpage
wekyb
wil
+wildcards
WINAPI
WINEVENT
winget
@@ -553,6 +559,7 @@ wstring
wstringstream
www
xamarin
+xaml
XElement
xlang
xml
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index ac1d97a1c6..02c1b73687 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -1,4 +1,5 @@
abcd
+activatable
adml
admx
affle
@@ -72,6 +73,7 @@ contractversion
count'th
countryregion
createmanifestmetadata
+CSharp
cstdint
ctc
Ctx
@@ -147,6 +149,7 @@ inor
installshield
IPackage
IPersist
+IRead
IService
ISettings
ishelp
@@ -213,6 +216,7 @@ mylog
mysilent
mysilentwithprogress
mytool
+NETFX
netlify
Newtonsoft
NOEXPAND
@@ -333,6 +337,7 @@ VERSI
VERSIE
vns
vscode
+vstest
vy
wcslen
webpages
diff --git a/src/PackagedTests/Package.appxmanifest b/src/PackagedTests/Package.appxmanifest
index d8c34a8b5f..c9be52023f 100644
--- a/src/PackagedTests/Package.appxmanifest
+++ b/src/PackagedTests/Package.appxmanifest
@@ -6,14 +6,14 @@
IgnorableNamespaces="uap mp">
PackagedUnitTests
- sreading
+ Microsoft Corporation
Assets\StoreLogo.png
From eb31f6e17d989454f2c7c5d05f4059e9a29414cf Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Fri, 20 Aug 2021 16:32:33 -0700
Subject: [PATCH 09/53] Simplify packaged test csproj file.
---
src/PackagedTests/PackagedTests.csproj | 91 ++++----------------------
1 file changed, 13 insertions(+), 78 deletions(-)
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 9485af49e3..6f51bb2b3e 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -24,99 +24,34 @@
Always
x64
0
-
-
- true
- bin\x86\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ bin\$(Platform)\$(Configuration)\
;2008
- full
- x86
- false
prompt
- true
-
-
- bin\x86\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x86
false
- prompt
true
true
+ TRACE;NETFX_CORE;WINDOWS_UWP
-
- true
- bin\ARM\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM
- false
- prompt
- true
+
+ x86
-
- bin\ARM\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
- true
- true
+
+ x64
-
- true
- bin\ARM64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM64
- false
- prompt
- true
- true
+
+ ARM
-
- bin\ARM64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
+
ARM64
- false
- prompt
- true
- true
-
+
+ DEBUG
true
- bin\x64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
full
- x64
- false
- prompt
- true
-
- bin\x64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
+
pdbonly
- x64
- false
- prompt
- true
- true
+ true
PackageReference
From 5d041fd2a6358a619cf8b71149b652b0f33212a4 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Fri, 20 Aug 2021 18:35:52 -0700
Subject: [PATCH 10/53] Update guids\packagereference versions.
---
.../CreateCompositePackageCatalogOptions.h | 2 +-
.../FindPackagesOptions.h | 2 +-
.../InstallOptions.h | 2 +-
.../PackageManager.h | 2 +-
.../PackageMatchFilter.h | 2 +-
src/PackagedTests/PackagedTests.csproj | 7 +++++--
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
index dec3e02d46..1bda0b1f62 100644
--- a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
@@ -3,7 +3,7 @@
#pragma once
#include "CreateCompositePackageCatalogOptions.g.h"
-const CLSID CLSID_CreateCompositePackageCatalogOptions = { 0x6444B10D, 0xFE84, 0x430F, { 0x93, 0x2B, 0x3D, 0x4F, 0xE5, 0x19, 0x5B, 0xDF } }; //6444B10D-FE84-430F-932B-3D4FE5195BDF
+const CLSID CLSID_CreateCompositePackageCatalogOptions = { 0xEE160901, 0xB317, 0x4EA7, { 0x9C, 0xC6, 0x53, 0x55, 0xC6, 0xD7, 0xD8, 0xA7 } }; //EE160901-B317-4EA7-9CC6-5355C6D7D8A7
namespace winrt::Microsoft::Management::Deployment::implementation
{
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
index ea8b5b612e..854b529b41 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
@@ -3,7 +3,7 @@
#pragma once
#include "FindPackagesOptions.g.h"
-const CLSID CLSID_FindPackagesOptions = { 0x2CAD6C15, 0xDF8E, 0x49DD, { 0xA7, 0x48, 0x96, 0xAD, 0xE0, 0xFE, 0x31, 0xB7 } }; //2CAD6C15-DF8E-49DD-A748-96ADE0FE31B7
+const CLSID CLSID_FindPackagesOptions = { 0x1BD8FF3A, 0xEC50, 0x4F69, { 0xAE, 0xEE, 0xDF, 0x4C, 0x9D, 0x3B, 0xAA, 0x96 } }; //1BD8FF3A-EC50-4F69-AEEE-DF4C9D3BAA96
namespace winrt::Microsoft::Management::Deployment::implementation
{
diff --git a/src/Microsoft.Management.Deployment.Client/InstallOptions.h b/src/Microsoft.Management.Deployment.Client/InstallOptions.h
index 148beaae16..db97f1b6b9 100644
--- a/src/Microsoft.Management.Deployment.Client/InstallOptions.h
+++ b/src/Microsoft.Management.Deployment.Client/InstallOptions.h
@@ -3,7 +3,7 @@
#pragma once
#include "InstallOptions.g.h"
-const CLSID CLSID_InstallOptions = { 0x05F7019A, 0x8FAC, 0x4422, 0xBC, 0xD5, 0x4C, 0xB3, 0x4F, 0xFB, 0x44, 0xA8 }; //05F7019A-8FAC-4422-BCD5-4CB34FFB44A8
+const CLSID CLSID_InstallOptions = { 0x44FE0580, 0x62F7, 0x44D4, 0x9E, 0x91, 0xAA, 0x96, 0x14, 0xAB, 0x3E, 0x86 }; //44FE0580-62F7-44D4-9E91-AA9614AB3E86
namespace winrt::Microsoft::Management::Deployment::implementation
{
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.h b/src/Microsoft.Management.Deployment.Client/PackageManager.h
index c81ea112da..51c9c69211 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageManager.h
@@ -1,7 +1,7 @@
#pragma once
#include "PackageManager.g.h"
-const CLSID CLSID_PackageManager = { 0xE65C7D5A, 0x95AF, 0x4A98, { 0xBE, 0x5F, 0xA7, 0x93, 0x02, 0x9C, 0xEB, 0x56 } }; //E65C7D5A-95AF-4A98-BE5F-A793029CEB56
+const CLSID CLSID_PackageManager = { 0x74CB3139, 0xB7C5, 0x4B9E, { 0x93, 0x88, 0xE6, 0x61, 0x6D, 0xEA, 0x28, 0x8C } }; //74CB3139-B7C5-4B9E-9388-E6616DEA288C
namespace winrt::Microsoft::Management::Deployment::implementation
{
diff --git a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
index 7a83afa9c7..483afc1766 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
+++ b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
@@ -3,7 +3,7 @@
#pragma once
#include "PackageMatchFilter.g.h"
-const CLSID CLSID_PackageMatchFilter = { 0xADBF3B4A, 0xDB8A, 0x496C, { 0xA5, 0x79, 0x62, 0xB5, 0x8F, 0x5F, 0xB1, 0x30 } }; //ADBF3B4A-DB8A-496C-A579-62B58F5FB13F
+const CLSID CLSID_PackageMatchFilter = { 0x3F85B9F4, 0x487A, 0x4C48, { 0x90, 0x35, 0x29, 0x03, 0xF8, 0xA6, 0xD9, 0xE8 } }; //3F85B9F4-487A-4C48-9035-2903F8A6D9E8
namespace winrt::Microsoft::Management::Deployment::implementation
{
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 6f51bb2b3e..41d91b4dc6 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -91,11 +91,14 @@
6.2.12
+
+ 16.11.0
+
- 2.2.3
+ 2.2.5
- 2.2.3
+ 2.2.5
From 732e33082b32d168106a8e17c48075ed6ddafd3e Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:22:59 -0700
Subject: [PATCH 11/53] Remove anycpu
---
src/AppInstallerCLI.sln | 94 -------------------
.../readme.txt | 23 -----
2 files changed, 117 deletions(-)
delete mode 100644 src/Microsoft.Management.Deployment.Client/readme.txt
diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
index cfff2a2bc8..36f9683fcd 100644
--- a/src/AppInstallerCLI.sln
+++ b/src/AppInstallerCLI.sln
@@ -150,26 +150,20 @@ Global
ManifestSchema\ManifestSchema.vcxitems*{fb313532-38b0-4676-9303-ab200aa13576}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Fuzzing|Any CPU = Fuzzing|Any CPU
Fuzzing|ARM = Fuzzing|ARM
Fuzzing|ARM64 = Fuzzing|ARM64
Fuzzing|x64 = Fuzzing|x64
Fuzzing|x86 = Fuzzing|x86
- Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM.ActiveCfg = Debug|ARM
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM.Build.0 = Debug|ARM
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -182,16 +176,10 @@ Global
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|x86.ActiveCfg = Debug|x86
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|x86.Build.0 = Debug|x86
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|x86.Deploy.0 = Debug|x86
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|Any CPU.ActiveCfg = Release|Any CPU
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|Any CPU.Build.0 = Release|Any CPU
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|Any CPU.Deploy.0 = Release|Any CPU
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|ARM.ActiveCfg = Release|ARM
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|x64.ActiveCfg = Release|x64
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|x86.ActiveCfg = Release|x86
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|Any CPU.Build.0 = Release|Any CPU
- {6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|Any CPU.Deploy.0 = Release|Any CPU
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM.ActiveCfg = Release|ARM
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM.Build.0 = Release|ARM
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM.Deploy.0 = Release|ARM
@@ -204,7 +192,6 @@ Global
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|x86.ActiveCfg = Release|x86
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|x86.Build.0 = Release|x86
{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|x86.Deploy.0 = Release|x86
- {5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|Any CPU.ActiveCfg = Debug|Win32
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|ARM.ActiveCfg = Debug|ARM
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|ARM.Build.0 = Debug|ARM
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -213,13 +200,10 @@ Global
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|x64.Build.0 = Debug|x64
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|x86.ActiveCfg = Debug|Win32
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|x86.Build.0 = Debug|Win32
- {5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|Any CPU.Build.0 = Release|Win32
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|ARM.ActiveCfg = Release|ARM
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|x64.ActiveCfg = Release|x64
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|x86.ActiveCfg = Release|Win32
- {5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|Any CPU.ActiveCfg = Release|Win32
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|ARM.ActiveCfg = Release|ARM
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|ARM.Build.0 = Release|ARM
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -228,7 +212,6 @@ Global
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|x64.Build.0 = Release|x64
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|x86.ActiveCfg = Release|Win32
{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|x86.Build.0 = Release|Win32
- {1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|Any CPU.ActiveCfg = Debug|Win32
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|ARM.ActiveCfg = Debug|ARM
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|ARM.Build.0 = Debug|ARM
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -237,13 +220,10 @@ Global
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|x64.Build.0 = Debug|x64
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|x86.ActiveCfg = Debug|Win32
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|x86.Build.0 = Debug|Win32
- {1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|Any CPU.Build.0 = Release|Win32
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|ARM.ActiveCfg = Release|ARM
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|x64.ActiveCfg = Release|x64
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|x86.ActiveCfg = Release|Win32
- {1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|Any CPU.ActiveCfg = Release|Win32
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|ARM.ActiveCfg = Release|ARM
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|ARM.Build.0 = Release|ARM
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -252,7 +232,6 @@ Global
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|x64.Build.0 = Release|x64
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|x86.ActiveCfg = Release|Win32
{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|x86.Build.0 = Release|Win32
- {5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|Any CPU.ActiveCfg = Debug|Win32
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|ARM.ActiveCfg = Debug|ARM
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|ARM.Build.0 = Debug|ARM
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -261,13 +240,10 @@ Global
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|x64.Build.0 = Debug|x64
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|x86.ActiveCfg = Debug|Win32
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|x86.Build.0 = Debug|Win32
- {5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|Any CPU.Build.0 = Release|Win32
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|ARM.ActiveCfg = Release|ARM
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|x64.ActiveCfg = Release|x64
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|x86.ActiveCfg = Release|Win32
- {5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|Any CPU.ActiveCfg = Release|Win32
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|ARM.ActiveCfg = Release|ARM
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|ARM.Build.0 = Release|ARM
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -276,27 +252,22 @@ Global
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|x64.Build.0 = Release|x64
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|x86.ActiveCfg = Release|Win32
{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|x86.Build.0 = Release|Win32
- {89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|Any CPU.ActiveCfg = Debug|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|ARM.ActiveCfg = Debug|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|ARM64.ActiveCfg = Debug|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x64.ActiveCfg = Debug|x64
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x64.Build.0 = Debug|x64
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x86.ActiveCfg = Debug|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x86.Build.0 = Debug|Win32
- {89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|Any CPU.ActiveCfg = Release|x64
- {89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|Any CPU.Build.0 = Release|x64
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|ARM.ActiveCfg = Release|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|ARM64.ActiveCfg = Release|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|x64.ActiveCfg = Release|x64
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|x86.ActiveCfg = Release|Win32
- {89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|Any CPU.ActiveCfg = Release|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|ARM.ActiveCfg = Release|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|ARM64.ActiveCfg = Release|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x64.ActiveCfg = Release|x64
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x64.Build.0 = Release|x64
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x86.ActiveCfg = Release|Win32
{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x86.Build.0 = Release|Win32
- {8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|Any CPU.ActiveCfg = Debug|Win32
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|ARM.ActiveCfg = Debug|ARM
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|ARM.Build.0 = Debug|ARM
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -305,13 +276,11 @@ Global
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|x64.Build.0 = Debug|x64
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|x86.ActiveCfg = Debug|Win32
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|x86.Build.0 = Debug|Win32
- {8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|ARM.ActiveCfg = Release|ARM
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|x64.Build.0 = Fuzzing|x64
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|x86.ActiveCfg = Release|Win32
- {8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|Any CPU.ActiveCfg = Release|Win32
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|ARM.ActiveCfg = Release|ARM
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|ARM.Build.0 = Release|ARM
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -320,7 +289,6 @@ Global
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|x64.Build.0 = Release|x64
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|x86.ActiveCfg = Release|Win32
{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|x86.Build.0 = Release|Win32
- {5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|Any CPU.ActiveCfg = Debug|Win32
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|ARM.ActiveCfg = Debug|ARM
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|ARM.Build.0 = Debug|ARM
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -329,13 +297,11 @@ Global
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|x64.Build.0 = Debug|x64
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|x86.ActiveCfg = Debug|Win32
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|x86.Build.0 = Debug|Win32
- {5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|ARM.ActiveCfg = Release|ARM
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|x64.Build.0 = Fuzzing|x64
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|x86.ActiveCfg = Release|Win32
- {5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|Any CPU.ActiveCfg = Release|Win32
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|ARM.ActiveCfg = Release|ARM
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|ARM.Build.0 = Release|ARM
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -344,7 +310,6 @@ Global
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|x64.Build.0 = Release|x64
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|x86.ActiveCfg = Release|Win32
{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|x86.Build.0 = Release|Win32
- {FB313532-38B0-4676-9303-AB200AA13576}.Debug|Any CPU.ActiveCfg = Debug|Win32
{FB313532-38B0-4676-9303-AB200AA13576}.Debug|ARM.ActiveCfg = Debug|ARM
{FB313532-38B0-4676-9303-AB200AA13576}.Debug|ARM.Build.0 = Debug|ARM
{FB313532-38B0-4676-9303-AB200AA13576}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -353,13 +318,10 @@ Global
{FB313532-38B0-4676-9303-AB200AA13576}.Debug|x64.Build.0 = Debug|x64
{FB313532-38B0-4676-9303-AB200AA13576}.Debug|x86.ActiveCfg = Debug|Win32
{FB313532-38B0-4676-9303-AB200AA13576}.Debug|x86.Build.0 = Debug|Win32
- {FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|Any CPU.Build.0 = Release|Win32
{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|ARM.ActiveCfg = Release|ARM
{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|x64.ActiveCfg = Release|x64
{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|x86.ActiveCfg = Release|Win32
- {FB313532-38B0-4676-9303-AB200AA13576}.Release|Any CPU.ActiveCfg = Release|Win32
{FB313532-38B0-4676-9303-AB200AA13576}.Release|ARM.ActiveCfg = Release|ARM
{FB313532-38B0-4676-9303-AB200AA13576}.Release|ARM.Build.0 = Release|ARM
{FB313532-38B0-4676-9303-AB200AA13576}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -368,7 +330,6 @@ Global
{FB313532-38B0-4676-9303-AB200AA13576}.Release|x64.Build.0 = Release|x64
{FB313532-38B0-4676-9303-AB200AA13576}.Release|x86.ActiveCfg = Release|Win32
{FB313532-38B0-4676-9303-AB200AA13576}.Release|x86.Build.0 = Release|Win32
- {6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|Any CPU.ActiveCfg = Debug|Win32
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|ARM.ActiveCfg = Debug|ARM
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|ARM.Build.0 = Debug|ARM
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -377,13 +338,10 @@ Global
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|x64.Build.0 = Debug|x64
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|x86.ActiveCfg = Debug|Win32
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|x86.Build.0 = Debug|Win32
- {6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|Any CPU.Build.0 = Release|Win32
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|ARM.ActiveCfg = Release|ARM
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|x64.ActiveCfg = Release|x64
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|x86.ActiveCfg = Release|Win32
- {6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|Any CPU.ActiveCfg = Release|Win32
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|ARM.ActiveCfg = Release|ARM
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|ARM.Build.0 = Release|ARM
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -392,29 +350,22 @@ Global
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|x64.Build.0 = Release|x64
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|x86.ActiveCfg = Release|Win32
{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|x86.Build.0 = Release|Win32
- {3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|Any CPU.ActiveCfg = Debug|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|ARM.ActiveCfg = Debug|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|ARM64.ActiveCfg = Debug|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x64.ActiveCfg = Debug|x64
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x64.Build.0 = Debug|x64
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x86.ActiveCfg = Debug|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x86.Build.0 = Debug|x86
- {3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|Any CPU.ActiveCfg = Release|x64
- {3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|Any CPU.Build.0 = Release|x64
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|ARM.ActiveCfg = Release|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|ARM64.ActiveCfg = Release|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|x64.ActiveCfg = Release|x64
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|x86.ActiveCfg = Release|x86
- {3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|Any CPU.ActiveCfg = Release|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|ARM.ActiveCfg = Release|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|ARM64.ActiveCfg = Release|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x64.ActiveCfg = Release|x64
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x64.Build.0 = Release|x64
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x86.ActiveCfg = Release|x86
{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x86.Build.0 = Release|x86
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM.ActiveCfg = Debug|ARM
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM.Build.0 = Debug|ARM
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -427,16 +378,10 @@ Global
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|x86.ActiveCfg = Debug|x86
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|x86.Build.0 = Debug|x86
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|x86.Deploy.0 = Debug|x86
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|Any CPU.ActiveCfg = Release|Any CPU
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|Any CPU.Build.0 = Release|Any CPU
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|Any CPU.Deploy.0 = Release|Any CPU
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|ARM.ActiveCfg = Release|ARM
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|x64.ActiveCfg = Release|x64
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|x86.ActiveCfg = Release|x86
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|Any CPU.Build.0 = Release|Any CPU
- {3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|Any CPU.Deploy.0 = Release|Any CPU
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM.ActiveCfg = Release|ARM
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM.Build.0 = Release|ARM
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM.Deploy.0 = Release|ARM
@@ -449,42 +394,34 @@ Global
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|x86.ActiveCfg = Release|x86
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|x86.Build.0 = Release|x86
{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|x86.Deploy.0 = Release|x86
- {C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|Any CPU.ActiveCfg = Debug
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|ARM.ActiveCfg = Debug
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|ARM64.ActiveCfg = Debug
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|x64.ActiveCfg = Debug
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|x86.ActiveCfg = Debug
- {C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|Any CPU.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|ARM.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|ARM64.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|x64.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|x86.ActiveCfg = Release
- {C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|Any CPU.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|ARM.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|ARM64.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|x64.ActiveCfg = Release
{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|x86.ActiveCfg = Release
- {3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|Any CPU.ActiveCfg = Debug|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|ARM.ActiveCfg = Debug|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|ARM64.ActiveCfg = Debug|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x64.ActiveCfg = Debug|x64
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x64.Build.0 = Debug|x64
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x86.ActiveCfg = Debug|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x86.Build.0 = Debug|x86
- {3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|Any CPU.ActiveCfg = Release|x64
- {3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|Any CPU.Build.0 = Release|x64
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|ARM.ActiveCfg = Release|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|ARM64.ActiveCfg = Release|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|x64.ActiveCfg = Release|x64
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|x86.ActiveCfg = Release|x86
- {3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|Any CPU.ActiveCfg = Release|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|ARM.ActiveCfg = Release|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|ARM64.ActiveCfg = Release|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x64.ActiveCfg = Release|x64
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x64.Build.0 = Release|x64
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x86.ActiveCfg = Release|x86
{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x86.Build.0 = Release|x86
- {82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|Any CPU.ActiveCfg = Debug|Win32
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|ARM.ActiveCfg = Debug|ARM
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|ARM.Build.0 = Debug|ARM
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -493,13 +430,11 @@ Global
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|x64.Build.0 = Debug|x64
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|x86.ActiveCfg = Debug|Win32
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|x86.Build.0 = Debug|Win32
- {82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|ARM.ActiveCfg = Release|ARM
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|x64.Build.0 = Fuzzing|x64
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|x86.ActiveCfg = Release|Win32
- {82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|Any CPU.ActiveCfg = Release|Win32
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|ARM.ActiveCfg = Release|ARM
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|ARM.Build.0 = Release|ARM
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -508,45 +443,36 @@ Global
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|x64.Build.0 = Release|x64
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|x86.ActiveCfg = Release|Win32
{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|x86.Build.0 = Release|Win32
- {1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|Any CPU.ActiveCfg = Debug|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|ARM.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|ARM64.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|x64.ActiveCfg = Debug|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|x64.Build.0 = Debug|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|x86.ActiveCfg = Fuzzing|x64
- {1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|ARM64.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|x64.Build.0 = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|x86.ActiveCfg = Fuzzing|x64
- {1622DA16-914F-4F57-A259-D5169003CC8C}.Release|Any CPU.ActiveCfg = Debug|x64
- {1622DA16-914F-4F57-A259-D5169003CC8C}.Release|Any CPU.Build.0 = Debug|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|ARM.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|ARM64.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|x64.ActiveCfg = Fuzzing|x64
{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|x86.ActiveCfg = Fuzzing|x64
- {3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|Any CPU.ActiveCfg = Debug|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|ARM.ActiveCfg = Debug|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|ARM64.ActiveCfg = Debug|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x64.ActiveCfg = Debug|x64
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x64.Build.0 = Debug|x64
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x86.ActiveCfg = Debug|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x86.Build.0 = Debug|x86
- {3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|Any CPU.ActiveCfg = Release|x64
- {3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|Any CPU.Build.0 = Release|x64
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|ARM.ActiveCfg = Release|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|ARM64.ActiveCfg = Release|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|x64.ActiveCfg = Release|x64
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|x86.ActiveCfg = Release|x86
- {3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|Any CPU.ActiveCfg = Release|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|ARM.ActiveCfg = Release|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|ARM64.ActiveCfg = Release|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x64.ActiveCfg = Release|x64
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x64.Build.0 = Release|x64
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x86.ActiveCfg = Release|x86
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x86.Build.0 = Release|x86
- {866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|Any CPU.ActiveCfg = Debug|Win32
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|ARM.ActiveCfg = Debug|ARM
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|ARM.Build.0 = Debug|ARM
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -555,13 +481,10 @@ Global
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|x64.Build.0 = Debug|x64
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|x86.ActiveCfg = Debug|Win32
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|x86.Build.0 = Debug|Win32
- {866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|Any CPU.Build.0 = Release|Win32
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|ARM.ActiveCfg = Release|ARM
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|x64.ActiveCfg = Release|x64
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|x86.ActiveCfg = Release|Win32
- {866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|Any CPU.ActiveCfg = Release|Win32
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|ARM.ActiveCfg = Release|ARM
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|ARM.Build.0 = Release|ARM
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -570,7 +493,6 @@ Global
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|x64.Build.0 = Release|x64
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|x86.ActiveCfg = Release|Win32
{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|x86.Build.0 = Release|Win32
- {1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|Any CPU.ActiveCfg = Debug|Win32
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|ARM.ActiveCfg = Debug|ARM
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|ARM.Build.0 = Debug|ARM
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -579,8 +501,6 @@ Global
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|x64.Build.0 = Debug|x64
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|x86.ActiveCfg = Debug|Win32
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|x86.Build.0 = Debug|Win32
- {1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|Any CPU.Build.0 = Release|Win32
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|ARM.ActiveCfg = Debug|ARM
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|ARM.Build.0 = Debug|ARM
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|ARM64.ActiveCfg = Debug|ARM64
@@ -589,7 +509,6 @@ Global
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|x64.Build.0 = Debug|x64
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|x86.ActiveCfg = Debug|Win32
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|x86.Build.0 = Debug|Win32
- {1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|Any CPU.ActiveCfg = Release|Win32
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|ARM.ActiveCfg = Release|ARM
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|ARM.Build.0 = Release|ARM
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -598,7 +517,6 @@ Global
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|x64.Build.0 = Release|x64
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|x86.ActiveCfg = Release|Win32
{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|x86.Build.0 = Release|Win32
- {2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|Any CPU.ActiveCfg = Debug|Win32
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|ARM.ActiveCfg = Debug|ARM
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|ARM.Build.0 = Debug|ARM
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -607,8 +525,6 @@ Global
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|x64.Build.0 = Debug|x64
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|x86.ActiveCfg = Debug|Win32
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|x86.Build.0 = Debug|Win32
- {2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|Any CPU.ActiveCfg = Release|Win32
- {2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|Any CPU.Build.0 = Release|Win32
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|ARM.ActiveCfg = Debug|ARM
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|ARM.Build.0 = Debug|ARM
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|ARM64.ActiveCfg = Debug|ARM64
@@ -617,7 +533,6 @@ Global
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|x64.Build.0 = Debug|x64
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|x86.ActiveCfg = Debug|Win32
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|x86.Build.0 = Debug|Win32
- {2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|Any CPU.ActiveCfg = Release|Win32
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|ARM.ActiveCfg = Release|ARM
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|ARM.Build.0 = Release|ARM
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -626,7 +541,6 @@ Global
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|x64.Build.0 = Release|x64
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|x86.ActiveCfg = Release|Win32
{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|x86.Build.0 = Release|Win32
- {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|Any CPU.ActiveCfg = Debug|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|ARM.ActiveCfg = Debug|ARM
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|ARM.Build.0 = Debug|ARM
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -635,8 +549,6 @@ Global
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|x64.Build.0 = Debug|x64
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|x86.ActiveCfg = Debug|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|x86.Build.0 = Debug|Win32
- {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|Any CPU.ActiveCfg = Debug|Win32
- {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|Any CPU.Build.0 = Debug|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|ARM.ActiveCfg = Debug|ARM
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|ARM.Build.0 = Debug|ARM
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|ARM64.ActiveCfg = Debug|ARM64
@@ -645,7 +557,6 @@ Global
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|x64.Build.0 = Debug|x64
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|x86.ActiveCfg = Debug|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Fuzzing|x86.Build.0 = Debug|Win32
- {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|Any CPU.ActiveCfg = Release|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|ARM.ActiveCfg = Release|ARM
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|ARM.Build.0 = Release|ARM
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -654,7 +565,6 @@ Global
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x64.Build.0 = Release|x64
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.ActiveCfg = Release|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.Build.0 = Release|Win32
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|Any CPU.ActiveCfg = Debug|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.ActiveCfg = Debug|ARM
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.Build.0 = Debug|ARM
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -667,9 +577,6 @@ Global
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.ActiveCfg = Debug|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.Build.0 = Debug|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.Deploy.0 = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|Any CPU.ActiveCfg = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|Any CPU.Build.0 = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|Any CPU.Deploy.0 = Debug|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM.ActiveCfg = Debug|ARM
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM.Build.0 = Debug|ARM
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM.Deploy.0 = Debug|ARM
@@ -682,7 +589,6 @@ Global
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x86.ActiveCfg = Debug|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x86.Build.0 = Debug|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x86.Deploy.0 = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|Any CPU.ActiveCfg = Release|x86
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.ActiveCfg = Release|ARM
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.Build.0 = Release|ARM
{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.Deploy.0 = Release|ARM
diff --git a/src/Microsoft.Management.Deployment.Client/readme.txt b/src/Microsoft.Management.Deployment.Client/readme.txt
deleted file mode 100644
index aa0dc2f192..0000000000
--- a/src/Microsoft.Management.Deployment.Client/readme.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-========================================================================
- C++/WinRT Microsoft.Management.Deployment Project Overview
-========================================================================
-
-This project demonstrates how to get started authoring Windows Runtime
-classes directly with standard C++, using the C++/WinRT SDK component
-to generate implementation headers from interface (IDL) files. The
-generated Windows Runtime component binary and WinMD files should then
-be bundled with the Universal Windows Platform (UWP) app consuming them.
-
-Steps:
-1. Create an interface (IDL) file to define your Windows Runtime class,
- its default interface, and any other interfaces it implements.
-2. Build the project once to generate module.g.cpp, module.h.cpp, and
- implementation templates under the "Generated Files" folder, as
- well as skeleton class definitions under "Generated Files\sources".
-3. Use the skeleton class definitions for reference to implement your
- Windows Runtime classes.
-
-========================================================================
-Learn more about C++/WinRT here:
-http://aka.ms/cppwinrt/
-========================================================================
From 48669bde68a7ce08ddd20d9825218c20460c4708 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Wed, 25 Aug 2021 02:32:03 -0700
Subject: [PATCH 12/53] Append defines instead of overriding.
---
src/PackagedTests/PackagedTests.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 41d91b4dc6..3718a22966 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -45,7 +45,7 @@
ARM64
- DEBUG
+ DEBUG;$(DefineConstants)
true
full
From 40d62a94b8376e7d5d557ecd9a5ee85a84bca2f8 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Wed, 25 Aug 2021 14:20:08 -0700
Subject: [PATCH 13/53] Attempt switch to packages.config for nuget
---
src/PackagedTests/PackagedTests.csproj | 22 +++-------------------
src/PackagedTests/packages.config | 7 +++++++
2 files changed, 10 insertions(+), 19 deletions(-)
create mode 100644 src/PackagedTests/packages.config
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 3718a22966..9df6aedd4f 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -14,6 +14,7 @@
10.0.19041.0
10.0.17763.0
14
+ true
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
$(VisualStudioVersion)
@@ -29,7 +30,6 @@
prompt
false
true
- true
TRACE;NETFX_CORE;WINDOWS_UWP
@@ -52,9 +52,7 @@
pdbonly
true
-
-
- PackageReference
+ true
@@ -87,20 +85,6 @@
-
-
- 6.2.12
-
-
- 16.11.0
-
-
- 2.2.5
-
-
- 2.2.5
-
-
{4bc1f40b-36c2-4bbb-8306-76e490b13bbd}
diff --git a/src/PackagedTests/packages.config b/src/PackagedTests/packages.config
new file mode 100644
index 0000000000..122a87d91c
--- /dev/null
+++ b/src/PackagedTests/packages.config
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
From 84d7982b95eae210a5d4cb982e145adfd64a6228 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Wed, 25 Aug 2021 15:27:26 -0700
Subject: [PATCH 14/53] Add packagereference back.
---
src/PackagedTests/PackagedTests.csproj | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 9df6aedd4f..2492164015 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -85,6 +85,20 @@
+
+
+ 6.2.12
+
+
+ 16.11.0
+
+
+ 2.2.5
+
+
+ 2.2.5
+
+
{4bc1f40b-36c2-4bbb-8306-76e490b13bbd}
From 95c024d47242ade6ca9e11c14168c66a7e4fb6e4 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:29:19 -0700
Subject: [PATCH 15/53] Try packages.config again.
---
src/PackagedTests/PackagedTests.csproj | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 2492164015..dbca0fa3f5 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -85,26 +85,15 @@
-
-
- 6.2.12
-
-
- 16.11.0
-
-
- 2.2.5
-
-
- 2.2.5
-
-
{4bc1f40b-36c2-4bbb-8306-76e490b13bbd}
Microsoft.Management.Deployment.Client
+
+
+
14.0
From 763f2e1eb9d862080ce03fa447000a7ed0c2d2f8 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Wed, 25 Aug 2021 17:21:11 -0700
Subject: [PATCH 16/53] Try direct restore of csproj
---
azure-pipelines.yml | 5 +++++
src/PackagedTests/PackagedTests.csproj | 17 ++++++++++++++---
src/PackagedTests/packages.config | 7 -------
3 files changed, 19 insertions(+), 10 deletions(-)
delete mode 100644 src/PackagedTests/packages.config
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b74287981e..49e334c4af 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -65,6 +65,11 @@ jobs:
displayName: Restore AppInstallerTestMsixInstaller
inputs:
restoreSolution: 'src\AppInstallerTestMsixInstaller\AppInstallerTestMsixInstaller.wapproj'
+
+ - task: NuGetCommand@2
+ displayName: Restore PackagedTests
+ inputs:
+ restoreSolution: 'src\PackagedTests\PackagedTests.csproj'
# Restores only .NET core projects, but is still necessary, as without this the IndexCreationTool and LocalhostWebServer projects fail to build
- task: DotNetCoreCLI@2
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index dbca0fa3f5..2492164015 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -85,15 +85,26 @@
+
+
+ 6.2.12
+
+
+ 16.11.0
+
+
+ 2.2.5
+
+
+ 2.2.5
+
+
{4bc1f40b-36c2-4bbb-8306-76e490b13bbd}
Microsoft.Management.Deployment.Client
-
-
-
14.0
diff --git a/src/PackagedTests/packages.config b/src/PackagedTests/packages.config
deleted file mode 100644
index 122a87d91c..0000000000
--- a/src/PackagedTests/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
From 20e11a51f91a0e51cd3c0522fd76e76dac32afe4 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Wed, 25 Aug 2021 17:45:32 -0700
Subject: [PATCH 17/53] Try workaround solutiondir issue
---
.../Microsoft.Management.Deployment.Client.vcxproj | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
index d7495334d6..e9cd4ec4e9 100644
--- a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
+++ b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
@@ -1,6 +1,6 @@
-
+
true
true
@@ -59,6 +59,7 @@
v142
Unicode
false
+ true
true
@@ -183,13 +184,13 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
From 40ad2dbd6d8ae1de416880968a638c327292057c Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Thu, 26 Aug 2021 01:05:25 -0700
Subject: [PATCH 18/53] Try fix bundleplatforms.
---
.../Microsoft.Management.Deployment.Client.vcxproj | 1 -
src/PackagedTests/PackagedTests.csproj | 2 --
2 files changed, 3 deletions(-)
diff --git a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
index e9cd4ec4e9..041a2524de 100644
--- a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
+++ b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
@@ -82,7 +82,6 @@
-
$(VC_IncludePath);$(WindowsSDK_IncludePath);
$(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 2492164015..8b734a37af 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -22,8 +22,6 @@
False
True
True
- Always
- x64
0
bin\$(Platform)\$(Configuration)\
;2008
From 83bd27265356a8b9287aa7160a0774bd041ca13e Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Thu, 26 Aug 2021 02:42:19 -0700
Subject: [PATCH 19/53] Change outputpath
---
src/PackagedTests/PackagedTests.csproj | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index 8b734a37af..ff2442475e 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -23,7 +23,6 @@
True
True
0
- bin\$(Platform)\$(Configuration)\
;2008
prompt
false
@@ -52,6 +51,10 @@
true
true
+
+ $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
+ $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
+
From d6ddc0831248fcc564cec738f3b3fd520bbe0d68 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Fri, 27 Aug 2021 15:22:55 -0700
Subject: [PATCH 20/53] Remove output path
---
src/PackagedTests/PackagedTests.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index ff2442475e..d9ae9fc9c1 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -52,7 +52,6 @@
true
- $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
From 94dba4b0f4be2bb284b660050e9ae412a1b884e2 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:24:33 -0700
Subject: [PATCH 21/53] Make client and server have separate lib names.
---
.../Microsoft.Management.Deployment.vcxproj | 3 ++-
src/WinGetServer/WinGetServer.vcxproj | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj
index d3fba05a4c..d9c12c8f6d 100644
--- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj
+++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj
@@ -14,7 +14,7 @@
10.0
10.0.18362.0
10.0.17763.0
- -lib Microsoft_Management_Deployment
+ -lib
@@ -85,6 +85,7 @@
$(VC_IncludePath);$(WindowsSDK_IncludePath);
$(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(PlatformTarget)\$(Configuration)\
+ $(RootNamespace).Server
true
false
..\CodeAnalysis.ruleset
diff --git a/src/WinGetServer/WinGetServer.vcxproj b/src/WinGetServer/WinGetServer.vcxproj
index 8239fe8105..020ed245a7 100644
--- a/src/WinGetServer/WinGetServer.vcxproj
+++ b/src/WinGetServer/WinGetServer.vcxproj
@@ -106,7 +106,7 @@
Windows
false
$(OutDir)..\Microsoft.Management.Deployment;$(OutDir)..\AppInstallerCLICore;$(OutDir)..\JsonCppLib;$(OutDir)..\AppInstallerRepositoryCore;$(OutDir)..\YamlCppLib;$(OutDir)..\AppInstallerCommonCore;$(OutDir)..\cpprestsdk;%(AdditionalLibraryDirectories)
- Microsoft.Management.Deployment.lib;AppInstallerCLICore.lib;AppInstallerCommonCore.lib;AppInstallerRepositoryCore.lib;JsonCppLib.lib;YamlCppLib.lib;cpprestsdk.lib;wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;winhttp.lib;onecoreuap.lib;%(AdditionalDependencies)
+ Microsoft.Management.Deployment.Server.lib;AppInstallerCLICore.lib;AppInstallerCommonCore.lib;AppInstallerRepositoryCore.lib;JsonCppLib.lib;YamlCppLib.lib;cpprestsdk.lib;wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;winhttp.lib;onecoreuap.lib;%(AdditionalDependencies)
From 76c83efa30384fa88204c2d8658bd981f87ce918 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:24:52 -0700
Subject: [PATCH 22/53] Add output path back.
---
src/PackagedTests/PackagedTests.csproj | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj
index d9ae9fc9c1..ff2442475e 100644
--- a/src/PackagedTests/PackagedTests.csproj
+++ b/src/PackagedTests/PackagedTests.csproj
@@ -52,6 +52,7 @@
true
+ $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
From 2903f189810af408528a4116a3f88d48a76d691a Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:59:33 -0700
Subject: [PATCH 23/53] Merge build break fix to allow pipeline run.
---
src/AppInstallerRepositoryCore/RepositorySource.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/AppInstallerRepositoryCore/RepositorySource.cpp b/src/AppInstallerRepositoryCore/RepositorySource.cpp
index 70b41c0224..81341653e2 100644
--- a/src/AppInstallerRepositoryCore/RepositorySource.cpp
+++ b/src/AppInstallerRepositoryCore/RepositorySource.cpp
@@ -969,7 +969,7 @@ namespace AppInstaller::Repository
// Check for a non-user tombstone; hidden source data that we don't want to collide.
// TODO: Refactor the source interface so that we don't do this
- auto tombstoneSource = sourceList.GetSource(name);
+ auto tombstoneSource = sourceList.GetSource(sourceDetails.Name);
THROW_HR_IF(APPINSTALLER_CLI_ERROR_SOURCE_NAME_ALREADY_EXISTS, tombstoneSource && tombstoneSource->Origin != SourceOrigin::User);
// Check sources allowed by group policy
From 8325d9df66adb5f0940548f25a620b0d6472cb9a Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Mon, 30 Aug 2021 11:35:31 -0700
Subject: [PATCH 24/53] Move test package to its own solution.
---
azure-pipelines.yml | 3 +-
src/AppInstallerCLI.sln | 39 +----------------------
src/PackagedTests.sln | 69 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 72 insertions(+), 39 deletions(-)
create mode 100644 src/PackagedTests.sln
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 49e334c4af..592561ff71 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -86,11 +86,12 @@ jobs:
arguments: '-TargetFile binver\binver\version.h -BuildVersion $(BuildVer)'
workingDirectory: 'src'
+ # Build all solutions in the root directory.
- task: VSBuild@1
displayName: Build Solution
inputs:
platform: 'x86'
- solution: '$(solution)'
+ solution: 'src\*.sln'
configuration: '$(buildConfiguration)'
msbuildArgs: '/p:AppxBundlePlatforms="$(buildPlatform)"
/p:AppxPackageDir="$(appxPackageDir)"
diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
index 36f9683fcd..c9da292a79 100644
--- a/src/AppInstallerCLI.sln
+++ b/src/AppInstallerCLI.sln
@@ -6,6 +6,7 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AppInstallerCLIPackage", "A
ProjectSection(ProjectDependencies) = postProject
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD} = {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}
{1CC41A9A-AE66-459D-9210-1E572DD7BE69} = {1CC41A9A-AE66-459D-9210-1E572DD7BE69}
+ {5B6F90DF-FD19-4BAE-83D9-24DAD128E777} = {5B6F90DF-FD19-4BAE-83D9-24DAD128E777}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppInstallerCLI", "AppInstallerCLI\AppInstallerCLI.vcxproj", "{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}"
@@ -126,8 +127,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinGetServer", "WinGetServe
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Management.Deployment.Client", "Microsoft.Management.Deployment.Client\Microsoft.Management.Deployment.Client.vcxproj", "{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackagedTests", "PackagedTests\PackagedTests.csproj", "{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}"
-EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
ManifestSchema\ManifestSchema.vcxitems*{1622da16-914f-4f57-a259-d5169003cc8c}*SharedItemsImports = 4
@@ -565,42 +564,6 @@ Global
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x64.Build.0 = Release|x64
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.ActiveCfg = Release|Win32
{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.Build.0 = Release|Win32
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.ActiveCfg = Debug|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.Build.0 = Debug|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.Deploy.0 = Debug|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM64.Build.0 = Debug|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM64.Deploy.0 = Debug|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x64.ActiveCfg = Debug|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x64.Build.0 = Debug|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x64.Deploy.0 = Debug|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.ActiveCfg = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.Build.0 = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.Deploy.0 = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM.ActiveCfg = Debug|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM.Build.0 = Debug|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM.Deploy.0 = Debug|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM64.ActiveCfg = Debug|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM64.Build.0 = Debug|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|ARM64.Deploy.0 = Debug|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x64.ActiveCfg = Debug|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x64.Build.0 = Debug|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x64.Deploy.0 = Debug|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x86.ActiveCfg = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x86.Build.0 = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Fuzzing|x86.Deploy.0 = Debug|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.ActiveCfg = Release|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.Build.0 = Release|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.Deploy.0 = Release|ARM
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM64.ActiveCfg = Release|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM64.Build.0 = Release|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM64.Deploy.0 = Release|ARM64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x64.ActiveCfg = Release|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x64.Build.0 = Release|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x64.Deploy.0 = Release|x64
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x86.ActiveCfg = Release|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x86.Build.0 = Release|x86
- {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x86.Deploy.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/PackagedTests.sln b/src/PackagedTests.sln
new file mode 100644
index 0000000000..42e13aa9e3
--- /dev/null
+++ b/src/PackagedTests.sln
@@ -0,0 +1,69 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31424.327
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackagedTests", "PackagedTests\PackagedTests.csproj", "{8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Management.Deployment.Client", "Microsoft.Management.Deployment.Client\Microsoft.Management.Deployment.Client.vcxproj", "{4BC1F40B-36C2-4BBB-8306-76E490B13BBD}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.ActiveCfg = Debug|ARM
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.Build.0 = Debug|ARM
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM.Deploy.0 = Debug|ARM
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM64.Build.0 = Debug|ARM64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x64.ActiveCfg = Debug|x64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x64.Build.0 = Debug|x64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x64.Deploy.0 = Debug|x64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.ActiveCfg = Debug|x86
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.Build.0 = Debug|x86
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Debug|x86.Deploy.0 = Debug|x86
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.ActiveCfg = Release|ARM
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.Build.0 = Release|ARM
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM.Deploy.0 = Release|ARM
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM64.ActiveCfg = Release|ARM64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM64.Build.0 = Release|ARM64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|ARM64.Deploy.0 = Release|ARM64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x64.ActiveCfg = Release|x64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x64.Build.0 = Release|x64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x64.Deploy.0 = Release|x64
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x86.ActiveCfg = Release|x86
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x86.Build.0 = Release|x86
+ {8A4A39C8-E0EF-42B4-B8D9-A73E1209A568}.Release|x86.Deploy.0 = Release|x86
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|ARM.ActiveCfg = Debug|ARM
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|ARM.Build.0 = Debug|ARM
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|ARM64.Build.0 = Debug|ARM64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|x64.ActiveCfg = Debug|x64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|x64.Build.0 = Debug|x64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|x86.ActiveCfg = Debug|Win32
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Debug|x86.Build.0 = Debug|Win32
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|ARM.ActiveCfg = Release|ARM
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|ARM.Build.0 = Release|ARM
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|ARM64.ActiveCfg = Release|ARM64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|ARM64.Build.0 = Release|ARM64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x64.ActiveCfg = Release|x64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x64.Build.0 = Release|x64
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.ActiveCfg = Release|Win32
+ {4BC1F40B-36C2-4BBB-8306-76E490B13BBD}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {00EA47F7-6564-49A1-8CE7-E44A81373CC8}
+ EndGlobalSection
+EndGlobal
From d8ac3dae29876984031a5301e138b1c4638f4747 Mon Sep 17 00:00:00 2001
From: sreadingMSFT <74242768+sreadingMSFT@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:23:29 -0700
Subject: [PATCH 25/53] Microsoft.Management.Deployment.Client buildchange
---
.../CatalogPackage.cpp | 2 +-
.../CatalogPackage.h | 20 -
...ent.CreateCompositePackageCatalogOptions.h | 15 +
.../Client.FindPackagesOptions.h | 15 +
.../Client.InstallOptions.h | 15 +
.../Client.PackageManager.h | 13 +
.../Client.PackageMatchFilter.h | 15 +
.../ConnectResult.cpp | 2 +-
.../ConnectResult.h | 15 -
.../CreateCompositePackageCatalogOptions.cpp | 6 +-
.../CreateCompositePackageCatalogOptions.h | 28 -
.../FindPackagesOptions.cpp | 6 +-
.../FindPackagesOptions.h | 29 -
.../FindPackagesResult.cpp | 2 +-
.../FindPackagesResult.h | 16 -
.../InstallOptions.cpp | 14 +-
.../InstallOptions.h | 43 --
.../InstallResult.cpp | 2 +-
.../InstallResult.h | 17 -
.../MatchResult.cpp | 2 +-
.../MatchResult.h | 15 -
...osoft.Management.Deployment.Client.vcxproj | 32 +-
.../PackageCatalog.cpp | 2 +-
.../PackageCatalog.h | 17 -
.../PackageCatalogInfo.cpp | 2 +-
.../PackageCatalogInfo.h | 20 -
.../PackageCatalogReference.cpp | 2 +-
.../PackageCatalogReference.h | 17 -
.../PackageManager.cpp | 11 +-
.../PackageManager.h | 29 -
.../PackageManager.idl | 541 ------------------
.../PackageMatchFilter.cpp | 6 +-
.../PackageMatchFilter.h | 31 -
.../PackageVersionId.cpp | 2 +-
.../PackageVersionId.h | 16 -
.../PackageVersionInfo.cpp | 6 +-
.../PackageVersionInfo.h | 21 -
.../CatalogPackage.h | 6 +
.../ConnectResult.h | 8 +-
.../CreateCompositePackageCatalogOptions.h | 6 +
.../FindPackagesOptions.h | 6 +
.../FindPackagesResult.h | 5 +
.../InstallOptions.h | 6 +
.../InstallResult.h | 6 +
.../MatchResult.h | 3 +
.../PackageCatalog.h | 7 +-
.../PackageCatalogInfo.h | 6 +
.../PackageCatalogReference.h | 6 +
.../PackageManager.h | 3 +
.../PackageMatchFilter.h | 9 +
.../PackageVersionId.h | 6 +
.../PackageVersionInfo.cpp | 4 +
.../PackageVersionInfo.h | 8 +-
53 files changed, 226 insertions(+), 916 deletions(-)
delete mode 100644 src/Microsoft.Management.Deployment.Client/CatalogPackage.h
create mode 100644 src/Microsoft.Management.Deployment.Client/Client.CreateCompositePackageCatalogOptions.h
create mode 100644 src/Microsoft.Management.Deployment.Client/Client.FindPackagesOptions.h
create mode 100644 src/Microsoft.Management.Deployment.Client/Client.InstallOptions.h
create mode 100644 src/Microsoft.Management.Deployment.Client/Client.PackageManager.h
create mode 100644 src/Microsoft.Management.Deployment.Client/Client.PackageMatchFilter.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/ConnectResult.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/FindPackagesResult.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/InstallOptions.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/InstallResult.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/MatchResult.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageCatalog.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageManager.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageManager.idl
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageVersionId.h
delete mode 100644 src/Microsoft.Management.Deployment.Client/PackageVersionInfo.h
diff --git a/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp b/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp
index b89293c930..8146ef966b 100644
--- a/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp
+++ b/src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "CatalogPackage.h"
+#include
#include "CatalogPackage.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/CatalogPackage.h b/src/Microsoft.Management.Deployment.Client/CatalogPackage.h
deleted file mode 100644
index 79738d946d..0000000000
--- a/src/Microsoft.Management.Deployment.Client/CatalogPackage.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "CatalogPackage.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct CatalogPackage : CatalogPackageT
- {
- CatalogPackage() = default;
-
- hstring Id();
- hstring Name();
- winrt::Microsoft::Management::Deployment::PackageVersionInfo InstalledVersion();
- winrt::Windows::Foundation::Collections::IVectorView AvailableVersions();
- winrt::Microsoft::Management::Deployment::PackageVersionInfo DefaultInstallVersion();
- winrt::Microsoft::Management::Deployment::PackageVersionInfo GetPackageVersionInfo(winrt::Microsoft::Management::Deployment::PackageVersionId const& versionKey);
- bool IsUpdateAvailable();
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/Client.CreateCompositePackageCatalogOptions.h b/src/Microsoft.Management.Deployment.Client/Client.CreateCompositePackageCatalogOptions.h
new file mode 100644
index 0000000000..5d7f687546
--- /dev/null
+++ b/src/Microsoft.Management.Deployment.Client/Client.CreateCompositePackageCatalogOptions.h
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "CreateCompositePackageCatalogOptions.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::factory_implementation
+{
+ struct CreateCompositePackageCatalogOptions : CreateCompositePackageCatalogOptionsT
+ {
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(__uuidof(implementation::CreateCompositePackageCatalogOptions), CLSCTX_ALL);
+ }
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/Client.FindPackagesOptions.h b/src/Microsoft.Management.Deployment.Client/Client.FindPackagesOptions.h
new file mode 100644
index 0000000000..ad032e19da
--- /dev/null
+++ b/src/Microsoft.Management.Deployment.Client/Client.FindPackagesOptions.h
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "FindPackagesOptions.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::factory_implementation
+{
+ struct FindPackagesOptions : FindPackagesOptionsT
+ {
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(__uuidof(implementation::FindPackagesOptions), CLSCTX_ALL);
+ }
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/Client.InstallOptions.h b/src/Microsoft.Management.Deployment.Client/Client.InstallOptions.h
new file mode 100644
index 0000000000..3b36822c35
--- /dev/null
+++ b/src/Microsoft.Management.Deployment.Client/Client.InstallOptions.h
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "InstallOptions.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::factory_implementation
+{
+ struct InstallOptions : InstallOptionsT
+ {
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(__uuidof(implementation::InstallOptions), CLSCTX_ALL);
+ }
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/Client.PackageManager.h b/src/Microsoft.Management.Deployment.Client/Client.PackageManager.h
new file mode 100644
index 0000000000..2fb60f0a39
--- /dev/null
+++ b/src/Microsoft.Management.Deployment.Client/Client.PackageManager.h
@@ -0,0 +1,13 @@
+#pragma once
+#include "PackageManager.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::factory_implementation
+{
+ struct PackageManager : PackageManagerT
+ {
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(__uuidof(implementation::PackageManager), CLSCTX_ALL);
+ }
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/Client.PackageMatchFilter.h b/src/Microsoft.Management.Deployment.Client/Client.PackageMatchFilter.h
new file mode 100644
index 0000000000..c6fb8c536a
--- /dev/null
+++ b/src/Microsoft.Management.Deployment.Client/Client.PackageMatchFilter.h
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "PackageMatchFilter.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::factory_implementation
+{
+ struct PackageMatchFilter : PackageMatchFilterT
+ {
+ auto ActivateInstance() const
+ {
+ return winrt::create_instance(__uuidof(implementation::PackageMatchFilter), CLSCTX_ALL);
+ }
+ };
+}
diff --git a/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp b/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp
index 40dd27204a..68bffbba01 100644
--- a/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp
+++ b/src/Microsoft.Management.Deployment.Client/ConnectResult.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "ConnectResult.h"
+#include
#include "ConnectResult.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/ConnectResult.h b/src/Microsoft.Management.Deployment.Client/ConnectResult.h
deleted file mode 100644
index b0ff6b47e3..0000000000
--- a/src/Microsoft.Management.Deployment.Client/ConnectResult.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "ConnectResult.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct ConnectResult : ConnectResultT
- {
- ConnectResult() = default;
-
- winrt::Microsoft::Management::Deployment::ConnectResultStatus Status();
- winrt::Microsoft::Management::Deployment::PackageCatalog PackageCatalog();
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
index c8f60de369..b7eb360224 100644
--- a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
@@ -1,7 +1,11 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "CreateCompositePackageCatalogOptions.h"
+#pragma warning( push )
+#pragma warning ( disable : 4467 6388)
+#include
+#include
+#pragma warning( pop )
#include "CreateCompositePackageCatalogOptions.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h b/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
deleted file mode 100644
index 1bda0b1f62..0000000000
--- a/src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "CreateCompositePackageCatalogOptions.g.h"
-
-const CLSID CLSID_CreateCompositePackageCatalogOptions = { 0xEE160901, 0xB317, 0x4EA7, { 0x9C, 0xC6, 0x53, 0x55, 0xC6, 0xD7, 0xD8, 0xA7 } }; //EE160901-B317-4EA7-9CC6-5355C6D7D8A7
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct CreateCompositePackageCatalogOptions : CreateCompositePackageCatalogOptionsT
- {
- CreateCompositePackageCatalogOptions() = default;
-
- winrt::Windows::Foundation::Collections::IVector Catalogs();
- winrt::Microsoft::Management::Deployment::CompositeSearchBehavior CompositeSearchBehavior();
- void CompositeSearchBehavior(winrt::Microsoft::Management::Deployment::CompositeSearchBehavior const& value);
- };
-}
-namespace winrt::Microsoft::Management::Deployment::factory_implementation
-{
- struct CreateCompositePackageCatalogOptions : CreateCompositePackageCatalogOptionsT
- {
- auto ActivateInstance() const
- {
- return winrt::create_instance(CLSID_CreateCompositePackageCatalogOptions, CLSCTX_ALL);
- }
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
index 749e98268b..041f8a7491 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
@@ -1,7 +1,11 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "FindPackagesOptions.h"
+#pragma warning( push )
+#pragma warning ( disable : 4467 6388)
+#include
+#include
+#pragma warning( pop )
#include "FindPackagesOptions.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h b/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
deleted file mode 100644
index 854b529b41..0000000000
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "FindPackagesOptions.g.h"
-
-const CLSID CLSID_FindPackagesOptions = { 0x1BD8FF3A, 0xEC50, 0x4F69, { 0xAE, 0xEE, 0xDF, 0x4C, 0x9D, 0x3B, 0xAA, 0x96 } }; //1BD8FF3A-EC50-4F69-AEEE-DF4C9D3BAA96
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct FindPackagesOptions : FindPackagesOptionsT
- {
- FindPackagesOptions() = default;
-
- winrt::Windows::Foundation::Collections::IVector Selectors();
- winrt::Windows::Foundation::Collections::IVector Filters();
- uint32_t ResultLimit();
- void ResultLimit(uint32_t value);
- };
-}
-namespace winrt::Microsoft::Management::Deployment::factory_implementation
-{
- struct FindPackagesOptions : FindPackagesOptionsT
- {
- auto ActivateInstance() const
- {
- return winrt::create_instance(CLSID_FindPackagesOptions, CLSCTX_ALL);
- }
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp b/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp
index 75fc89335f..8a674b87a9 100644
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp
+++ b/src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "FindPackagesResult.h"
+#include
#include "FindPackagesResult.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.h b/src/Microsoft.Management.Deployment.Client/FindPackagesResult.h
deleted file mode 100644
index 83dafaff84..0000000000
--- a/src/Microsoft.Management.Deployment.Client/FindPackagesResult.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "FindPackagesResult.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct FindPackagesResult : FindPackagesResultT
- {
- FindPackagesResult() = default;
-
- winrt::Microsoft::Management::Deployment::FindPackagesResultStatus Status();
- winrt::Windows::Foundation::Collections::IVectorView Matches();
- bool WasLimitExceeded();
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp b/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
index 7ee258963c..e0d18b843c 100644
--- a/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
+++ b/src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
@@ -1,11 +1,19 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "InstallOptions.h"
+#pragma warning( push )
+#pragma warning ( disable : 4467 6388)
+#include
+#include
+#pragma warning( pop )
#include "InstallOptions.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
{
+ InstallOptions::InstallOptions()
+ {
+ throw hresult_not_implemented();
+ }
winrt::Microsoft::Management::Deployment::PackageVersionId InstallOptions::PackageVersionId()
{
throw hresult_not_implemented();
@@ -78,4 +86,8 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
throw hresult_not_implemented();
}
+ winrt::Windows::Foundation::Collections::IVector InstallOptions::AllowedArchitectures()
+ {
+ throw hresult_not_implemented();
+ }
}
diff --git a/src/Microsoft.Management.Deployment.Client/InstallOptions.h b/src/Microsoft.Management.Deployment.Client/InstallOptions.h
deleted file mode 100644
index db97f1b6b9..0000000000
--- a/src/Microsoft.Management.Deployment.Client/InstallOptions.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "InstallOptions.g.h"
-
-const CLSID CLSID_InstallOptions = { 0x44FE0580, 0x62F7, 0x44D4, 0x9E, 0x91, 0xAA, 0x96, 0x14, 0xAB, 0x3E, 0x86 }; //44FE0580-62F7-44D4-9E91-AA9614AB3E86
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct InstallOptions : InstallOptionsT
- {
- InstallOptions() = default;
-
- winrt::Microsoft::Management::Deployment::PackageVersionId PackageVersionId();
- void PackageVersionId(winrt::Microsoft::Management::Deployment::PackageVersionId const& value);
- hstring PreferredInstallLocation();
- void PreferredInstallLocation(hstring const& value);
- winrt::Microsoft::Management::Deployment::PackageInstallScope PackageInstallScope();
- void PackageInstallScope(winrt::Microsoft::Management::Deployment::PackageInstallScope const& value);
- winrt::Microsoft::Management::Deployment::PackageInstallMode PackageInstallMode();
- void PackageInstallMode(winrt::Microsoft::Management::Deployment::PackageInstallMode const& value);
- hstring LogOutputPath();
- void LogOutputPath(hstring const& value);
- bool AllowHashMismatch();
- void AllowHashMismatch(bool value);
- hstring ReplacementInstallerArguments();
- void ReplacementInstallerArguments(hstring const& value);
- hstring CorrelationData();
- void CorrelationData(hstring const& value);
- hstring AdditionalPackageCatalogArguments();
- void AdditionalPackageCatalogArguments(hstring const& value);
- };
-}
-namespace winrt::Microsoft::Management::Deployment::factory_implementation
-{
- struct InstallOptions : InstallOptionsT
- {
- auto ActivateInstance() const
- {
- return winrt::create_instance(CLSID_InstallOptions, CLSCTX_ALL);
- }
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/InstallResult.cpp b/src/Microsoft.Management.Deployment.Client/InstallResult.cpp
index 162a0d63ba..18b06b4e5c 100644
--- a/src/Microsoft.Management.Deployment.Client/InstallResult.cpp
+++ b/src/Microsoft.Management.Deployment.Client/InstallResult.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "InstallResult.h"
+#include
#include "InstallResult.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/InstallResult.h b/src/Microsoft.Management.Deployment.Client/InstallResult.h
deleted file mode 100644
index 4086db3e7e..0000000000
--- a/src/Microsoft.Management.Deployment.Client/InstallResult.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "InstallResult.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct InstallResult : InstallResultT
- {
- InstallResult() = default;
-
- hstring CorrelationData();
- bool RebootRequired();
- winrt::Microsoft::Management::Deployment::InstallResultStatus Status();
- winrt::hresult ExtendedErrorCode();
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/MatchResult.cpp b/src/Microsoft.Management.Deployment.Client/MatchResult.cpp
index 2487823282..cf514c00c9 100644
--- a/src/Microsoft.Management.Deployment.Client/MatchResult.cpp
+++ b/src/Microsoft.Management.Deployment.Client/MatchResult.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "MatchResult.h"
+#include
#include "MatchResult.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/MatchResult.h b/src/Microsoft.Management.Deployment.Client/MatchResult.h
deleted file mode 100644
index a7fd68f9b3..0000000000
--- a/src/Microsoft.Management.Deployment.Client/MatchResult.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "MatchResult.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct MatchResult : MatchResultT
- {
- MatchResult() = default;
-
- winrt::Microsoft::Management::Deployment::CatalogPackage CatalogPackage();
- winrt::Microsoft::Management::Deployment::PackageMatchFilter MatchCriteria();
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
index 041a2524de..9edd61d1ca 100644
--- a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
+++ b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj
@@ -83,7 +83,7 @@
- $(VC_IncludePath);$(WindowsSDK_IncludePath);
+ ..\Microsoft.Management.Deployment;$(VC_IncludePath);$(WindowsSDK_IncludePath);
$(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(PlatformTarget)\$(Configuration)\
$(RootNamespace)
@@ -102,7 +102,7 @@
/DWINRT_NO_MAKE_DETECTION %(AdditionalOptions)
- _WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)
+ INCLUDE_ONLY_INTERFACE_METHODS;_WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)
$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)
@@ -126,24 +126,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PackageManager.idl
-
+
+
+
+
+
@@ -163,13 +151,11 @@
Create
-
- PackageManager.idl
-
+
-
+
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp b/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp
index 948a159d40..aa7adf22d1 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalog.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "PackageCatalog.h"
+#include
#include "PackageCatalog.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalog.h b/src/Microsoft.Management.Deployment.Client/PackageCatalog.h
deleted file mode 100644
index 648d6ca7a1..0000000000
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalog.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageCatalog.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageCatalog : PackageCatalogT
- {
- PackageCatalog() = default;
-
- bool IsComposite();
- winrt::Microsoft::Management::Deployment::PackageCatalogInfo Info();
- winrt::Windows::Foundation::IAsyncOperation FindPackagesAsync(winrt::Microsoft::Management::Deployment::FindPackagesOptions options);
- winrt::Microsoft::Management::Deployment::FindPackagesResult FindPackages(winrt::Microsoft::Management::Deployment::FindPackagesOptions const& options);
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp b/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp
index 56b197726b..11beb2415b 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "PackageCatalogInfo.h"
+#include
#include "PackageCatalogInfo.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.h b/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.h
deleted file mode 100644
index b400143ae6..0000000000
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalogInfo.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageCatalogInfo.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageCatalogInfo : PackageCatalogInfoT
- {
- PackageCatalogInfo() = default;
-
- hstring Id();
- hstring Name();
- hstring Type();
- hstring Argument();
- winrt::Windows::Foundation::DateTime LastUpdateTime();
- winrt::Microsoft::Management::Deployment::PackageCatalogOrigin Origin();
- winrt::Microsoft::Management::Deployment::PackageCatalogTrustLevel TrustLevel();
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp b/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp
index 3fe12edd6d..62447e1ca9 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "PackageCatalogReference.h"
+#include
#include "PackageCatalogReference.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h b/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h
deleted file mode 100644
index 2c76518841..0000000000
--- a/src/Microsoft.Management.Deployment.Client/PackageCatalogReference.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageCatalogReference.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageCatalogReference : PackageCatalogReferenceT
- {
- PackageCatalogReference() = default;
-
- bool IsComposite();
- winrt::Microsoft::Management::Deployment::PackageCatalogInfo Info();
- winrt::Windows::Foundation::IAsyncOperation ConnectAsync();
- winrt::Microsoft::Management::Deployment::ConnectResult Connect();
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.cpp b/src/Microsoft.Management.Deployment.Client/PackageManager.cpp
index d7b816db96..e70a45d444 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageManager.cpp
@@ -1,5 +1,9 @@
#include "pch.h"
-#include "PackageManager.h"
+#pragma warning( push )
+#pragma warning ( disable : 4467 6388)
+#include
+#include
+#pragma warning( pop )
#include "PackageManager.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
@@ -28,4 +32,9 @@ namespace winrt::Microsoft::Management::Deployment::implementation
{
throw hresult_not_implemented();
}
+ winrt::Windows::Foundation::IAsyncOperationWithProgress PackageManager::GetInstallProgress(winrt::Microsoft::Management::Deployment::CatalogPackage package, winrt::Microsoft::Management::Deployment::PackageCatalogInfo catalogInfo)
+ {
+ throw hresult_not_implemented();
+ }
+
}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.h b/src/Microsoft.Management.Deployment.Client/PackageManager.h
deleted file mode 100644
index 51c9c69211..0000000000
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-#include "PackageManager.g.h"
-
-const CLSID CLSID_PackageManager = { 0x74CB3139, 0xB7C5, 0x4B9E, { 0x93, 0x88, 0xE6, 0x61, 0x6D, 0xEA, 0x28, 0x8C } }; //74CB3139-B7C5-4B9E-9388-E6616DEA288C
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageManager : PackageManagerT
- {
- PackageManager() = default;
-
- winrt::Windows::Foundation::Collections::IVectorView GetPackageCatalogs();
- winrt::Microsoft::Management::Deployment::PackageCatalogReference GetPredefinedPackageCatalog(winrt::Microsoft::Management::Deployment::PredefinedPackageCatalog const& predefinedPackageCatalog);
- winrt::Microsoft::Management::Deployment::PackageCatalogReference GetLocalPackageCatalog(winrt::Microsoft::Management::Deployment::LocalPackageCatalog const& localPackageCatalog);
- winrt::Microsoft::Management::Deployment::PackageCatalogReference GetPackageCatalogByName(hstring const& catalogName);
- winrt::Microsoft::Management::Deployment::PackageCatalogReference CreateCompositePackageCatalog(winrt::Microsoft::Management::Deployment::CreateCompositePackageCatalogOptions const& options);
- winrt::Windows::Foundation::IAsyncOperationWithProgress InstallPackageAsync(winrt::Microsoft::Management::Deployment::CatalogPackage package, winrt::Microsoft::Management::Deployment::InstallOptions options);
- };
-}
-namespace winrt::Microsoft::Management::Deployment::factory_implementation
-{
- struct PackageManager : PackageManagerT
- {
- auto ActivateInstance() const
- {
- return winrt::create_instance(CLSID_PackageManager, CLSCTX_ALL);
- }
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageManager.idl b/src/Microsoft.Management.Deployment.Client/PackageManager.idl
deleted file mode 100644
index 2b85fce4b6..0000000000
--- a/src/Microsoft.Management.Deployment.Client/PackageManager.idl
+++ /dev/null
@@ -1,541 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-namespace Microsoft.Management.Deployment
-{
- [contractversion(1)]
- apicontract WindowsPackageManagerContract{};
-
- /// State of the install.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageInstallProgressState
- {
- /// The install is queued but not yet active. Cancellation of the IAsyncOperationWithProgress in this
- /// state will prevent the package from downloading or installing.
- Queued,
- /// The installer is downloading. Cancellation of the IAsyncOperationWithProgress in this state will
- /// end the download and prevent the package from installing.
- Downloading,
- /// The install is in progress. Cancellation of the IAsyncOperationWithProgress in this state will not
- /// stop the installation or the post install cleanup.
- Installing,
- /// The installer has completed and cleanup actions are in progress. Cancellation of the
- /// IAsyncOperationWithProgress in this state will not stop cleanup or roll back the install.
- PostInstall,
- /// The operation has completed.
- Finished,
- };
-
- /// Progress object for the install
- /// DESIGN NOTE: percentage for the install as a whole is purposefully not included as there is no way to
- /// estimate progress when the installer is running.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- struct InstallProgress
- {
- /// State of the install
- PackageInstallProgressState State;
- /// DESIGN NOTE: BytesDownloaded may only be available for downloads done by Windows Package Manager itself.
- /// Number of bytes downloaded if known
- UInt64 BytesDownloaded;
- /// DESIGN NOTE: BytesRequired may only be available for downloads done by Windows Package Manager itself.
- /// Number of bytes required if known
- UInt64 BytesRequired;
- /// Download percentage completed
- Double DownloadProgress;
- /// Install percentage if known.
- Double InstallationProgress;
- };
-
- /// Status of the Install call
- /// Implementation Note: Errors mapped from AppInstallerErrors.h
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum InstallResultStatus
- {
- Ok,
- BlockedByPolicy,
- CatalogError,
- InternalError,
- InvalidOptions,
- DownloadError,
- InstallError,
- ManifestError,
- NoApplicableInstallers,
- };
-
- /// Result of the install
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass InstallResult
- {
- /// Used by a caller to correlate the install with a caller's data.
- String CorrelationData{ get; };
- /// Whether a restart is required to complete the install.
- Boolean RebootRequired{ get; };
-
- /// Batched error code, example APPINSTALLER_CLI_ERROR_SHELLEXEC_INSTALL_FAILED
- InstallResultStatus Status{ get; };
- /// Specific error if known, from downloader or installer itself, example ERROR_INSTALL_PACKAGE_REJECTED
- HRESULT ExtendedErrorCode{ get; };
- }
-
- /// IMPLEMENTATION NOTE: SourceOrigin from AppInstallerRepositorySource.h
- /// Defines the origin of the package catalog details.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageCatalogOrigin
- {
- /// Predefined means it came as part of the Windows Package Manager package and cannot be removed.
- Predefined,
- /// User means it was added by the user and could be removed.
- User,
- };
-
- /// IMPLEMENTATION NOTE: SourceTrustLevel from AppInstallerRepositorySource.h
- /// Defines the trust level of the package catalog.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageCatalogTrustLevel
- {
- None,
- Trusted,
- };
-
- /// IMPLEMENTATION NOTE: SourceDetails from AppInstallerRepositorySource.h
- /// Interface for retrieving information about an package catalog without acting on it.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass PackageCatalogInfo
- {
- /// The package catalog's unique identifier.
- /// SAMPLE VALUES: For OpenWindowsCatalog "Microsoft.Winget.Source_8wekyb3d8bbwe"
- /// For contoso sample on msdn "contoso"
- String Id { get; };
- /// The name of the package catalog.
- /// SAMPLE VALUES: For OpenWindowsCatalog "winget".
- /// For contoso sample on msdn "contoso"
- String Name { get; };
- /// The type of the package catalog.
- /// ALLOWED VALUES: "Microsoft.Rest", "Microsoft.PreIndexed.Package"
- /// SAMPLE VALUES: For OpenWindowsCatalog "Microsoft.PreIndexed.Package".
- /// For contoso sample on msdn "Microsoft.PreIndexed.Package"
- String Type { get; };
- /// The argument used when adding the package catalog.
- /// SAMPLE VALUES: For OpenWindowsCatalog "https://winget.azureedge.net/cache"
- /// For contoso sample on msdn "https://pkgmgr-int.azureedge.net/cache"
- String Argument { get; };
- /// The last time that this package catalog was updated.
- Windows.Foundation.DateTime LastUpdateTime { get; };
- /// The origin of the package catalog.
- PackageCatalogOrigin Origin { get; };
- /// The trust level of the package catalog
- PackageCatalogTrustLevel TrustLevel { get; };
- }
-
- /// A metadata item of a package version.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageVersionMetadataField
- {
- /// The InstallerType of an installed package
- InstallerType,
- /// The Scope of an installed package
- InstalledScope,
- /// The system path where the package is installed
- InstalledLocation,
- /// The standard uninstall command; which may be interactive
- StandardUninstallCommand,
- /// An uninstall command that should be non-interactive
- SilentUninstallCommand,
- /// The publisher of the package
- PublisherDisplayName,
- };
-
- /// IMPLEMENTATION NOTE: IPackageVersion from AppInstallerRepositorySearch.h
- /// A single package version.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass PackageVersionInfo
- {
- /// IMPLEMENTATION NOTE: PackageVersionMetadata fields from AppInstallerRepositorySearch.h
- /// Gets any metadata associated with this package version.
- /// Primarily stores data on installed packages.
- /// Metadata fields may have no value (e.g. packages that aren't installed will not have an InstalledLocation).
- String GetMetadata(PackageVersionMetadataField metadataField);
- /// IMPLEMENTATION NOTE: PackageVersionProperty fields from AppInstallerRepositorySearch.h
- String Id { get; };
- String DisplayName { get; };
- String Version { get; };
- String Channel { get; };
- /// DESIGN NOTE: RelativePath from AppInstallerRepositorySearch.h is excluded as not needed.
- /// String RelativePath;
-
- /// IMPLEMENTATION NOTE: PackageVersionMultiProperty fields from AppInstallerRepositorySearch.h
- /// PackageFamilyName and ProductCode can have multiple values.
- Windows.Foundation.Collections.IVectorView PackageFamilyNames { get; };
- Windows.Foundation.Collections.IVectorView ProductCodes { get; };
-
- /// Gets the package catalog where this package version is from.
- PackageCatalog PackageCatalog { get; };
-
- /// DESIGN NOTE:
- /// GetManifest from IPackageVersion in AppInstallerRepositorySearch is not implemented in V1. That class has
- /// a lot of fields and no one requesting it.
- /// Gets the manifest of this package version.
- /// virtual Manifest::Manifest GetManifest() = 0;
- }
-
- /// IMPLEMENTATION NOTE: PackageVersionKey from AppInstallerRepositorySearch.h
- /// A key to identify a package version within a package.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass PackageVersionId
- {
- /// The package catalog id that this version came from.
- String PackageCatalogId { get; };
- /// The version.
- String Version { get; };
- /// The channel.
- String Channel { get; };
- };
-
- /// IMPLEMENTATION NOTE: IPackage from AppInstallerRepositorySearch.h
- /// A package, potentially containing information about it's local state and the available versions.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass CatalogPackage
- {
- /// IMPLEMENTATION NOTE: PackageProperty fields from AppInstallerRepositorySearch.h
- /// Gets a property of this package.
- String Id { get; };
- String Name { get; };
-
- /// Gets the installed package information if the package is installed.
- PackageVersionInfo InstalledVersion{ get; };
-
- /// Gets all available versions of this package. Ordering is not guaranteed.
- Windows.Foundation.Collections.IVectorView AvailableVersions { get; };
-
- /// Gets the version of this package that will be installed if version is not set in InstallOptions.
- PackageVersionInfo DefaultInstallVersion { get; };
-
- /// Gets a specific version of this package.
- PackageVersionInfo GetPackageVersionInfo(PackageVersionId versionKey);
-
- /// Gets a value indicating whether an available version is newer than the installed version.
- Boolean IsUpdateAvailable { get; };
-
- /// DESIGN NOTE:
- /// IsSame from IPackage in AppInstallerRepositorySearch is not implemented in V1.
- /// Determines if the given IPackage refers to the same package as this one.
- /// virtual bool IsSame(const IPackage*) const = 0;
- }
-
- /// IMPLEMENTATION NOTE: CompositeSearchBehavior from AppInstallerRepositorySource.h
- /// Search behavior for composite catalogs.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum CompositeSearchBehavior
- {
- /// Search local catalogs only
- LocalCatalogs,
- /// Search remote catalogs only, don't check local catalogs for InstalledVersion
- RemotePackagesFromRemoteCatalogs,
- /// Search remote catalogs, and check local catalogs for InstalledVersion
- RemotePackagesFromAllCatalogs,
- /// Search both local and remote catalogs.
- AllCatalogs,
- };
-
- /// IMPLEMENTATION NOTE: PackageFieldMatchOption from AppInstallerRepositorySearch.h
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageFieldMatchOption
- {
- Equals,
- EqualsCaseInsensitive,
- StartsWithCaseInsensitive,
- ContainsCaseInsensitive,
- };
-
- /// IMPLEMENTATION NOTE: PackageFieldMatchOption from AppInstallerRepositorySearch.h
- /// The field to match on.
- /// The values must be declared in order of preference in search results.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageMatchField
- {
- CatalogDefault,
- Id,
- Name,
- Moniker,
- Command,
- Tag,
- /// DESIGN NOTE: The following PackageFieldMatchOption from AppInstallerRepositorySearch.h are not implemented in V1.
- /// PackageFamilyName,
- /// ProductCode,
- /// NormalizedNameAndPublisher,
- };
-
- /// IMPLEMENTATION NOTE: PackageMatchFilter from AppInstallerRepositorySearch.h
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass PackageMatchFilter
- {
- PackageMatchFilter();
- /// The type of string comparison for matching
- PackageFieldMatchOption Option;
- /// The field to search
- PackageMatchField Field;
- /// The value to match
- String Value;
- /// DESIGN NOTE: "Additional" from RequestMatch AppInstallerRepositorySearch.h is not implemented here.
- }
-
- /// IMPLEMENTATION NOTE: MatchResult from AppInstallerRepositorySearch.h
- /// A single result from the search.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass MatchResult
- {
- /// The package found by the search request.
- CatalogPackage CatalogPackage { get; };
-
- /// The highest order field on which the package matched the search.
- PackageMatchFilter MatchCriteria { get; };
- }
-
- /// Status of the FindPackages call
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum FindPackagesResultStatus
- {
- Ok,
- BlockedByPolicy,
- CatalogError,
- InternalError,
- InvalidOptions
- };
-
- /// IMPLEMENTATION NOTE: SearchResult from AppInstallerRepositorySearch.h
- /// Search result data returned from FindPackages
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass FindPackagesResult
- {
- /// Error codes
- FindPackagesResultStatus Status{ get; };
-
- /// The full set of results from the search.
- Windows.Foundation.Collections.IVectorView Matches { get; };
-
- /// If true, the results were truncated by the given ResultLimit
- /// USAGE NOTE: Windows Package Manager does not support result pagination, there is no way to continue
- /// getting more results.
- Boolean WasLimitExceeded{ get; };
- }
-
- /// Options for FindPackages
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass FindPackagesOptions
- {
- FindPackagesOptions();
-
- /// DESIGN NOTE:
- /// This class maps to SearchRequest from AppInstallerRepositorySearch.h
- /// That class is a container for data used to filter the available manifests in an package catalog.
- /// Its properties can be thought of as:
- /// (Query || Inclusions...) && Filters...
- /// If Query and Inclusions are both empty, the starting data set will be the entire database.
- /// Everything && Filters...
- /// That has been translated in this api so that
- /// Inclusions are Selectors below
- /// Filters are Filters below
- /// Query is PackageFieldMatchOption::PackageCatalogDefined and in the Selector list.
- /// USAGE NOTE: Only one selector with PackageFieldMatchOption::PackageCatalogDefined is allowed.
-
- /// Selectors = you have to match at least one selector (if there are no selectors, then nothing is selected)
- Windows.Foundation.Collections.IVector Selectors { get; };
- /// Filters = you have to match all filters(if there are no filters, then there is no filtering of selected items)
- Windows.Foundation.Collections.IVector Filters{ get; };
-
- /// Restricts the length of the returned results to the specified count.
- UInt32 ResultLimit;
- }
-
- /// IMPLEMENTATION NOTE: ISource from AppInstallerRepositorySource.h
- /// A catalog for searching for packages
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass PackageCatalog
- {
- /// Gets a value indicating whether this package catalog is a composite of other package catalogs,
- /// and thus the packages may come from disparate package catalogs as well.
- Boolean IsComposite { get; };
- /// The details of the package catalog if it is not a composite.
- PackageCatalogInfo Info { get; };
-
- /// Searches for Packages in the catalog.
- Windows.Foundation.IAsyncOperation FindPackagesAsync(FindPackagesOptions options);
- FindPackagesResult FindPackages(FindPackagesOptions options);
- }
-
- /// Status of the Connect call
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum ConnectResultStatus
- {
- Ok,
- CatalogError,
- };
-
- /// Result of the Connect call
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass ConnectResult
- {
- /// Error codes
- ConnectResultStatus Status{ get; };
-
- PackageCatalog PackageCatalog { get; };
- }
-
- /// A reference to a catalog that callers can try to Connect.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass PackageCatalogReference
- {
- /// Gets a value indicating whether this package catalog is a composite of other package catalogs,
- /// and thus the packages may come from disparate package catalogs as well.
- Boolean IsComposite { get; };
- /// The details of the package catalog if it is not a composite.
- PackageCatalogInfo Info { get; };
-
- /// Opens a catalog. Required before searching. For remote catalogs (i.e. not Installed and Installing) this
- /// may require downloading information from a server.
- Windows.Foundation.IAsyncOperation ConnectAsync();
- ConnectResult Connect();
- }
-
- /// Catalogs with PackageCatalogOrigin Predefined
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PredefinedPackageCatalog
- {
- OpenWindowsCatalog,
- MicrosoftStore,
- };
-
- /// Local Catalogs with PackageCatalogOrigin Predefined
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum LocalPackageCatalog
- {
- InstalledPackages,
- };
-
- /// Options for creating a composite catalog.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass CreateCompositePackageCatalogOptions
- {
- CreateCompositePackageCatalogOptions();
-
- /// Create a composite catalog to allow searching a user defined or pre defined source
- /// and a local source (Installed packages) together
- IVector Catalogs { get; };
- /// Sets the default search behavior if the catalog is a composite catalog.
- CompositeSearchBehavior CompositeSearchBehavior;
- }
-
- /// Required install scope for the package. If the package does not have an installer that
- /// supports the specified scope the Install call will fail with InstallResultStatus.NoApplicableInstallers
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageInstallScope
- {
- /// An installer with any install scope is valid.
- Any,
- /// Only User install scope installers are valid
- User,
- /// Only System installers will be valid
- System,
- };
-
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- enum PackageInstallMode
- {
- /// The default experience for the installer. Installer may show some UI.
- Default,
- /// Runs the installer in silent mode. This suppresses the installer's UI to the extent
- /// possible (installer may still show some required UI).
- Silent,
- /// Runs the installer in interactive mode.
- Interactive,
- };
-
- /// Options when installing a package.
- /// Intended to allow full compatibility with the "winget install" command line interface.
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass InstallOptions
- {
- InstallOptions();
-
- /// Optionally specifies the version from the package to install. If unspecified the version matching
- /// CatalogPackage.GetLatestVersion() is used.
- PackageVersionId PackageVersionId;
-
- /// Specifies alternate location to install package (if supported).
- String PreferredInstallLocation;
- /// User or Machine.
- PackageInstallScope PackageInstallScope;
- /// Silent, Interactive, or Default
- PackageInstallMode PackageInstallMode;
- /// Directs the logging to a log file. If provided, the installer must have have write access to the file
- String LogOutputPath;
- /// Continues the install even if the hash in the catalog does not match the linked installer.
- Boolean AllowHashMismatch;
- /// A string that will be passed to the installer.
- /// IMPLEMENTATION NOTE: maps to "--override" in the winget cmd line
- String ReplacementInstallerArguments;
-
- /// Used by a caller to correlate the install with a caller's data.
- /// The string must be JSON encoded.
- String CorrelationData;
- /// A string that will be passed to the source server if using a REST source
- String AdditionalPackageCatalogArguments;
- }
-
- [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 1)]
- runtimeclass PackageManager
- {
- PackageManager();
-
- /// Get the available catalogs. Each source will have a separate catalog.
- /// This does not open the catalog. These catalogs can be used individually or merged with CreateCompositePackageCatalogAsync.
- /// IMPLEMENTATION NOTE: This is a list of sources returned by Windows Package Manager source list
- Windows.Foundation.Collections.IVectorView GetPackageCatalogs();
- /// Get a built in catalog
- PackageCatalogReference GetPredefinedPackageCatalog(PredefinedPackageCatalog predefinedPackageCatalog);
- /// Get a built in catalog
- PackageCatalogReference GetLocalPackageCatalog(LocalPackageCatalog localPackageCatalog);
- /// Get a catalog by a known name
- PackageCatalogReference GetPackageCatalogByName(String catalogName);
- /// Get a composite catalog to allow searching a user defined or pre defined source and a local source
- /// (Installing, Installed) together at the same time.
- PackageCatalogReference CreateCompositePackageCatalog(CreateCompositePackageCatalogOptions options);
-
- /// Install the specified package
- Windows.Foundation.IAsyncOperationWithProgress InstallPackageAsync(CatalogPackage package, InstallOptions options);
- }
-
- /// Force midl3 to generate vector marshalling info.
- declare
- {
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- interface Windows.Foundation.Collections.IVector;
- interface Windows.Foundation.Collections.IVectorView;
- }
-}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp
index 028270abd2..686357322f 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.cpp
@@ -1,7 +1,11 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "PackageMatchFilter.h"
+#pragma warning( push )
+#pragma warning ( disable : 4467 6388)
+#include
+#include
+#pragma warning( pop )
#include "PackageMatchFilter.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h b/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
deleted file mode 100644
index 483afc1766..0000000000
--- a/src/Microsoft.Management.Deployment.Client/PackageMatchFilter.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageMatchFilter.g.h"
-
-const CLSID CLSID_PackageMatchFilter = { 0x3F85B9F4, 0x487A, 0x4C48, { 0x90, 0x35, 0x29, 0x03, 0xF8, 0xA6, 0xD9, 0xE8 } }; //3F85B9F4-487A-4C48-9035-2903F8A6D9E8
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageMatchFilter : PackageMatchFilterT
- {
- PackageMatchFilter() = default;
-
- winrt::Microsoft::Management::Deployment::PackageFieldMatchOption Option();
- void Option(winrt::Microsoft::Management::Deployment::PackageFieldMatchOption const& value);
- winrt::Microsoft::Management::Deployment::PackageMatchField Field();
- void Field(winrt::Microsoft::Management::Deployment::PackageMatchField const& value);
- hstring Value();
- void Value(hstring const& value);
- };
-}
-namespace winrt::Microsoft::Management::Deployment::factory_implementation
-{
- struct PackageMatchFilter : PackageMatchFilterT
- {
- auto ActivateInstance() const
- {
- return winrt::create_instance(CLSID_PackageMatchFilter, CLSCTX_ALL);
- }
- };
-}
diff --git a/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp b/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp
index e5e3f8708d..ce887cfe29 100644
--- a/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp
+++ b/src/Microsoft.Management.Deployment.Client/PackageVersionId.cpp
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
-#include "PackageVersionId.h"
+#include
#include "PackageVersionId.g.cpp"
namespace winrt::Microsoft::Management::Deployment::implementation
diff --git a/src/Microsoft.Management.Deployment.Client/PackageVersionId.h b/src/Microsoft.Management.Deployment.Client/PackageVersionId.h
deleted file mode 100644
index 57518126a0..0000000000
--- a/src/Microsoft.Management.Deployment.Client/PackageVersionId.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-#include "PackageVersionId.g.h"
-
-namespace winrt::Microsoft::Management::Deployment::implementation
-{
- struct PackageVersionId : PackageVersionIdT