Schema additions for Zip support (#2288)

microsoft · Jul 5, 2022 · dea9a20 · dea9a20
1 parent de4aa01
commit dea9a20
Show file tree

Hide file tree

Showing 71 changed files with 476 additions and 98 deletions.
diff --git a/schemas/JSON/manifests/v1.3.0/manifest.installer.1.3.0.json b/schemas/JSON/manifests/v1.3.0/manifest.installer.1.3.0.json
@@ -69,6 +69,45 @@
       ],
       "description": "Enumeration of supported installer types. InstallerType is required in either root level or individual Installer level"
     },
+    "NestedInstallerType": {
+      "type": [ "string", "null" ],
+      "enum": [
+        "msix",
+        "msi",
+        "appx",
+        "exe",
+        "inno",
+        "nullsoft",
+        "wix",
+        "burn",
+        "portable"
+      ],
+      "description": "Enumeration of supported nested installer types contained inside an archive file"
+    },
+    "NestedInstallerFiles": {
+      "type": [ "array", "null" ],
+      "items": {
+        "type": "object",
+        "title": "NestedInstallerFile",
+        "properties": {
+          "RelativeFilePath": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 512,
+            "description": "The relative path to the nested installer file"
+          },
+          "PortableCommandAlias": {
+            "type": [ "string", "null" ],
+            "minLength": 1,
+            "maxLength": 40,
+            "description": "The command alias to be used for calling the package. Only applies to the nested portable package"
+          }
+        },
+        "description": "A nested installer file contained inside an archive"
+      },
+      "maxItems": 1024,
+      "description": "List of nested installer files contained inside an archive"
+    },
     "Architecture": {
       "type": "string",
       "enum": [
@@ -492,6 +531,12 @@
         "InstallerType": {
           "$ref": "#/definitions/InstallerType"
         },
+        "NestedInstallerType": {
+          "$ref": "#/definitions/NestedInstallerType"
+        },
+        "NestedInstallerFiles": {
+          "$ref": "#/definitions/NestedInstallerFiles"
+        },
         "Scope": {
           "$ref": "#/definitions/Scope"
         },
@@ -611,6 +656,12 @@
     "InstallerType": {
       "$ref": "#/definitions/InstallerType"
     },
+    "NestedInstallerType": {
+      "$ref": "#/definitions/NestedInstallerType"
+    },
+    "NestedInstallerFiles": {
+      "$ref": "#/definitions/NestedInstallerFiles"
+    },
     "Scope": {
       "$ref": "#/definitions/Scope"
     },

diff --git a/schemas/JSON/manifests/v1.3.0/manifest.singleton.1.3.0.json b/schemas/JSON/manifests/v1.3.0/manifest.singleton.1.3.0.json
@@ -111,6 +111,45 @@
       ],
       "description": "Enumeration of supported installer types. InstallerType is required in either root level or individual Installer level"
     },
+    "NestedInstallerType": {
+      "type": [ "string", "null" ],
+      "enum": [
+        "msix",
+        "msi",
+        "appx",
+        "exe",
+        "inno",
+        "nullsoft",
+        "wix",
+        "burn",
+        "portable"
+      ],
+      "description": "Enumeration of supported nested installer types contained inside an archive file"
+    },
+    "NestedInstallerFiles": {
+      "type": [ "array", "null" ],
+      "items": {
+        "type": "object",
+        "title": "NestedInstallerFile",
+        "properties": {
+          "RelativeFilePath": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 512,
+            "description": "The relative path to the nested installer file"
+          },
+          "PortableCommandAlias": {
+            "type": [ "string", "null" ],
+            "minLength": 1,
+            "maxLength": 40,
+            "description": "The command alias to be used for calling the package. Only applies to the nested portable package"
+          }
+        },
+        "description": "A nested installer file contained inside an archive"
+      },
+      "maxItems": 1024,
+      "description": "List of nested installer files contained inside an archive"
+    },
     "Architecture": {
       "type": "string",
       "enum": [
@@ -533,6 +572,12 @@
         "InstallerType": {
           "$ref": "#/definitions/InstallerType"
         },
+        "NestedInstallerType": {
+          "$ref": "#/definitions/NestedInstallerType"
+        },
+        "NestedInstallerFiles": {
+          "$ref": "#/definitions/NestedInstallerFiles"
+        },
         "Scope": {
           "$ref": "#/definitions/Scope"
         },
@@ -765,6 +810,12 @@
     "InstallerType": {
       "$ref": "#/definitions/InstallerType"
     },
+    "NestedInstallerType": {
+      "$ref": "#/definitions/NestedInstallerType"
+    },
+    "NestedInstallerFiles": {
+      "$ref": "#/definitions/NestedInstallerFiles"
+    },
     "Scope": {
       "$ref": "#/definitions/Scope"
     },

diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
@@ -409,6 +409,18 @@
     <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypePortable-InvalidCommands.yaml">
       <DeploymentContent>true</DeploymentContent>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-MissingRelativeFilePath.yaml">
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-MultipleNestedInstallers.yaml">
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>       
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-NoNestedInstallerFile.yaml">
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>        
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-NoNestedInstallerType.yaml">
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>        
     <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerUniqueness-DefaultScope.yaml">
       <DeploymentContent>true</DeploymentContent>
     </CopyFileToFolders>

diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
@@ -294,6 +294,18 @@
     <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypePortable-InvalidCommands.yaml">
       <Filter>TestData</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-MissingRelativeFilePath.yaml">
+      <Filter>TestData</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-MultipleNestedInstallers.yaml">
+      <Filter>TestData</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-NoNestedInstallerFile.yaml">
+      <Filter>TestData</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerTypeZip-NoNestedInstallerType.yaml">
+      <Filter>TestData</Filter>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="TestData\Manifest-Bad-InstallerUniqueness.yaml">
       <Filter>TestData</Filter>
     </CopyFileToFolders>

diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-AppsAndFeaturesEntriesOnMSIX.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-AppsAndFeaturesEntriesOnMSIX.yaml
@@ -9,7 +9,7 @@ PackageLocale: en-US
 Installers:
   - Architecture: x86
     InstallerType: MSIX
-    InstallerUrl: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    InstallerUrl: https://ThisIsNotUsed
     InstallerSha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
     AppsAndFeaturesEntries:
       - DisplayName: DisplayName

diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchInvalid.yaml
@@ -3,10 +3,10 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-InstallerType: Zip
+InstallerType: Msi
 License: Test
 Installers:
   - Arch: NotAnArch
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchMissing.yaml
@@ -3,9 +3,9 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-InstallerType: Zip
+InstallerType: Msi
 License: Test
 Installers:
-  - Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+  - Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-Channel-NotSupported.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-Channel-NotSupported.yaml
@@ -3,10 +3,10 @@ Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
 Channel: release
-InstallerType: Zip
+InstallerType: Msi
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-UPPER.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-UPPER.yaml
@@ -3,10 +3,10 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-INSTALLERTYPE: Zip
+INSTALLERTYPE: Msi
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-camelCase.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-camelCase.yaml
@@ -3,10 +3,10 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-installerType: Zip
+installerType: Msi
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-lower.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-lower.yaml
@@ -3,10 +3,10 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-installertype: Zip
+installertype: Msi
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase-lower.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase-lower.yaml
@@ -3,11 +3,11 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-InstallerType: Zip
-installertype: Zip
+InstallerType: Msi
+installertype: Msi
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase.yaml
@@ -3,11 +3,11 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-InstallerType: Zip
-installerType: Zip
+InstallerType: Msi
+installerType: Msi
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey.yaml
@@ -4,10 +4,10 @@ Id: microsoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
 Publisher: Microsoft
-InstallerType: Zip
+InstallerType: Msi
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-IdInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-IdInvalid.yaml
@@ -2,11 +2,11 @@
 Id: m i c rosoft.msixsdk
 Name: MSIX SDK
 Version: 1.7.32
-InstallerType: Zip
+InstallerType: Msi
 Publisher: Microsoft
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-IdMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-IdMissing.yaml
@@ -1,11 +1,11 @@
 # Bad manifest. No Id
 Name: MSIX SDK
 Version: 1.7.32
-InstallerType: Zip
+InstallerType: Msi
 Publisher: Microsoft
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilent.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilent.yaml
@@ -6,7 +6,7 @@ Publisher: Microsoft
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
     InstallerType: Exe
     Switches:

diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilentRoot.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilentRoot.yaml
@@ -8,7 +8,7 @@ Switches:
   Interactive: /i
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
     InstallerType: Exe
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilent.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilent.yaml
@@ -7,7 +7,7 @@ InstallerType: Exe
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
     Switches:
       Interactive: /i

diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilentRoot.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilentRoot.yaml
@@ -9,6 +9,6 @@ Switches:
   Interactive: /i
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeInvalid.yaml
@@ -7,6 +7,6 @@ InstallerType: NotAType
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0
diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeMissing.yaml
@@ -6,6 +6,6 @@ Publisher: Microsoft
 License: Test
 Installers:
   - Arch: x86
-    Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip
+    Url: https://ThisIsNotUsed
     Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD
 ManifestVersion: 0.1.0