Add COM for EditPackageCatalog

dkbennett · dkbennett · commit 659be671cc8f · 2025-12-10T10:19:12.000-08:00
diff --git a/src/AppInstallerCLICore/Commands/SourceCommand.h b/src/AppInstallerCLICore/Commands/SourceCommand.h
@@ -124,7 +124,7 @@ namespace AppInstaller::CLI
 
     struct SourceEditCommand final : public Command
     {
-        SourceEditCommand(std::string_view parent) : Command("edit", { "config" }, parent, Settings::ExperimentalFeature::Feature::SourceEdit) {}
+        SourceEditCommand(std::string_view parent) : Command("edit", { "config", "set" }, parent, Settings::ExperimentalFeature::Feature::SourceEdit) {}
 
         std::vector<Argument> GetArguments() const override;
 
diff --git a/src/AppInstallerCLIE2ETests/Interop/PackageCatalogInterop.cs b/src/AppInstallerCLIE2ETests/Interop/PackageCatalogInterop.cs
@@ -254,6 +254,63 @@ public async Task RemoveNonExistingPackageCatalog()
             await this.RemoveAndValidatePackageCatalogAsync(removePackageCatalogOptions, RemovePackageCatalogStatus.InvalidOptions, Constants.ErrorCode.ERROR_SOURCE_NAME_DOES_NOT_EXIST);
         }
 
+        /// <summary>
+        /// Edit package catalog with invalid options.
+        /// </summary>
+        [Test]
+        public void EditPackageCatalogWithInvalidOptions()
+        {
+            // Edit package catalog with null options.
+            Assert.Throws<NullReferenceException>(() => this.packageManager.EditPackageCatalog(null));
+
+            // Edit package catalog with empty options.
+            Assert.Throws<ArgumentException>(() => this.packageManager.EditPackageCatalog(this.TestFactory.CreateEditPackageCatalogOptions()));
+        }
+
+        /// <summary>
+        /// Edit a package catalog that is not present.
+        /// </summary>
+        [Test]
+        public void EditNonExistingPackageCatalog()
+        {
+            EditPackageCatalogOptions editPackageCatalogOptions = this.TestFactory.CreateEditPackageCatalogOptions();
+            editPackageCatalogOptions.Name = Constants.TestSourceName;
+
+            this.EditAndValidatePackageCatalog(editPackageCatalogOptions, EditPackageCatalogStatus.InvalidOptions, Constants.ErrorCode.ERROR_SOURCE_NAME_DOES_NOT_EXIST);
+        }
+
+        /// <summary>
+        /// Edit a package catalog that is not present.
+        /// </summary>
+        /// <returns>representing the asynchronous unit test.</returns>
+        [Test]
+        public async Task AddEditRemovePackageCatalog()
+        {
+            // Add
+            AddPackageCatalogOptions options = this.TestFactory.CreateAddPackageCatalogOptions();
+            options.SourceUri = Constants.TestSourceUrl;
+            options.Name = Constants.TestSourceName;
+            options.TrustLevel = PackageCatalogTrustLevel.Trusted;
+
+            await this.AddAndValidatePackageCatalogAsync(options, AddPackageCatalogStatus.Ok);
+
+            // Edit
+            EditPackageCatalogOptions editOptions = this.TestFactory.CreateEditPackageCatalogOptions();
+            editOptions.Name = Constants.TestSourceName;
+            editOptions.Explicit = "false";
+            this.EditAndValidatePackageCatalog(editOptions, EditPackageCatalogStatus.Ok);
+
+            // Remove
+            RemovePackageCatalogOptions removePackageCatalogOptions = this.TestFactory.CreateRemovePackageCatalogOptions();
+            removePackageCatalogOptions.Name = Constants.TestSourceName;
+            var removeCatalogResult = await this.packageManager.RemovePackageCatalogAsync(removePackageCatalogOptions);
+            Assert.IsNotNull(removeCatalogResult);
+            Assert.AreEqual(RemovePackageCatalogStatus.Ok, removeCatalogResult.Status);
+
+            var testSource = this.packageManager.GetPackageCatalogByName(Constants.TestSourceName);
+            Assert.IsNull(testSource);
+        }
+
         /// <summary>
         /// Test class Tear down.
         /// </summary>
@@ -324,5 +381,22 @@ private async Task RemoveAndValidatePackageCatalogAsync(RemovePackageCatalogOpti
             var packageCatalog = this.packageManager.GetPackageCatalogByName(removePackageCatalogOptions.Name);
             Assert.IsNull(packageCatalog);
         }
+
+        private void EditAndValidatePackageCatalog(EditPackageCatalogOptions editPackageCatalogOptions, EditPackageCatalogStatus expectedStatus, int expectedErrorCode = 0)
+        {
+            var editCatalogResult = this.packageManager.EditPackageCatalog(editPackageCatalogOptions);
+            Assert.IsNotNull(editCatalogResult);
+            Assert.AreEqual(expectedStatus, editCatalogResult.Status);
+
+            if (expectedStatus != EditPackageCatalogStatus.Ok && expectedErrorCode != 0)
+            {
+                Assert.AreEqual(expectedErrorCode, editCatalogResult.ExtendedErrorCode.HResult);
+                return;
+            }
+
+            // Verify edits are correct.
+            var packageCatalog = this.packageManager.GetPackageCatalogByName(editPackageCatalogOptions.Name);
+            Assert.AreEqual(packageCatalog.Info.Explicit, bool.Parse(editPackageCatalogOptions.Explicit));
+        }
     }
 }
diff --git a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.dll.manifest b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.dll.manifest
@@ -55,5 +55,9 @@
         clsid="{1125D3A6-E2CE-479A-91D5-71A3F6F8B00B}"
         threadingModel="Both"
         description="RemovePackageCatalogOptions"/>
+    <comClass
+       clsid="{E8E12FE1-AB77-40C4-A562-E91FB51B4E82}"
+       threadingModel="Both"
+       description="EditPackageCatalogOptions"/>
   </file>
 </assembly>
diff --git a/src/Microsoft.Management.Deployment.OutOfProc/Factory.cpp b/src/Microsoft.Management.Deployment.OutOfProc/Factory.cpp
@@ -24,6 +24,7 @@ namespace Microsoft::Management::Deployment::OutOfProc
         constexpr CLSID CLSID_RepairOptions = { 0x0498F441, 0x3097, 0x455F, { 0x9C, 0xAF, 0x14, 0x8F, 0x28, 0x29, 0x38, 0x65 } }; //0498F441-3097-455F-9CAF-148F28293865
         constexpr CLSID CLSID_AddPackageCatalogOptions = { 0xDB9D012D, 0x00D7, 0x47EE, { 0x8F, 0xB1, 0x60, 0x6E, 0x10, 0xAC, 0x4F, 0x51 } }; //DB9D012D-00D7-47EE-8FB1-606E10AC4F51
         constexpr CLSID CLSID_RemovePackageCatalogOptions = { 0x032B1C58, 0xB975, 0x469B, { 0xA0, 0x13, 0xE6, 0x32, 0xB6, 0xEC, 0xE8, 0xD8 } }; //032B1C58-B975-469B-A013-E632B6ECE8D8
+        constexpr CLSID CLSID_EditPackageCatalogOptions = { 0xA9F5E736, 0x68CE, 0x463C, { 0xBA, 0x6D, 0xDE, 0x96, 0x8F, 0x0C, 0xCE, 0x04 } }; //A9F5E736-68CE-463C-BA6D-DE968F0CCE04
 #else
         constexpr CLSID CLSID_PackageManager = { 0x74CB3139, 0xB7C5, 0x4B9E, { 0x93, 0x88, 0xE6, 0x61, 0x6D, 0xEA, 0x28, 0x8C } }; //74CB3139-B7C5-4B9E-9388-E6616DEA288C
         constexpr CLSID CLSID_InstallOptions = { 0x44FE0580, 0x62F7, 0x44D4, { 0x9E, 0x91, 0xAA, 0x96, 0x14, 0xAB, 0x3E, 0x86 } }; //44FE0580-62F7-44D4-9E91-AA9614AB3E86
@@ -36,6 +37,7 @@ namespace Microsoft::Management::Deployment::OutOfProc
         constexpr CLSID CLSID_RepairOptions = { 0xE62BB1E7, 0xC7B2, 0x4AEC, { 0x9E, 0x28, 0xFB, 0x64, 0x9B, 0x30, 0xFF, 0x03 } }; //E62BB1E7-C7B2-4AEC-9E28-FB649B30FF03
         constexpr CLSID CLSID_AddPackageCatalogOptions = { 0xD58C7E4C, 0x70E6, 0x476C, { 0xA5, 0xD4, 0x80, 0x34, 0x1E, 0xD8, 0x02, 0x52 } }; //D58C7E4C-70E6-476C-A5D4-80341ED80252
         constexpr CLSID CLSID_RemovePackageCatalogOptions = { 0x87A96609, 0x1A39, 0x4955, { 0xBE, 0x72, 0x71, 0x74, 0xE1, 0x47, 0xB7, 0xDC } }; //87A96609-1A39-4955-BE72-7174E147B7DC
+        constexpr CLSID CLSID_EditPackageCatalogOptions = { 0x29B19238, 0x81AD, 0x4A8E, { 0xA2, 0xFC, 0xAD, 0xF1, 0x7C, 0x38, 0xCA, 0xEB } }; //29B19238-81AD-4A8E-A2FC-ADF17C38CAEB
 
 #endif
 
@@ -45,7 +47,7 @@ namespace Microsoft::Management::Deployment::OutOfProc
             GUID CLSID;
         };
 
-        constexpr std::array<NameCLSIDPair, 11> s_nameCLSIDPairs
+        constexpr std::array<NameCLSIDPair, 12> s_nameCLSIDPairs
         {
             NameCLSIDPair{ L"Microsoft.Management.Deployment.PackageManager"sv, CLSID_PackageManager },
             NameCLSIDPair{ L"Microsoft.Management.Deployment.InstallOptions"sv, CLSID_InstallOptions },
@@ -58,6 +60,7 @@ namespace Microsoft::Management::Deployment::OutOfProc
             NameCLSIDPair{ L"Microsoft.Management.Deployment.RepairOptions"sv, CLSID_RepairOptions },
             NameCLSIDPair{ L"Microsoft.Management.Deployment.AddPackageCatalogOptions"sv, CLSID_AddPackageCatalogOptions },
             NameCLSIDPair{ L"Microsoft.Management.Deployment.RemovePackageCatalogOptions"sv, CLSID_RemovePackageCatalogOptions },
+            NameCLSIDPair{ L"Microsoft.Management.Deployment.EditPackageCatalogOptions"sv, CLSID_EditPackageCatalogOptions },
         };
 
         bool IsCLSIDPresent(const GUID& clsid)
diff --git a/src/Microsoft.Management.Deployment.Projection/ClassesDefinition.cs b/src/Microsoft.Management.Deployment.Projection/ClassesDefinition.cs
@@ -150,6 +150,18 @@ internal static class ClassesDefinition
                     [ClsidContext.OutOfProc] = new Guid("032B1C58-B975-469B-A013-E632B6ECE8D8"),
                     [ClsidContext.OutOfProcDev] = new Guid("87A96609-1A39-4955-BE72-7174E147B7DC"),
                 }
+            },
+
+            [typeof(EditPackageCatalogOptions)] = new()
+            {
+                ProjectedClassType = typeof(EditPackageCatalogOptions),
+                InterfaceType = typeof(IEditPackageCatalogOptions),
+                Clsids = new Dictionary<ClsidContext, Guid>()
+                {
+                    [ClsidContext.InProc] = new Guid("E8E12FE1-AB77-40C4-A562-E91FB51B4E82"),
+                    [ClsidContext.OutOfProc] = new Guid("A9F5E736-68CE-463C-BA6D-DE968F0CCE04"),
+                    [ClsidContext.OutOfProcDev] = new Guid("29B19238-81AD-4A8E-A2FC-ADF17C38CAEB"),
+                }
             }
         };
 
diff --git a/src/Microsoft.Management.Deployment.Projection/WinGetProjectionFactory.cs b/src/Microsoft.Management.Deployment.Projection/WinGetProjectionFactory.cs
@@ -39,6 +39,8 @@ public WinGetProjectionFactory(IInstanceInitializer instanceInitializer)
 
         public AddPackageCatalogOptions CreateAddPackageCatalogOptions() => InstanceInitializer.CreateInstance<AddPackageCatalogOptions>();
 
-        public RemovePackageCatalogOptions CreateRemovePackageCatalogOptions() => InstanceInitializer.CreateInstance<RemovePackageCatalogOptions>();
+        public RemovePackageCatalogOptions CreateRemovePackageCatalogOptions() => InstanceInitializer.CreateInstance<RemovePackageCatalogOptions>();
+
+        public EditPackageCatalogOptions CreateEditPackageCatalogOptions() => InstanceInitializer.CreateInstance<EditPackageCatalogOptions>();
     }
 }
diff --git a/src/Microsoft.Management.Deployment/ComClsids.cpp b/src/Microsoft.Management.Deployment/ComClsids.cpp
@@ -17,6 +17,7 @@
 #include "RepairOptions.h"
 #include "AddPackageCatalogOptions.h"
 #include "RemovePackageCatalogOptions.h"
+#include "EditPackageCatalogOptions.h"
 #pragma warning( pop )
 
 namespace winrt::Microsoft::Management::Deployment
@@ -70,6 +71,10 @@ namespace winrt::Microsoft::Management::Deployment
         else if (IsEqualCLSID(clsid, WINGET_INPROC_COM_CLSID_RemovePackageCatalogOptions))
         {
             return __uuidof(winrt::Microsoft::Management::Deployment::implementation::RemovePackageCatalogOptions);
+        }
+        else if (IsEqualCLSID(clsid, WINGET_INPROC_COM_CLSID_EditPackageCatalogOptions))
+        {
+            return __uuidof(winrt::Microsoft::Management::Deployment::implementation::EditPackageCatalogOptions);
         }
         else
         {
diff --git a/src/Microsoft.Management.Deployment/Converters.cpp b/src/Microsoft.Management.Deployment/Converters.cpp
@@ -530,6 +530,19 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         }
     }
 
+    EditPackageCatalogStatus GetEditPackageCatalogOperationStatus(winrt::hresult hresult)
+    {
+        switch (hresult)
+        {
+        case APPINSTALLER_CLI_ERROR_SOURCE_NAME_DOES_NOT_EXIST:
+            return EditPackageCatalogStatus::InvalidOptions;
+        case APPINSTALLER_CLI_ERROR_INVALID_SOURCE_TYPE:
+            return EditPackageCatalogStatus::CatalogError;
+        default:
+            return HandleCommonCatalogOperationStatus<EditPackageCatalogStatus>(hresult);
+        }
+    }
+
     ::AppInstaller::Manifest::PlatformEnum GetPlatformEnum(WindowsPlatform value)
     {
         switch (value)
diff --git a/src/Microsoft.Management.Deployment/Converters.h b/src/Microsoft.Management.Deployment/Converters.h
@@ -33,6 +33,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
     ::AppInstaller::Manifest::ScopeEnum GetManifestRepairScope(winrt::Microsoft::Management::Deployment::PackageRepairScope scope);
     winrt::Microsoft::Management::Deployment::AddPackageCatalogStatus GetAddPackageCatalogOperationStatus(winrt::hresult hresult);
     winrt::Microsoft::Management::Deployment::RemovePackageCatalogStatus GetRemovePackageCatalogOperationStatus(winrt::hresult hresult);
+    winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus GetEditPackageCatalogOperationStatus(winrt::hresult hresult);
     ::AppInstaller::Manifest::PlatformEnum GetPlatformEnum(winrt::Microsoft::Management::Deployment::WindowsPlatform value);
 
 #define WINGET_GET_OPERATION_RESULT_STATUS(_installResultStatus_, _uninstallResultStatus_, _downloadResultStatus_, _repairResultStatus_) \
@@ -194,6 +195,10 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         {
             return HandleCommonCatalogOperationStatus<RefreshPackageCatalogStatus>(hresult);
         }
+        else if constexpr (std::is_same_v<TStatus, winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus>)
+        {
+            return GetEditPackageCatalogOperationStatus(hresult);
+        }
         else
         {
             throw winrt::hresult_error(E_UNEXPECTED);
diff --git a/src/Microsoft.Management.Deployment/EditPackageCatalogOptions.cpp b/src/Microsoft.Management.Deployment/EditPackageCatalogOptions.cpp
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#pragma warning( push )
+#pragma warning ( disable : 4467 6388)
+// 6388 Allow CreateInstance.
+#include <wil\cppwinrt_wrl.h>
+// 4467 Allow use of uuid attribute for com object creation.
+#include "EditPackageCatalogOptions.h"
+#pragma warning( pop )
+#include "EditPackageCatalogOptions.g.cpp"
+#include "Converters.h"
+#include "Helpers.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+    hstring EditPackageCatalogOptions::Name()
+    {
+        return hstring(m_name);
+    }
+    void EditPackageCatalogOptions::Name(hstring const& value)
+    {
+        m_name = value;
+    }
+    hstring EditPackageCatalogOptions::Explicit()
+    {
+        return hstring(m_explicit);
+    }
+    void EditPackageCatalogOptions::Explicit(hstring const& value)
+    {
+        m_explicit = value;
+    }
+
+    CoCreatableMicrosoftManagementDeploymentClass(EditPackageCatalogOptions);
+}
diff --git a/src/Microsoft.Management.Deployment/EditPackageCatalogOptions.h b/src/Microsoft.Management.Deployment/EditPackageCatalogOptions.h
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "EditPackageCatalogOptions.g.h"
+#include "public/ComClsids.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+    [uuid(WINGET_OUTOFPROC_COM_CLSID_EditPackageCatalogOptions)]
+    struct EditPackageCatalogOptions : EditPackageCatalogOptionsT<EditPackageCatalogOptions>
+    {
+        EditPackageCatalogOptions() = default;
+
+        hstring Name();
+        void Name(hstring const& value);
+
+        hstring Explicit();
+        void Explicit(hstring const& value);
+
+#if !defined(INCLUDE_ONLY_INTERFACE_METHODS)
+    private:
+        hstring m_name = L"";
+        hstring m_explicit = L"";
+#endif
+    };
+}
+
+#if !defined(INCLUDE_ONLY_INTERFACE_METHODS)
+namespace winrt::Microsoft::Management::Deployment::factory_implementation
+{
+    struct EditPackageCatalogOptions : EditPackageCatalogOptionsT<EditPackageCatalogOptions, implementation::EditPackageCatalogOptions>
+    {
+    };
+}
+#endif
diff --git a/src/Microsoft.Management.Deployment/EditPackageCatalogResult.cpp b/src/Microsoft.Management.Deployment/EditPackageCatalogResult.cpp
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "EditPackageCatalogResult.h"
+#include "EditPackageCatalogResult.g.cpp"
+#include <wil\cppwinrt_wrl.h>
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+    void EditPackageCatalogResult::Initialize(
+        winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus status,
+        winrt::hresult extendedErrorCode)
+    {
+        m_status = status;
+        m_extendedErrorCode = extendedErrorCode;
+    }
+    winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus EditPackageCatalogResult::Status()
+    {
+        return m_status;
+    }
+    winrt::hresult EditPackageCatalogResult::ExtendedErrorCode()
+    {
+        return m_extendedErrorCode;
+    }
+}
diff --git a/src/Microsoft.Management.Deployment/EditPackageCatalogResult.h b/src/Microsoft.Management.Deployment/EditPackageCatalogResult.h
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "EditPackageCatalogResult.g.h"
+
+namespace winrt::Microsoft::Management::Deployment::implementation
+{
+    struct EditPackageCatalogResult : EditPackageCatalogResultT<EditPackageCatalogResult>
+    {
+        EditPackageCatalogResult() = default;
+
+#if !defined(INCLUDE_ONLY_INTERFACE_METHODS)
+        void Initialize(
+            winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus status,
+            winrt::hresult extendedErrorCode);
+#endif
+
+        winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus Status();
+        winrt::hresult ExtendedErrorCode();
+
+#if !defined(INCLUDE_ONLY_INTERFACE_METHODS)
+    private:
+        winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus m_status = winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus::Ok;
+        winrt::hresult m_extendedErrorCode = S_OK;
+#endif
+    };
+}
diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj
@@ -169,6 +169,8 @@
     <ClInclude Include="Documentation.h" />
     <ClInclude Include="DownloadOptions.h" />
     <ClInclude Include="DownloadResult.h" />
+    <ClInclude Include="EditPackageCatalogOptions.h" />
+    <ClInclude Include="EditPackageCatalogResult.h" />
     <ClInclude Include="FindPackagesOptions.h" />
     <ClInclude Include="FindPackagesResult.h" />
     <ClInclude Include="Helpers.h" />
@@ -217,6 +219,8 @@
     <ClCompile Include="Documentation.cpp" />
     <ClCompile Include="DownloadOptions.cpp" />
     <ClCompile Include="DownloadResult.cpp" />
+    <ClCompile Include="EditPackageCatalogOptions.cpp" />
+    <ClCompile Include="EditPackageCatalogResult.cpp" />
     <ClCompile Include="FindPackagesOptions.cpp" />
     <ClCompile Include="FindPackagesResult.cpp" />
     <ClCompile Include="Helpers.cpp" />
@@ -275,5 +279,4 @@
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
-</Project>
-
+</Project>
diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj.filters b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj.filters
@@ -46,6 +46,8 @@
     <ClCompile Include="RefreshPackageCatalogResult.cpp" />
     <ClCompile Include="RemovePackageCatalogOptions.cpp" />
     <ClCompile Include="PackageCatalogProgress.cpp" />
+    <ClCompile Include="EditPackageCatalogOptions.cpp" />
+    <ClCompile Include="EditPackageCatalogResult.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CatalogPackage.h" />
@@ -97,6 +99,8 @@
     <ClInclude Include="RefreshPackageCatalogResult.h" />
     <ClInclude Include="RemovePackageCatalogOptions.h" />
     <ClInclude Include="PackageCatalogProgress.h" />
+    <ClInclude Include="EditPackageCatalogOptions.h" />
+    <ClInclude Include="EditPackageCatalogResult.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="PackageManager.idl" />
diff --git a/src/Microsoft.Management.Deployment/PackageManager.cpp b/src/Microsoft.Management.Deployment/PackageManager.cpp
diff --git a/src/Microsoft.Management.Deployment/PackageManager.h b/src/Microsoft.Management.Deployment/PackageManager.h
diff --git a/src/Microsoft.Management.Deployment/PackageManager.idl b/src/Microsoft.Management.Deployment/PackageManager.idl
diff --git a/src/Microsoft.Management.Deployment/Public/ComClsids.h b/src/Microsoft.Management.Deployment/Public/ComClsids.h

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ namespace AppInstaller::CLI`
`124`	`124`
`125`	`125`	`struct SourceEditCommand final : public Command`
`126`	`126`	`{`
`127`		`- SourceEditCommand(std::string_view parent) : Command("edit", { "config" }, parent, Settings::ExperimentalFeature::Feature::SourceEdit) {}`
	`127`	`+ SourceEditCommand(std::string_view parent) : Command("edit", { "config", "set" }, parent, Settings::ExperimentalFeature::Feature::SourceEdit) {}`
`128`	`128`
`129`	`129`	`std::vector<Argument> GetArguments() const override;`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ public WinGetProjectionFactory(IInstanceInitializer instanceInitializer)`
`39`	`39`
`40`	`40`	`public AddPackageCatalogOptions CreateAddPackageCatalogOptions() => InstanceInitializer.CreateInstance<AddPackageCatalogOptions>();`
`41`	`41`
`42`		`- public RemovePackageCatalogOptions CreateRemovePackageCatalogOptions() => InstanceInitializer.CreateInstance<RemovePackageCatalogOptions>();`
	`42`	`+ public RemovePackageCatalogOptions CreateRemovePackageCatalogOptions() => InstanceInitializer.CreateInstance<RemovePackageCatalogOptions>();`
	`43`	`+`
	`44`	`+ public EditPackageCatalogOptions CreateEditPackageCatalogOptions() => InstanceInitializer.CreateInstance<EditPackageCatalogOptions>();`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include "RepairOptions.h"`
`18`	`18`	`#include "AddPackageCatalogOptions.h"`
`19`	`19`	`#include "RemovePackageCatalogOptions.h"`
	`20`	`+#include "EditPackageCatalogOptions.h"`
`20`	`21`	`#pragma warning( pop )`
`21`	`22`
`22`	`23`	`namespace winrt::Microsoft::Management::Deployment`
`@@ -70,6 +71,10 @@ namespace winrt::Microsoft::Management::Deployment`
`70`	`71`	`else if (IsEqualCLSID(clsid, WINGET_INPROC_COM_CLSID_RemovePackageCatalogOptions))`
`71`	`72`	`{`
`72`	`73`	`return __uuidof(winrt::Microsoft::Management::Deployment::implementation::RemovePackageCatalogOptions);`
	`74`	`+ }`
	`75`	`+ else if (IsEqualCLSID(clsid, WINGET_INPROC_COM_CLSID_EditPackageCatalogOptions))`
	`76`	`+ {`
	`77`	`+ return __uuidof(winrt::Microsoft::Management::Deployment::implementation::EditPackageCatalogOptions);`
`73`	`78`	`}`
`74`	`79`	`else`
`75`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -530,6 +530,19 @@ namespace winrt::Microsoft::Management::Deployment::implementation`
`530`	`530`	`}`
`531`	`531`	`}`
`532`	`532`
	`533`	`+ EditPackageCatalogStatus GetEditPackageCatalogOperationStatus(winrt::hresult hresult)`
	`534`	`+ {`
	`535`	`+ switch (hresult)`
	`536`	`+ {`
	`537`	`+ case APPINSTALLER_CLI_ERROR_SOURCE_NAME_DOES_NOT_EXIST:`
	`538`	`+ return EditPackageCatalogStatus::InvalidOptions;`
	`539`	`+ case APPINSTALLER_CLI_ERROR_INVALID_SOURCE_TYPE:`
	`540`	`+ return EditPackageCatalogStatus::CatalogError;`
	`541`	`+ default:`
	`542`	`+ return HandleCommonCatalogOperationStatus<EditPackageCatalogStatus>(hresult);`
	`543`	`+ }`
	`544`	`+ }`
	`545`	`+`
`533`	`546`	`::AppInstaller::Manifest::PlatformEnum GetPlatformEnum(WindowsPlatform value)`
`534`	`547`	`{`
`535`	`548`	`switch (value)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation`
`33`	`33`	`::AppInstaller::Manifest::ScopeEnum GetManifestRepairScope(winrt::Microsoft::Management::Deployment::PackageRepairScope scope);`
`34`	`34`	`winrt::Microsoft::Management::Deployment::AddPackageCatalogStatus GetAddPackageCatalogOperationStatus(winrt::hresult hresult);`
`35`	`35`	`winrt::Microsoft::Management::Deployment::RemovePackageCatalogStatus GetRemovePackageCatalogOperationStatus(winrt::hresult hresult);`
	`36`	`+ winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus GetEditPackageCatalogOperationStatus(winrt::hresult hresult);`
`36`	`37`	`::AppInstaller::Manifest::PlatformEnum GetPlatformEnum(winrt::Microsoft::Management::Deployment::WindowsPlatform value);`
`37`	`38`
`38`	`39`	`#define WINGET_GET_OPERATION_RESULT_STATUS(_installResultStatus_, _uninstallResultStatus_, _downloadResultStatus_, _repairResultStatus_) \`
`@@ -194,6 +195,10 @@ namespace winrt::Microsoft::Management::Deployment::implementation`
`194`	`195`	`{`
`195`	`196`	`return HandleCommonCatalogOperationStatus<RefreshPackageCatalogStatus>(hresult);`
`196`	`197`	`}`
	`198`	`+ else if constexpr (std::is_same_v<TStatus, winrt::Microsoft::Management::Deployment::EditPackageCatalogStatus>)`
	`199`	`+ {`
	`200`	`+ return GetEditPackageCatalogOperationStatus(hresult);`
	`201`	`+ }`
`197`	`202`	`else`
`198`	`203`	`{`
`199`	`204`	`throw winrt::hresult_error(E_UNEXPECTED);`