More PackageManager (#3881)

* Added AddPackageSetOptions. Added tests for AddPackageSetAsync. Fixed bugs * Fixed typos. Added missing AddPackageAsync in .idl * Remove dead code * Update Transport package's manifested inproc servers
microsoft · Sep 26, 2023 · 51c0e77 · 51c0e77
1 parent 9753774
commit 51c0e77
Show file tree

Hide file tree

Showing 11 changed files with 828 additions and 87 deletions.
diff --git a/build/NuSpecs/AppxManifest.xml b/build/NuSpecs/AppxManifest.xml
@@ -64,6 +64,7 @@
 
           <!-- Deployment -->
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.AddPackageOptions" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.AddPackageSetOptions" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.EnsureIsReadyOptions" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.FindPackageOptions" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageDeploymentManager" ThreadingModel="both" />
@@ -72,9 +73,10 @@
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageRuntimeManager" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageSet" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageSetItem" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageSetItemRuntimeDisposition" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageSetManager" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageSetRuntimeDisposition" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageVolume" ThreadingModel="both" />
-          <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageVolume;" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageVolumeManager" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.PackageVolumeStatus" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.Management.Deployment.RegisterPackageOptions" ThreadingModel="both" />

diff --git a/dev/PackageManager/API/M.W.M.D.AddPackageSetOptions.cpp b/dev/PackageManager/API/M.W.M.D.AddPackageSetOptions.cpp
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation and Contributors.
+// Licensed under the MIT License.
+
+#include "pch.h"
+
+#include "M.W.M.D.AddPackageSetOptions.h"
+#include "Microsoft.Windows.Management.Deployment.AddPackageSetOptions.g.cpp"
+
+namespace winrt::Microsoft::Windows::Management::Deployment::implementation
+{
+    winrt::Microsoft::Windows::Management::Deployment::DeploymentProcessingModel AddPackageSetOptions::DeploymentProcessingModel()
+    {
+        return m_deploymentProcessingModel;
+    }
+    void AddPackageSetOptions::DeploymentProcessingModel(winrt::Microsoft::Windows::Management::Deployment::DeploymentProcessingModel const& value)
+    {
+        m_deploymentProcessingModel = value;
+    }
+    winrt::Microsoft::Windows::Management::Deployment::DeploymentPriority AddPackageSetOptions::DeploymentPriority()
+    {
+        return m_deploymentPriority;
+    }
+    void AddPackageSetOptions::DeploymentPriority(winrt::Microsoft::Windows::Management::Deployment::DeploymentPriority const& value)
+    {
+        m_deploymentPriority = value;
+    }
+    winrt::Microsoft::Windows::Management::Deployment::AddPackageOptions AddPackageSetOptions::AddPackageOptions()
+    {
+        return m_addPackageOptions;
+    }
+    void AddPackageSetOptions::AddPackageOptions(winrt::Microsoft::Windows::Management::Deployment::AddPackageOptions const& value)
+    {
+        m_addPackageOptions = value;
+    }
+}
diff --git a/dev/PackageManager/API/M.W.M.D.AddPackageSetOptions.h b/dev/PackageManager/API/M.W.M.D.AddPackageSetOptions.h
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation and Contributors.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "Microsoft.Windows.Management.Deployment.AddPackageSetOptions.g.h"
+
+namespace winrt::Microsoft::Windows::Management::Deployment::implementation
+{
+    struct AddPackageSetOptions : AddPackageSetOptionsT<AddPackageSetOptions>
+    {
+        AddPackageSetOptions() = default;
+
+        winrt::Microsoft::Windows::Management::Deployment::DeploymentProcessingModel DeploymentProcessingModel();
+        void DeploymentProcessingModel(winrt::Microsoft::Windows::Management::Deployment::DeploymentProcessingModel const& value);
+        winrt::Microsoft::Windows::Management::Deployment::DeploymentPriority DeploymentPriority();
+        void DeploymentPriority(winrt::Microsoft::Windows::Management::Deployment::DeploymentPriority const& value);
+        winrt::Microsoft::Windows::Management::Deployment::AddPackageOptions AddPackageOptions();
+        void AddPackageOptions(winrt::Microsoft::Windows::Management::Deployment::AddPackageOptions const& value);
+
+    private:
+        winrt::Microsoft::Windows::Management::Deployment::DeploymentProcessingModel m_deploymentProcessingModel{};
+        winrt::Microsoft::Windows::Management::Deployment::DeploymentPriority m_deploymentPriority{ winrt::Microsoft::Windows::Management::Deployment::DeploymentPriority::Normal };
+        winrt::Microsoft::Windows::Management::Deployment::AddPackageOptions m_addPackageOptions{};
+    };
+}
+namespace winrt::Microsoft::Windows::Management::Deployment::factory_implementation
+{
+    struct AddPackageSetOptions : AddPackageSetOptionsT<AddPackageSetOptions, implementation::AddPackageSetOptions>
+    {
+    };
+}