Skip to content

Commit fe1eef3

Browse files
authored
Adjust spacing and punctuation for manifest validation messages (#2805)
1 parent b906673 commit fe1eef3

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/AppInstallerCommonCore/Manifest/ManifestValidation.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace AppInstaller::Manifest
2323
{ AppInstaller::Manifest::ManifestError::RequiredFieldEmpty, "Required field with empty value."sv },
2424
{ AppInstaller::Manifest::ManifestError::RequiredFieldMissing, "Required field missing."sv },
2525
{ AppInstaller::Manifest::ManifestError::InvalidFieldValue, "Invalid field value."sv },
26-
{ AppInstaller::Manifest::ManifestError::ExeInstallerMissingSilentSwitches, "Silent and SilentWithProgress switches are not specified for InstallerType exe.Please make sure the installer can run unattended."sv },
26+
{ AppInstaller::Manifest::ManifestError::ExeInstallerMissingSilentSwitches, "Silent and SilentWithProgress switches are not specified for InstallerType exe. Please make sure the installer can run unattended."sv },
2727
{ AppInstaller::Manifest::ManifestError::FieldNotSupported, "Field is not supported."sv },
2828
{ AppInstaller::Manifest::ManifestError::FieldValueNotSupported, "Field value is not supported."sv },
2929
{ AppInstaller::Manifest::ManifestError::DuplicateInstallerEntry, "Duplicate installer entry found."sv },
@@ -46,7 +46,7 @@ namespace AppInstaller::Manifest
4646
{ AppInstaller::Manifest::ManifestError::SingleManifestPackageHasDependencies, "Package has a single manifest and is a dependency of other manifests."sv },
4747
{ AppInstaller::Manifest::ManifestError::MultiManifestPackageHasDependencies, "Deleting the manifest will be break the following dependencies."sv },
4848
{ AppInstaller::Manifest::ManifestError::MissingManifestDependenciesNode, "Dependency not found: "sv },
49-
{ AppInstaller::Manifest::ManifestError::NoSuitableMinVersionDependency,"No Suitable Minimum Version : "sv },
49+
{ AppInstaller::Manifest::ManifestError::NoSuitableMinVersionDependency,"No Suitable Minimum Version: "sv },
5050
{ AppInstaller::Manifest::ManifestError::FoundDependencyLoop, "Loop found."sv },
5151
{ AppInstaller::Manifest::ManifestError::ExceededAppsAndFeaturesEntryLimit, "Only zero or one entry for Apps and Features may be specified for InstallerType portable."sv },
5252
{ AppInstaller::Manifest::ManifestError::ExceededCommandsLimit, "Only zero or one value for Commands may be specified for InstallerType portable."sv },
@@ -56,12 +56,12 @@ namespace AppInstaller::Manifest
5656
{ AppInstaller::Manifest::ManifestError::InstallerFailedToProcess, "Failed to process installer."sv },
5757
{ AppInstaller::Manifest::ManifestError::NoSupportedPlatforms, "No supported platforms."sv },
5858
{ AppInstaller::Manifest::ManifestError::ApproximateVersionNotAllowed, "Approximate version not allowed."sv },
59-
{ AppInstaller::Manifest::ManifestError::ArpVersionOverlapWithIndex, "DisplayVersion declared in the manifest has overlap with existing DisplayVersion range in the index.Existing DisplayVersion range in index : "sv },
59+
{ AppInstaller::Manifest::ManifestError::ArpVersionOverlapWithIndex, "DisplayVersion declared in the manifest has overlap with existing DisplayVersion range in the index. Existing DisplayVersion range in index: "sv },
6060
{ AppInstaller::Manifest::ManifestError::ArpVersionValidationInternalError, "Internal error while validating DisplayVersion against index."sv },
6161
{ AppInstaller::Manifest::ManifestError::ExceededNestedInstallerFilesLimit, "Only one entry for NestedInstallerFiles can be specified for non-portable InstallerTypes."sv },
62-
{ AppInstaller::Manifest::ManifestError::RelativeFilePathEscapesDirectory, "Relative file path must not point to a location outside of archive directory"sv },
63-
{ AppInstaller::Manifest::ManifestError::ArpValidationError, "Arp Validation Error"sv },
64-
{ AppInstaller::Manifest::ManifestError::SchemaError, "Schema Error"sv },
62+
{ AppInstaller::Manifest::ManifestError::RelativeFilePathEscapesDirectory, "Relative file path must not point to a location outside of archive directory."sv },
63+
{ AppInstaller::Manifest::ManifestError::ArpValidationError, "Arp Validation Error."sv },
64+
{ AppInstaller::Manifest::ManifestError::SchemaError, "Schema Error."sv },
6565
{ AppInstaller::Manifest::ManifestError::MsixSignatureHashFailed, "Failed to calculate MSIX signature hash.Please verify that the input file is a valid, signed MSIX."sv }
6666
};
6767

@@ -146,9 +146,9 @@ namespace AppInstaller::Manifest
146146

147147
if (!duplicateInstallerFound && !installerSet.insert(installer).second)
148148
{
149-
AICLI_LOG(Core, Error, << "Duplicate installer: Type[" << InstallerTypeToString(installer.EffectiveInstallerType()) <<
150-
"] Architecture[" << Utility::ToString(installer.Arch) << "] Locale[" << installer.Locale <<
151-
"] Scope[" << ScopeToString(installer.Scope) << "]");
149+
AICLI_LOG(Core, Error, << "Duplicate installer: Type [" << InstallerTypeToString(installer.EffectiveInstallerType()) <<
150+
"], Architecture [" << Utility::ToString(installer.Arch) << "], Locale [" << installer.Locale <<
151+
"], Scope [" << ScopeToString(installer.Scope) << "]");
152152

153153
resultErrors.emplace_back(ManifestError::DuplicateInstallerEntry);
154154
duplicateInstallerFound = true;

0 commit comments

Comments
 (0)