Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made all installer types lowercase during show. #1689

Merged
merged 3 commits into from
Nov 10, 2021
Merged

Made all installer types lowercase during show. #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b162ed
Made all installer types lowercase during `show`.
jedieaston Nov 9, 2021
367380f
Fixed test data with a pascal cased source.
jedieaston Nov 10, 2021
a3fcfc5
Fixed the other expected strings in the test case -- sorry!
jedieaston Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/AppInstallerCLITests/TestData/InstallFlowTest_MSStore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions src/AppInstallerCLITests/YamlManifest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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." },
Expand Down
20 changes: 10 additions & 10 deletions src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down