From 9b162ed730509c23306fdaa02e6418814535cd2b Mon Sep 17 00:00:00 2001 From: Easton Pillay Date: Tue, 9 Nov 2021 12:07:02 -0500 Subject: [PATCH 1/3] Made all installer types lowercase during `show`. --- .../Manifest/ManifestCommon.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp b/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp index 2f9a2fb4e3..de26717cfd 100644 --- a/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp +++ b/src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp @@ -356,26 +356,26 @@ namespace AppInstaller::Manifest switch (installerType) { case InstallerTypeEnum::Exe: - return "Exe"sv; + return "exe"sv; case InstallerTypeEnum::Inno: - return "Inno"sv; + return "inno"sv; case InstallerTypeEnum::Msi: - return "Msi"sv; + return "msi"sv; case InstallerTypeEnum::Msix: - return "Msix"sv; + return "msix"sv; case InstallerTypeEnum::Nullsoft: - return "Nullsoft"sv; + return "nullsoft"sv; case InstallerTypeEnum::Wix: - return "Wix"sv; + return "wix"sv; case InstallerTypeEnum::Zip: - return "Zip"sv; + return "zip"sv; case InstallerTypeEnum::Burn: - return "Burn"sv; + return "burn"sv; case InstallerTypeEnum::MSStore: - return "MSStore"sv; + return "msstore"sv; } - return "Unknown"sv; + return "unknown"sv; } std::string_view ScopeToString(ScopeEnum scope) From 367380faec3aa85a69c226fd63f1da3217cf9db6 Mon Sep 17 00:00:00 2001 From: Easton Pillay Date: Tue, 9 Nov 2021 19:07:27 -0500 Subject: [PATCH 2/3] Fixed test data with a pascal cased source. --- src/AppInstallerCLITests/TestData/InstallFlowTest_MSStore.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AppInstallerCLITests/TestData/InstallFlowTest_MSStore.yaml b/src/AppInstallerCLITests/TestData/InstallFlowTest_MSStore.yaml index abf1ddc81d..3c958cac01 100644 --- a/src/AppInstallerCLITests/TestData/InstallFlowTest_MSStore.yaml +++ b/src/AppInstallerCLITests/TestData/InstallFlowTest_MSStore.yaml @@ -7,7 +7,7 @@ License: Test Installers: - Arch: neutral Url: https://ThisIsNotUsed - InstallerType: MSStore + InstallerType: msstore ProductId: 9WZDNCRFJ364 PackageFamilyName: Microsoft.SkypeApp_kzf8qxf38zg5c ManifestVersion: 0.2.0-msstore From a3fcfc5eb7d0c59037b2bd9eb99fcd77569ff94c Mon Sep 17 00:00:00 2001 From: Easton Pillay Date: Wed, 10 Nov 2021 09:30:19 -0500 Subject: [PATCH 3/3] Fixed the other expected strings in the test case -- sorry! --- src/AppInstallerCLITests/YamlManifest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AppInstallerCLITests/YamlManifest.cpp b/src/AppInstallerCLITests/YamlManifest.cpp index ab0b51691a..279f539181 100644 --- a/src/AppInstallerCLITests/YamlManifest.cpp +++ b/src/AppInstallerCLITests/YamlManifest.cpp @@ -270,9 +270,9 @@ TEST_CASE("ReadBadManifests", "[ManifestValidation]") { "Manifest-Bad-VersionInvalid.yaml", "Failed to validate against schema associated with property name 'Version'" }, { "Manifest-Bad-VersionMissing.yaml", "Missing required property 'Version'" }, { "Manifest-Bad-InvalidManifestVersionValue.yaml", "Failed to validate against schema associated with property name 'ManifestVersion'" }, - { "InstallFlowTest_MSStore.yaml", "Field value is not supported. Field: InstallerType Value: MSStore" }, - { "Manifest-Bad-PackageFamilyNameOnMSI.yaml", "The specified installer type does not support PackageFamilyName. Field: InstallerType Value: Msi" }, - { "Manifest-Bad-ProductCodeOnMSIX.yaml", "The specified installer type does not support ProductCode. Field: InstallerType Value: Msix" }, + { "InstallFlowTest_MSStore.yaml", "Field value is not supported. Field: InstallerType Value: msstore" }, + { "Manifest-Bad-PackageFamilyNameOnMSI.yaml", "The specified installer type does not support PackageFamilyName. Field: InstallerType Value: msi" }, + { "Manifest-Bad-ProductCodeOnMSIX.yaml", "The specified installer type does not support ProductCode. Field: InstallerType Value: msix" }, { "Manifest-Bad-InvalidUpdateBehavior.yaml", "Invalid field value. Field: UpdateBehavior" }, { "Manifest-Bad-InvalidLocale.yaml", "The locale value is not a well formed bcp47 language tag." }, { "Manifest-Bad-AppsAndFeaturesEntriesOnMSIX.yaml", "The specified installer type does not write to Apps and Features entry." },