commit 4bc452010e7c7e61032879826efe50cb8bea4734 parent 122bb529fe16aa60489679a30cb4b35c49e23532 Author: yao-msft <50888816+yao-msft@users.noreply.github.com> Date: Thu, 14 May 2020 11:17:41 -0700 Make License field required (#138) Diffstat:
68 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestBurnInstaller.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestBurnInstaller.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestBurnInstaller Name: TestBurnInstaller Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestExeInstaller.exe diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestExeInstaller Name: TestExeInstaller Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestExeInstaller.exe diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller_InapplicableOsVersion.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller_InapplicableOsVersion.yaml @@ -3,6 +3,7 @@ Name: InapplicableOsVersion Version: 1.0.0.0 Publisher: AppInstallerTest MinOSVersion: 11.0.0.0 +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestExeInstaller.exe diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller_Sha256Mismatch.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller_Sha256Mismatch.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestExeSha256Mismatch Name: TestExeSha256Mismatch Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestExeInstaller.exe diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestInnoInstaller.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestInnoInstaller.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestInnoInstaller Name: TestInnoInstaller Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestExeInstaller.exe diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestInvalidManifest.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestInvalidManifest.yaml @@ -2,6 +2,7 @@ Id: TestInvalidManifest TestInvalidManifest Name: TestInvalidManifest Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestExeInstaller.exe diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsiInstaller.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsiInstaller.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestMsiInstaller Name: TestMsiInstaller Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestMsiInstaller.msi diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsixInstaller.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsixInstaller.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestMsixInstaller Name: TestMsixInstaller Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestMsixInstaller.msix diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsixInstaller_SignatureHashMismatch.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsixInstaller_SignatureHashMismatch.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestMsixSignatureHashMismatch Name: TestMsixSignatureHashMismatch Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestMsixInstaller.msix diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsixInstaller_WithSignatureHash.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestMsixInstaller_WithSignatureHash.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestMsixWithSignatureHash Name: TestMsixWithSignatureHash Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestMsixInstaller.msix diff --git a/src/AppInstallerCLIE2ETests/TestData/Manifests/TestNullsoftInstaller.yaml b/src/AppInstallerCLIE2ETests/TestData/Manifests/TestNullsoftInstaller.yaml @@ -2,6 +2,7 @@ Id: AppInstallerTest.TestNullsoftInstaller Name: TestNullsoftInstaller Version: 1.0.0.0 Publisher: AppInstallerTest +License: Test Installers: - Arch: x86 Url: https://github.com/microsoft/appinstaller-cli/raw/master/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestExeInstaller.exe diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj @@ -313,6 +313,9 @@ <CopyFileToFolders Include="TestData\Manifest-Bad-InvalidManifestVersionValue.yaml"> <DeploymentContent>true</DeploymentContent> </CopyFileToFolders> + <CopyFileToFolders Include="TestData\Manifest-Bad-LicenseMissing.yaml"> + <DeploymentContent>true</DeploymentContent> + </CopyFileToFolders> <CopyFileToFolders Include="TestData\Manifest-Bad-NameMissing.yaml"> <DeploymentContent>true</DeploymentContent> </CopyFileToFolders> diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters @@ -162,6 +162,9 @@ <CopyFileToFolders Include="TestData\Manifest-Bad-InvalidManifestVersionValue.yaml"> <Filter>TestData</Filter> </CopyFileToFolders> + <CopyFileToFolders Include="TestData\Manifest-Bad-LicenseMissing.yaml"> + <Filter>TestData</Filter> + </CopyFileToFolders> <CopyFileToFolders Include="TestData\Manifest-Bad-NameMissing.yaml"> <Filter>TestData</Filter> </CopyFileToFolders> diff --git a/src/AppInstallerCLITests/TestData/InstallFlowTest_Exe.yaml b/src/AppInstallerCLITests/TestData/InstallFlowTest_Exe.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test Installer Publisher: Microsoft Corporation AppMoniker: AICLITestExe +License: Test Switches: Custom: /custom SilentWithProgress: /silentwithprogress diff --git a/src/AppInstallerCLITests/TestData/InstallFlowTest_Msix_DownloadFlow.yaml b/src/AppInstallerCLITests/TestData/InstallFlowTest_Msix_DownloadFlow.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test MSIX Installer Publisher: Microsoft Corporation AppMoniker: AICLITestMsix +License: Test Installers: - Arch: x64 Url: https://github.com/microsoft/msix-packaging/blob/master/src/test/testData/unpack/TestAppxPackage_x64.appx?raw=true diff --git a/src/AppInstallerCLITests/TestData/InstallFlowTest_Msix_StreamingFlow.yaml b/src/AppInstallerCLITests/TestData/InstallFlowTest_Msix_StreamingFlow.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test MSIX Installer Publisher: Microsoft Corporation AppMoniker: AICLITestMsix +License: Test Installers: - Arch: x64 Url: https://github.com/microsoft/msix-packaging/blob/master/src/test/testData/unpack/TestAppxPackage_x64.appx?raw=true diff --git a/src/AppInstallerCLITests/TestData/InstallFlowTest_NoApplicableArchitecture.yaml b/src/AppInstallerCLITests/TestData/InstallFlowTest_NoApplicableArchitecture.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test Installer Publisher: Microsoft Corporation AppMoniker: AICLITestExe +License: Test Switches: Custom: /custom SilentWithProgress: /silentwithprogress diff --git a/src/AppInstallerCLITests/TestData/InstallerArgTest_Inno_NoSwitches.yaml b/src/AppInstallerCLITests/TestData/InstallerArgTest_Inno_NoSwitches.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test Installer Publisher: Microsoft Corporation AppMoniker: AICLITest +License: Test Installers: - Arch: x64 Url: https://ThisIsNotUsed diff --git a/src/AppInstallerCLITests/TestData/InstallerArgTest_Inno_WithSwitches.yaml b/src/AppInstallerCLITests/TestData/InstallerArgTest_Inno_WithSwitches.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test Installer Publisher: Microsoft Corporation AppMoniker: AICLITest +License: Test Installers: - Arch: x64 Url: https://ThisIsNotUsed diff --git a/src/AppInstallerCLITests/TestData/InstallerArgTest_Msi_NoSwitches.yaml b/src/AppInstallerCLITests/TestData/InstallerArgTest_Msi_NoSwitches.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test Installer Publisher: Microsoft Corporation AppMoniker: AICLITest +License: Test Installers: - Arch: x64 Url: https://ThisIsNotUsed diff --git a/src/AppInstallerCLITests/TestData/InstallerArgTest_Msi_WithSwitches.yaml b/src/AppInstallerCLITests/TestData/InstallerArgTest_Msi_WithSwitches.yaml @@ -3,6 +3,7 @@ Version: 1.0.0.0 Name: AppInstaller Test Installer Publisher: Microsoft Corporation AppMoniker: AICLITest +License: Test Installers: - Arch: x64 Url: https://ThisIsNotUsed diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchInvalid.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: NotAnArch Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-ArchMissing.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-Channel-NotSupported.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-Channel-NotSupported.yaml @@ -5,6 +5,7 @@ Version: 1.7.32 Publisher: Microsoft Channel: release InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-UPPER.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-UPPER.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft INSTALLERTYPE: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-camelCase.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-camelCase.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft installerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-lower.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DifferentCase-lower.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft installertype: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase-lower.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase-lower.yaml @@ -5,6 +5,7 @@ Version: 1.7.32 Publisher: Microsoft InstallerType: Zip installertype: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey-DifferentCase.yaml @@ -5,6 +5,7 @@ Version: 1.7.32 Publisher: Microsoft InstallerType: Zip installerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-DuplicateKey.yaml @@ -5,6 +5,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-IdInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-IdInvalid.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 InstallerType: Zip Publisher: Microsoft +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-IdMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-IdMissing.yaml @@ -3,6 +3,7 @@ Name: MSIX SDK Version: 1.7.32 InstallerType: Zip Publisher: Microsoft +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilent.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilent.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilentRoot.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExe-NoSilentRoot.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft +License: Test Switches: Interactive: /i Installers: diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilent.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilent.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Exe +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilentRoot.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeExeRoot-NoSilentRoot.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Exe +License: Test Switches: Interactive: /i Installers: diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeInvalid.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: NotAType +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerTypeMissing.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness-DefaultScope.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness-DefaultScope.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness-DefaultValues.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness-DefaultValues.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness-SameLang.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness-SameLang.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallerUniqueness.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallersMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InstallersMissing.yaml @@ -4,4 +4,5 @@ Name: MSIX SDK Version: 1.7.32 InstallerType: Zip Publisher: Microsoft +License: Test ManifestVersion: 0.1.0 diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-InvalidManifestVersionValue.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-InvalidManifestVersionValue.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.0.0.0 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-LicenseMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-LicenseMissing.yaml @@ -0,0 +1,10 @@ +Id: microsoft.msixsdk +Name: MSIX SDK +Version: 1.07.32-beta +Publisher: Microsoft +InstallerType: Zip +Installers: + - Arch: x86 + Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip + Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD +ManifestVersion: 0.1.0 diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-NameMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-NameMissing.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-PublisherMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-PublisherMissing.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Version: 1.7.32 InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-Sha256Invalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-Sha256Invalid.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-Sha256Missing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-Sha256Missing.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-SwitchInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-SwitchInvalid.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Switches: NotASwitch: /fakeswitch Installers: diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-UnknownProperty.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-UnknownProperty.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-UnsupportedVersion.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-UnsupportedVersion.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.0.0.0 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-UrlInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-UrlInvalid.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: NotAUrl diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-UrlMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-UrlMissing.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Sha256: 98B67758CEAFFCBB3FE47838FD0A8D7BD581C2650842D6B2B0E0D49A23270CCD diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-VersionInvalid.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-VersionInvalid.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.0.9-/ Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Bad-VersionMissing.yaml b/src/AppInstallerCLITests/TestData/Manifest-Bad-VersionMissing.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExe-Silent.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExe-Silent.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExe-SilentRoot.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExe-SilentRoot.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft +License: Test Switches: Silent: /s SilentWithProgress: /s diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExeRoot-Silent.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExeRoot-Silent.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Exe +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExeRoot-SilentRoot.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerTypeExeRoot-SilentRoot.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Exe +License: Test Switches: Silent: /s SilentWithProgress: /s diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerUniqueness-DiffScope.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-InstallerUniqueness-DiffScope.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-Installeruniqueness-DefaultLang.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-Installeruniqueness-DefaultLang.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-Installeruniqueness-DiffLangs.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-Installeruniqueness-DiffLangs.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-Minimum-InstallerType.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-Minimum-InstallerType.yaml @@ -3,6 +3,7 @@ Id: microsoft.msixsdk Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-Minimum.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-Minimum.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.07.32-beta Publisher: Microsoft InstallerType: Zip +License: Test Installers: - Arch: x86 Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdk-x86.zip diff --git a/src/AppInstallerCLITests/TestData/Manifest-Good-Switches.yaml b/src/AppInstallerCLITests/TestData/Manifest-Good-Switches.yaml @@ -4,6 +4,7 @@ Name: MSIX SDK Version: 1.7.32 Publisher: Microsoft InstallerType: Zip +License: Test Switches: SilentWithProgress: /sp Installers: diff --git a/src/AppInstallerCLITests/YamlManifest.cpp b/src/AppInstallerCLITests/YamlManifest.cpp @@ -212,6 +212,7 @@ TEST_CASE("ReadBadManifests", "[ManifestValidation]") { "Manifest-Bad-InstallerUniqueness-DefaultScope.yaml", "Duplicate installer entry found." }, { "Manifest-Bad-InstallerUniqueness-DefaultValues.yaml", "Duplicate installer entry found." }, { "Manifest-Bad-InstallerUniqueness-SameLang.yaml", "Duplicate installer entry found." }, + { "Manifest-Bad-LicenseMissing.yaml", "Required field missing. Field: License" }, { "Manifest-Bad-NameMissing.yaml", "Required field missing. Field: Name" }, { "Manifest-Bad-PublisherMissing.yaml", "Required field missing. Field: Publisher" }, { "Manifest-Bad-Sha256Invalid.yaml", "Invalid field value. Field: Sha256" }, diff --git a/src/AppInstallerRepositoryCore/Manifest/Manifest.cpp b/src/AppInstallerRepositoryCore/Manifest/Manifest.cpp @@ -161,6 +161,12 @@ namespace AppInstaller::Manifest resultErrors.emplace_back(ManifestError::InvalidFieldValue, "Version", Version); } + // License field is required + if (License.empty()) + { + resultErrors.emplace_back(ManifestError::RequiredFieldMissing, "License"); + } + // Check duplicate installer entry. {installerType, arch, language and scope} combination is the key. // Todo: use the comparator from ManifestComparator when that one is fully implemented. auto installerCmp = [](const ManifestInstaller& in1, const ManifestInstaller& in2)