Update rest source and wingetutil interop to include 1.28 manifest (#… (#6237)

Author: yao-msft

src/AppInstallerCLITests/AppInstallerCLITests.vcxproj

@@ -284,6 +284,7 @@
     <ClCompile Include="RestInterface_1_1.cpp" />
     <ClCompile Include="RestInterface_1_10.cpp" />
     <ClCompile Include="RestInterface_1_12.cpp" />
+    <ClCompile Include="RestInterface_1_28.cpp" />
     <ClCompile Include="RestInterface_1_4.cpp" />
     <ClCompile Include="RestInterface_1_5.cpp" />
     <ClCompile Include="RestInterface_1_6.cpp" />

src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters

@@ -383,6 +383,9 @@
     <ClCompile Include="RestInterface_1_12.cpp">
       <Filter>Source Files\Repository</Filter>
     </ClCompile>
+    <ClCompile Include="RestInterface_1_28.cpp">
+      <Filter>Source Files\Repository</Filter>
+    </ClCompile>
     <ClCompile Include="ManifestComparator.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>

src/AppInstallerCLITests/RestClient.cpp

@@ -63,7 +63,7 @@ TEST_CASE("GetSupportedInterface", "[RestSource]")
     REQUIRE(RestClient::GetSupportedInterface(TestRestUri, {}, info, {}, version, {})->GetVersion() == version);
 
     // Update this test to next version so that we don't forget to add to supported versions before rest e2e tests are available.
-    Version invalid{ "1.13.0" };
+    Version invalid{ "1.29.0" };
     REQUIRE_THROWS_HR(RestClient::GetSupportedInterface(TestRestUri, {}, info, {}, invalid, {}), APPINSTALLER_CLI_ERROR_RESTSOURCE_INVALID_VERSION);
 
     Authentication::AuthenticationArguments authArgs;

src/AppInstallerCLITests/RestInterface_1_28.cpp

@@ -377,6 +377,8 @@
     <ClInclude Include="Rest\Schema\1_10\Json\ManifestDeserializer.h" />
     <ClInclude Include="Rest\Schema\1_12\Interface.h" />
     <ClInclude Include="Rest\Schema\1_12\Json\ManifestDeserializer.h" />
+    <ClInclude Include="Rest\Schema\1_28\Interface.h" />
+    <ClInclude Include="Rest\Schema\1_28\Json\ManifestDeserializer.h" />
     <ClInclude Include="Rest\Schema\1_1\Interface.h" />
     <ClInclude Include="Rest\Schema\1_1\Json\ManifestDeserializer.h" />
     <ClInclude Include="Rest\Schema\1_1\Json\SearchRequestSerializer.h" />
@@ -478,6 +480,8 @@
     <ClCompile Include="Rest\Schema\1_10\RestInterface_1_10.cpp" />
     <ClCompile Include="Rest\Schema\1_12\Json\ManifestDeserializer_1_12.cpp" />
     <ClCompile Include="Rest\Schema\1_12\RestInterface_1_12.cpp" />
+    <ClCompile Include="Rest\Schema\1_28\Json\ManifestDeserializer_1_28.cpp" />
+    <ClCompile Include="Rest\Schema\1_28\RestInterface_1_28.cpp" />
     <ClCompile Include="Rest\Schema\1_1\Json\ManifestDeserializer_1_1.cpp" />
     <ClCompile Include="Rest\Schema\1_1\Json\SearchRequestSerializer_1_1.cpp" />
     <ClCompile Include="Rest\Schema\1_1\RestInterface_1_1.cpp" />

src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj

@@ -121,6 +121,12 @@
     <Filter Include="Rest\Schema\1_12\Json">
       <UniqueIdentifier>{2075b51e-aa11-473a-bae0-e0d4366f926b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Rest\Schema\1_28">
+      <UniqueIdentifier>{a3b7c8d1-e2f4-5a6b-9c0d-1e2f3a4b5c6d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Rest\Schema\1_28\Json">
+      <UniqueIdentifier>{b4c8d9e2-f3a5-6b7c-0d1e-2f3a4b5c6d7e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h">
@@ -501,6 +507,12 @@
     <ClInclude Include="Rest\Schema\1_12\Json\ManifestDeserializer.h">
       <Filter>Rest\Schema\1_12\Json</Filter>
     </ClInclude>
+    <ClInclude Include="Rest\Schema\1_28\Interface.h">
+      <Filter>Rest\Schema\1_28</Filter>
+    </ClInclude>
+    <ClInclude Include="Rest\Schema\1_28\Json\ManifestDeserializer.h">
+      <Filter>Rest\Schema\1_28\Json</Filter>
+    </ClInclude>
     <ClInclude Include="Rest\RestInformationCache.h">
       <Filter>Rest</Filter>
     </ClInclude>
@@ -785,6 +797,12 @@
     <ClCompile Include="Rest\Schema\1_12\Json\ManifestDeserializer_1_12.cpp">
       <Filter>Rest\Schema\1_12\Json</Filter>
     </ClCompile>
+    <ClCompile Include="Rest\Schema\1_28\RestInterface_1_28.cpp">
+      <Filter>Rest\Schema\1_28</Filter>
+    </ClCompile>
+    <ClCompile Include="Rest\Schema\1_28\Json\ManifestDeserializer_1_28.cpp">
+      <Filter>Rest\Schema\1_28\Json</Filter>
+    </ClCompile>
     <ClCompile Include="Rest\RestInformationCache.cpp">
       <Filter>Rest</Filter>
     </ClCompile>

src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj.filters

@@ -11,6 +11,7 @@
 #include "Rest/Schema/1_9/Json/ManifestDeserializer.h"
 #include "Rest/Schema/1_10/Json/ManifestDeserializer.h"
 #include "Rest/Schema/1_12/Json/ManifestDeserializer.h"
+#include "Rest/Schema/1_28/Json/ManifestDeserializer.h"
 
 namespace AppInstaller::Repository::JSON
 {
@@ -61,10 +62,14 @@ namespace AppInstaller::Repository::JSON
             {
                 m_pImpl->m_deserializer = std::make_unique<Rest::Schema::V1_10::Json::ManifestDeserializer>();
             }
-            else
+            else if (parts.size() > 1 && parts[1].Integer < 28)
             {
                 m_pImpl->m_deserializer = std::make_unique<Rest::Schema::V1_12::Json::ManifestDeserializer>();
             }
+            else
+            {
+                m_pImpl->m_deserializer = std::make_unique<Rest::Schema::V1_28::Json::ManifestDeserializer>();
+            }
         }
         else
         {

src/AppInstallerRepositoryCore/ManifestJSONParser.cpp

@@ -12,6 +12,7 @@
 #include "Rest/Schema/1_9/Interface.h"
 #include "Rest/Schema/1_10/Interface.h"
 #include "Rest/Schema/1_12/Interface.h"
+#include "Rest/Schema/1_28/Interface.h"
 #include "Rest/Schema/InformationResponseDeserializer.h"
 #include "Rest/Schema/CommonRestConstants.h"
 #include <AppInstallerDownloader.h>
@@ -37,6 +38,7 @@ namespace AppInstaller::Repository::Rest
         Version_1_9_0,
         Version_1_10_0,
         Version_1_12_0,
+        Version_1_28_0,
     };
 
     constexpr std::string_view WindowsPackageManagerHeader = "Windows-Package-Manager"sv;
@@ -218,6 +220,10 @@ namespace AppInstaller::Repository::Rest
         {
             return std::make_unique<Schema::V1_12::Interface>(api, helper, information, additionalHeaders, authArgs);
         }
+        else if (version == Version_1_28_0)
+        {
+            return std::make_unique<Schema::V1_28::Interface>(api, helper, information, additionalHeaders, authArgs);
+        }
 
         THROW_HR(APPINSTALLER_CLI_ERROR_RESTSOURCE_INVALID_VERSION);
     }

src/AppInstallerRepositoryCore/Rest/RestClient.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "Rest/Schema/1_12/Interface.h"
+
+namespace AppInstaller::Repository::Rest::Schema::V1_28
+{
+    // Interface to this schema version exposed through IRestClient.
+    struct Interface : public V1_12::Interface
+    {
+        Interface(const std::string& restApi, const Http::HttpClientHelper& helper, IRestClient::Information information, const Http::HttpClientHelper::HttpRequestHeaders& additionalHeaders = {}, Authentication::AuthenticationArguments authArgs = {});
+
+        Interface(const Interface&) = delete;
+        Interface& operator=(const Interface&) = delete;
+
+        Interface(Interface&&) = default;
+        Interface& operator=(Interface&&) = default;
+
+        Utility::Version GetVersion() const override;
+    };
+}

src/AppInstallerRepositoryCore/Rest/Schema/1_28/Interface.h

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "Rest/Schema/1_12/Json/ManifestDeserializer.h"
+
+namespace AppInstaller::Repository::Rest::Schema::V1_28::Json
+{
+    // Manifest Deserializer.
+    struct ManifestDeserializer : public V1_12::Json::ManifestDeserializer
+    {
+    protected:
+
+        std::optional<Manifest::ManifestInstaller> DeserializeInstaller(const web::json::value& installerJsonObject) const override;
+
+        Manifest::ManifestVer GetManifestVersion() const override;
+    };
+}