commit b79e4087821c993f83f7c4731bbde7aa25612c73
parent b4693b191463df328d21021a17cc2b09b665ef33
Author: Easton Pillay <easton@planeteaston.com>
Date: Wed, 10 Nov 2021 15:26:27 -0600
Made all installer types lowercase during `show`. (#1689)
* Made all installer types lowercase during `show`.
Diffstat:
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git 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
diff --git 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." },
diff --git 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)