Add support for installing portables from a zip (#2500)

microsoft · Sep 27, 2022 · e0ac965 · e0ac965
1 parent 082b990
commit e0ac965
Show file tree

Hide file tree

Showing 57 changed files with 1,602 additions and 985 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -219,12 +219,6 @@ jobs:
       isPackaged: true
       filter: "TestCategory!=InProcess&TestCategory!=OutOfProcess"
 
-  - template: templates/e2e-test.template.yml
-    parameters:
-      title: "COM API E2E Tests (In-process)"
-      isPackaged: false
-      filter: "TestCategory=InProcess"
-
   - task: PowerShell@2
     displayName: 'Set program files directory'
     inputs:
@@ -236,6 +230,20 @@ jobs:
           Write-Host "##vso[task.setvariable variable=platformProgramFiles;]${env:ProgramFiles}"
         }
 
+  # Resolves resource strings utilized by InProc E2E tests.
+  - task: CopyFiles@2
+    displayName: 'Copy resources.pri to dotnet directory'
+    inputs:
+      SourceFolder: '$(buildOutDir)\AppInstallerCLI'
+      TargetFolder:  '$(platformProgramFiles)\dotnet'
+      Contents: resources.pri
+
+  - template: templates/e2e-test.template.yml
+    parameters:
+      title: "COM API E2E Tests (In-process)"
+      isPackaged: false
+      filter: "TestCategory=InProcess"
+
   # Winmd accessed by test runner process (dotnet.exe)
   - task: CopyFiles@2
     displayName: 'Copy winmd to dotnet directory'

diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
@@ -269,6 +269,7 @@
     <ClInclude Include="ExecutionReporter.h" />
     <ClInclude Include="Invocation.h" />
     <ClInclude Include="pch.h" />
+    <ClInclude Include="PortableInstaller.h" />
     <ClInclude Include="Public\AppInstallerCLICore.h" />
     <ClInclude Include="Resources.h" />
     <ClInclude Include="Search\Search.h" />
@@ -327,6 +328,7 @@
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="PortableInstaller.cpp" />
     <ClCompile Include="Resources.cpp" />
     <ClCompile Include="VTSupport.cpp" />
     <ClCompile Include="Workflows\ArchiveFlow.cpp" />

diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj.filters b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj.filters
@@ -185,6 +185,9 @@
     <ClInclude Include="Workflows\PromptFlow.h">
       <Filter>Workflows</Filter>
     </ClInclude>
+    <ClInclude Include="PortableInstaller.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -337,6 +340,9 @@
     <ClCompile Include="Workflows\ArchiveFlow.cpp">
       <Filter>Workflows</Filter>
     </ClCompile>
+    <ClCompile Include="PortableInstaller.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />

diff --git a/src/AppInstallerCLICore/ExecutionContextData.h b/src/AppInstallerCLICore/ExecutionContextData.h
@@ -4,10 +4,9 @@
 #include <winget/RepositorySource.h>
 #include <winget/Manifest.h>
 #include <winget/ARPCorrelation.h>
-#include <winget/PortableARPEntry.h>
-#include <winget/PortableEntry.h>
 #include "CompletionData.h"
 #include "PackageCollection.h"
+#include "PortableInstaller.h"
 #include "Workflows/WorkflowBase.h"
 
 #include <filesystem>
@@ -54,8 +53,8 @@ namespace AppInstaller::CLI::Execution
         Dependencies,
         DependencySource,
         AllowedArchitectures,
-        PortableEntry,
         AllowUnknownScope,
+        PortableInstaller,
         Max
     };
 
@@ -220,15 +219,15 @@ namespace AppInstaller::CLI::Execution
         };
 
         template <>
-        struct DataMapping<Data::PortableEntry>
+        struct DataMapping<Data::AllowUnknownScope>
         {
-            using value_t = Portable::PortableEntry;
+            using value_t = bool;
         };
 
         template <>
-        struct DataMapping<Data::AllowUnknownScope>
+        struct DataMapping<Data::PortableInstaller>
         {
-            using value_t = bool;
+            using value_t = CLI::Portable::PortableInstaller;
         };
     }
 }