Skip to content

Commit

Permalink
Spelling (#327)
Browse files Browse the repository at this point in the history
  • Loading branch information
jsoref committed May 28, 2020
1 parent 2e1c86d commit d1bd5ce
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions doc/ManifestSpecv0.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Name: MSIX SDK
AppMoniker: msixsdk

# Version is a required field. It is the specific version of this copy of the application.
# Versions should be separated by a period, but we will support other deliminators.
# Versions should be separated by a period, but we will support other delimiters.
# Versions should be limited to four fields: Major.Minor.Build.Update.
# Versions will be sorted as integers following the following pattern: Major.Minor.Build.Patch.
# Restrictions: 4 sections with max value of 65535. For example:65535.65535.65535.65535
Expand Down Expand Up @@ -258,7 +258,7 @@ Installers:
## Best Practices
The Id must be unique. You cannot have multiple submissions with the same Id.
Avoid creating multiple publisher folders. For example, do not create "Contoso Ltd." if there is already a "Contonso" folder.
Avoid creating multiple publisher folders. For example, do not create "Contoso Ltd." if there is already a "Contoso" folder.
All tools must support a silent install. If you have an executable that does not support a silent install, then we cannot provide that tool at this time. Provide feedback to the repo. If this is a restriction that you would like to see removed add an issue or up vote it.
My installer supports a silent install, but is not one of the supported InstallerTypes. How can I get it added to your repo. Ping us on the repo.
Expand Down
4 changes: 2 additions & 2 deletions src/AppInstallerCLICore/Argument.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace AppInstaller::CLI
case Args::Type::Language:
return Argument{ "lang", 'a', Args::Type::Language, Resource::String::LanguageArgumentDescription, ArgumentType::Standard, Visibility::Hidden };
case Args::Type::Log:
return Argument{ "log", 'o', Args::Type::Log, Resource::String::LogArgumentDesciption, ArgumentType::Standard };
return Argument{ "log", 'o', Args::Type::Log, Resource::String::LogArgumentDescription, ArgumentType::Standard };
case Args::Type::Override:
return Argument{ "override", None, Args::Type::Override, Resource::String::OverrideArgumentDescription, ArgumentType::Standard, Visibility::Help };
case Args::Type::InstallLocation:
Expand All @@ -69,7 +69,7 @@ namespace AppInstaller::CLI
case Args::Type::ValidateManifest:
return Argument{ "manifest", None, Args::Type::ValidateManifest, Resource::String::ValidateManifestArgumentDescription, ArgumentType::Positional, true };
case Args::Type::NoVT:
return Argument{ "no-vt", None, Args::Type::NoVT, Resource::String::NoVTArguementDescription, ArgumentType::Flag, Visibility::Hidden };
return Argument{ "no-vt", None, Args::Type::NoVT, Resource::String::NoVTArgumentDescription, ArgumentType::Flag, Visibility::Hidden };
case Args::Type::RainbowStyle:
return Argument{ "rainbow", None, Args::Type::RainbowStyle, Resource::String::RainbowArgumentDescription, ArgumentType::Flag, Visibility::Hidden };
case Args::Type::PlainStyle:
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/Command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ namespace AppInstaller::CLI

if (hasArguments)
{
infoOut << Resource::String::AvailableArguements << std::endl;
infoOut << Resource::String::AvailableArguments << std::endl;

size_t i = 0;
for (const auto& arg : GetArguments())
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/ExecutionArgs.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace AppInstaller::CLI::Execution
Tag,
Command,
Source, // Index source to be queried against
Count, // Maximun query results
Count, // Maximum query results
Exact, // Exact match required

// Manifest selection behavior after an app is found
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/ExecutionContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ namespace AppInstaller::CLI::Execution
void Terminate(HRESULT hr);

// Adds a value to the context data, or overwrites an existing entry.
// This must be used to create the intial data entry, but Get can be used to modify.
// This must be used to create the initial data entry, but Get can be used to modify.
template <Data D>
void Add(typename details::DataMapping<D>::value_t&& v)
{
Expand Down
6 changes: 3 additions & 3 deletions src/AppInstallerCLICore/Resources.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace AppInstaller::CLI::Resource
{
WINGET_DEFINE_RESOURCE_STRINGID(AdjoinedNotFlagError);
WINGET_DEFINE_RESOURCE_STRINGID(AdjoinedNotFoundError);
WINGET_DEFINE_RESOURCE_STRINGID(AvailableArguements);
WINGET_DEFINE_RESOURCE_STRINGID(AvailableArguments);
WINGET_DEFINE_RESOURCE_STRINGID(AvailableCommands);
WINGET_DEFINE_RESOURCE_STRINGID(AvailableOptions);
WINGET_DEFINE_RESOURCE_STRINGID(AvailableSubcommands);
Expand Down Expand Up @@ -61,7 +61,7 @@ namespace AppInstaller::CLI::Resource
WINGET_DEFINE_RESOURCE_STRINGID(LicenseAgreement);
WINGET_DEFINE_RESOURCE_STRINGID(Links);
WINGET_DEFINE_RESOURCE_STRINGID(LocationArgumentDescription);
WINGET_DEFINE_RESOURCE_STRINGID(LogArgumentDesciption);
WINGET_DEFINE_RESOURCE_STRINGID(LogArgumentDescription);
WINGET_DEFINE_RESOURCE_STRINGID(MainCopyrightNotice);
WINGET_DEFINE_RESOURCE_STRINGID(MainHomepage);
WINGET_DEFINE_RESOURCE_STRINGID(ManifestArgumentDescription);
Expand All @@ -74,7 +74,7 @@ namespace AppInstaller::CLI::Resource
WINGET_DEFINE_RESOURCE_STRINGID(MsixSignatureHashFailed);
WINGET_DEFINE_RESOURCE_STRINGID(NameArgumentDescription);
WINGET_DEFINE_RESOURCE_STRINGID(NoApplicableInstallers);
WINGET_DEFINE_RESOURCE_STRINGID(NoVTArguementDescription);
WINGET_DEFINE_RESOURCE_STRINGID(NoVTArgumentDescription);
WINGET_DEFINE_RESOURCE_STRINGID(Options);
WINGET_DEFINE_RESOURCE_STRINGID(OverrideArgumentDescription);
WINGET_DEFINE_RESOURCE_STRINGID(Package);
Expand Down
6 changes: 3 additions & 3 deletions src/AppInstallerCLICore/TableOutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ namespace AppInstaller::CLI::Execution
}
else
{
EvaulateAndFlushBuffer();
EvaluateAndFlushBuffer();
OutputLineToStream(line);
}
}

void Complete()
{
EvaulateAndFlushBuffer();
EvaluateAndFlushBuffer();
}

private:
Expand All @@ -79,7 +79,7 @@ namespace AppInstaller::CLI::Execution
std::vector<line_t> m_buffer;
bool m_bufferEvaluated = false;

void EvaulateAndFlushBuffer()
void EvaluateAndFlushBuffer()
{
if (m_bufferEvaluated)
{
Expand Down
4 changes: 2 additions & 2 deletions src/AppInstallerCLICore/Workflows/SourceFlow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,15 @@ namespace AppInstaller::CLI::Workflow

for (const auto& source : sources)
{
context.Reporter.Info() << "Reseting source: " << source.Name << " ...";
context.Reporter.Info() << "Resetting source: " << source.Name << " ...";
Repository::DropSource(source.Name);
context.Reporter.Info() << " Done." << std::endl;
}
}

void ResetAllSources(Execution::Context& context)
{
context.Reporter.Info() << "Reseting all sources ...";
context.Reporter.Info() << "Resetting all sources ...";
Repository::DropSource({});
context.Reporter.Info() << " Done." << std::endl;
}
Expand Down
6 changes: 3 additions & 3 deletions src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<data name="AdjoinedNotFoundError" xml:space="preserve">
<value>Adjoined flag alias not found</value>
</data>
<data name="AvailableArguements" xml:space="preserve">
<data name="AvailableArguments" xml:space="preserve">
<value>The following arguments are available:</value>
</data>
<data name="AvailableCommands" xml:space="preserve">
Expand Down Expand Up @@ -223,7 +223,7 @@
<data name="LocationArgumentDescription" xml:space="preserve">
<value>Location to install to (if supported)</value>
</data>
<data name="LogArgumentDesciption" xml:space="preserve">
<data name="LogArgumentDescription" xml:space="preserve">
<value>Log location (if supported)</value>
</data>
<data name="MainCopyrightNotice" xml:space="preserve">
Expand Down Expand Up @@ -263,7 +263,7 @@
<data name="NoApplicableInstallers" xml:space="preserve">
<value>No installers are applicable to the current system.</value>
</data>
<data name="NoVTArguementDescription" xml:space="preserve">
<data name="NoVTArgumentDescription" xml:space="preserve">
<value>Disables VirtualTerminal display</value>
<comment>{Locked="VirtualTerminal"}</comment>
</data>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Bad maniest. No Name
# Bad manifest. No Name
Id: microsoft.msixsdk
Version: 1.7.32
Publisher: Microsoft
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Bad maniest. Invalid Url
# Bad manifest. Invalid Url
Id: microsoft.msixsdk
Name: MSIX SDK
Version: 1.7.32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Minimum required IntallerType in Installers
# Minimum required InstallerType in Installers
Id: microsoft.msixsdk
Name: MSIX SDK
Version: 1.7.32
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLITests/WorkFlow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ TEST_CASE("ShellExecuteHandlerInstallerArgs", "[InstallFlow]")
{
std::ostringstream installOutput;
TestContext context{ installOutput, std::cin };
// Override switch specified. The whole arg passed to installer is overrided.
// Override switch specified. The whole arg passed to installer is overridden.
auto manifest = Manifest::CreateFromPath(TestDataFile("InstallerArgTest_Inno_WithSwitches.yaml"));
context.Args.AddArg(Execution::Args::Type::Silent);
context.Args.AddArg(Execution::Args::Type::Log, "MyLog.log");
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/Downloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ namespace AppInstaller::Utility
}
}

// Zone Indentifier stream name
// Zone Identifier stream name
// https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-fscc/6e3f7352-d11c-4d76-8c39-2516a9df36e8
std::filesystem::path motwPath(filePath);
motwPath += L":Zone.Identifier:$DATA";
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/HttpStream/HttpLocalCache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ using namespace winrt::Windows::Storage::Streams;
using namespace winrt::Windows::Security::Cryptography;

// Note: this class is used by the HttpRandomAccessStream which is passed to the AppxPackaging COM API
// All exceptions thrown accross dll boundaries should be WinRT exception not custom exceptions.
// All exceptions thrown across dll boundaries should be WinRT exception not custom exceptions.
// The HRESULTs will be mapped to UI error code by the appropriate component
namespace AppInstaller::Utility::HttpStream
{
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/Public/AppInstallerVersions.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace AppInstaller::Utility

// A channel string; existing solely to give a type.
//
// Compared lexographically.
// Compared lexicographically.
struct Channel
{
Channel(const std::string& channel) : m_channel(channel) {}
Expand Down
4 changes: 2 additions & 2 deletions src/AppInstallerCommonCore/Runtime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ namespace AppInstaller::Runtime

if (!version)
{
// In the extremely unlikely event of a failure, this is merely a senitinel value
// In the extremely unlikely event of a failure, this is merely a sentinel value
// to indicated such. The only other option is to completely prevent execution,
// which seems unnecessary.
return LocIndString{ "error" };
Expand All @@ -224,7 +224,7 @@ namespace AppInstaller::Runtime

if (!version)
{
// In the extremely unlikely event of a failure, this is merely a senitinel value
// In the extremely unlikely event of a failure, this is merely a sentinel value
// to indicated such. The only other option is to completely prevent execution,
// which seems unnecessary.
return LocIndString{ "error" };
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/Versions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ namespace AppInstaller::Utility
return true;
}

// else m_verson >= other.m_version
// else m_version >= other.m_version
return false;
}
}
4 changes: 2 additions & 2 deletions src/AppInstallerRepositoryCore/SQLiteWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ namespace AppInstaller::Repository::SQLite
// Enables the ICU integrations on this connection.
void EnableICU();

// Gets the last inerted rowid to the database.
// Gets the last inserted rowid to the database.
rowid_t GetLastInsertRowID();

// Gets the count of changed rows for the last executed statement.
Expand Down Expand Up @@ -216,7 +216,7 @@ namespace AppInstaller::Repository::SQLite
}

// Gets the entire row of values from the current row.
// The values requested *must* be those available starting from the first column, but trailing columns can be ommitted.
// The values requested *must* be those available starting from the first column, but trailing columns can be omitted.
template <typename... Values>
std::tuple<Values...> GetRow()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public bool UpdateManifest(string manifestPath, string relativePath)

// For now, modifying a manifest implies that the file didn't got moved in the repository. So only
// contents of the file are modified. However, in the future we might support moving which requires
// oldManifestPath, oldRelativePath, newManigestPath and oldManifestPath.
// oldManifestPath, oldRelativePath, newManifestPath and oldManifestPath.
AppInstallerSQLiteIndexUpdateManifest(
this.indexHandle,
manifestPath,
Expand Down

0 comments on commit d1bd5ce

Please sign in to comment.