Update IDL with OptionalBoolean

Author: dkbennett

src/AppInstallerCLIE2ETests/Interop/PackageCatalogInterop.cs

@@ -297,7 +297,7 @@ public async Task AddEditRemovePackageCatalog()
             // Edit
             EditPackageCatalogOptions editOptions = this.TestFactory.CreateEditPackageCatalogOptions();
             editOptions.Name = Constants.TestSourceName;
-            editOptions.Explicit = "false";
+            editOptions.Explicit = OptionalBoolean.False;
             this.EditAndValidatePackageCatalog(editOptions, EditPackageCatalogStatus.Ok);
 
             // Remove
@@ -396,7 +396,10 @@ private void EditAndValidatePackageCatalog(EditPackageCatalogOptions editPackage
 
             // Verify edits are correct.
             var packageCatalog = this.packageManager.GetPackageCatalogByName(editPackageCatalogOptions.Name);
-            Assert.AreEqual(packageCatalog.Info.Explicit, bool.Parse(editPackageCatalogOptions.Explicit));
+            if (editPackageCatalogOptions.Explicit != OptionalBoolean.Unspecified)
+            {
+                Assert.AreEqual(packageCatalog.Info.Explicit, editPackageCatalogOptions.Explicit);
+            }
         }
     }
 }

src/Microsoft.Management.Deployment/Converters.cpp

@@ -556,4 +556,37 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         default: return AppInstaller::Manifest::PlatformEnum::Unknown;
         }
     }
+
+    std::optional<bool> GetOptionalBoolean(winrt::Microsoft::Management::Deployment::OptionalBoolean optionalBoolean)
+    {
+        switch (optionalBoolean)
+        {
+        case OptionalBoolean::True:
+            return std::optional<bool> { true };
+        case OptionalBoolean::False:
+            return std::optional<bool> { false };
+        default:
+            return std::nullopt;
+        }
+    }
+
+    winrt::Microsoft::Management::Deployment::OptionalBoolean GetOptionalBoolean(std::optional<bool> optionalBoolean)
+    {
+        if (optionalBoolean.has_value())
+        {
+            if (optionalBoolean.value())
+            {
+                return OptionalBoolean::True;
+            }
+            else
+            {
+                return OptionalBoolean::False;
+            }
+        }
+        else
+        {
+            return OptionalBoolean::Unspecified;
+        }
+    }
+
 }

src/Microsoft.Management.Deployment/Converters.h

@@ -35,6 +35,8 @@ namespace winrt::Microsoft::Management::Deployment::implementation
     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);
+    std::optional<bool> GetOptionalBoolean(winrt::Microsoft::Management::Deployment::OptionalBoolean optionalBoolean);
+    winrt::Microsoft::Management::Deployment::OptionalBoolean GetOptionalBoolean(std::optional<bool> optionalBoolean);
 
 #define WINGET_GET_OPERATION_RESULT_STATUS(_installResultStatus_, _uninstallResultStatus_, _downloadResultStatus_, _repairResultStatus_) \
     if constexpr (std::is_same_v<TStatus, winrt::Microsoft::Management::Deployment::InstallResultStatus>) \

src/Microsoft.Management.Deployment/EditPackageCatalogOptions.cpp

@@ -22,11 +22,11 @@ namespace winrt::Microsoft::Management::Deployment::implementation
     {
         m_name = value;
     }
-    hstring EditPackageCatalogOptions::Explicit()
+    OptionalBoolean EditPackageCatalogOptions::Explicit()
     {
-        return hstring(m_explicit);
+        return m_explicit;
     }
-    void EditPackageCatalogOptions::Explicit(hstring const& value)
+    void EditPackageCatalogOptions::Explicit(OptionalBoolean const& value)
     {
         m_explicit = value;
     }

src/Microsoft.Management.Deployment/EditPackageCatalogOptions.h

@@ -14,13 +14,13 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         hstring Name();
         void Name(hstring const& value);
 
-        hstring Explicit();
-        void Explicit(hstring const& value);
+        OptionalBoolean Explicit();
+        void Explicit(OptionalBoolean const& value);
 
 #if !defined(INCLUDE_ONLY_INTERFACE_METHODS)
     private:
         hstring m_name = L"";
-        hstring m_explicit = L"";
+        OptionalBoolean m_explicit = OptionalBoolean::Unspecified;
 #endif
     };
 }

src/Microsoft.Management.Deployment/PackageManager.cpp

@@ -1468,9 +1468,9 @@ namespace winrt::Microsoft::Management::Deployment::implementation
             ::AppInstaller::Repository::Source sourceToEdit = ::AppInstaller::Repository::Source{ matchingSource.value().Name };
 
             auto isExplicit = matchingSource.value().Explicit;
-            if (!options.Explicit().empty())
+            if (options.Explicit() != OptionalBoolean::Unspecified)
             {
-                isExplicit = AppInstaller::Utility::ConvertStringToBool(winrt::to_string(options.Explicit()));
+                isExplicit = options.Explicit() == OptionalBoolean::True;
             }
 
             ::AppInstaller::Repository::SourceEdit edits{ std::optional<bool>{ isExplicit } };

src/Microsoft.Management.Deployment/PackageManager.idl

@@ -1541,9 +1541,18 @@ namespace Microsoft.Management.Deployment
         HRESULT ExtendedErrorCode { get; };
     };
 
+    /// IMPLEMENTATION NOTE: OptionalBoolean
+    [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 28)]
+    enum OptionalBoolean
+    {
+        Unspecified,
+        False,
+        True,
+    };
+
     /// IMPLEMENTATION NOTE: EditPackageCatalogOptions
     [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 28)]
-        runtimeclass EditPackageCatalogOptions
+    runtimeclass EditPackageCatalogOptions
     {
         EditPackageCatalogOptions();
 
@@ -1553,13 +1562,12 @@ namespace Microsoft.Management.Deployment
         String Name;
 
         /// Editing the Explicit property has three states: true, false, and not specified (no changes).
-        /// SAMPLE VALUES: "true" or "false" or empty string.
-        String Explicit;
+        OptionalBoolean Explicit;
     };
 
     /// IMPLEMENTATION NOTE: RemovePackageCatalogStatus
     [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 28)]
-        enum EditPackageCatalogStatus
+    enum EditPackageCatalogStatus
     {
         Ok,
         GroupPolicyError,
@@ -1572,7 +1580,7 @@ namespace Microsoft.Management.Deployment
     /// IMPLEMENTATION NOTE: RemovePackageCatalogResult
     /// Result of editing a package catalog.
     [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 28)]
-        runtimeclass EditPackageCatalogResult
+    runtimeclass EditPackageCatalogResult
     {
         EditPackageCatalogStatus Status { get; };