commit 75daf410aa81f4339156258117876358ce8f5cf7
parent 345e6aac99a290823dba108a21e243952ca560f4
Author: JohnMcPMS <johnmcp@microsoft.com>
Date: Wed, 6 May 2020 14:13:47 -0700
Change the more user visible strings to winget (#105)
Diffstat:
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[](https://dev.azure.com/ms/pkg/_build/latest?definitionId=308&branchName=master)
+[](https://dev.azure.com/ms/winget-cli/_build/latest?definitionId=344&branchName=master)
# Contributing
diff --git a/src/AppInstallerCLICore/Command.cpp b/src/AppInstallerCLICore/Command.cpp
@@ -71,7 +71,7 @@ namespace AppInstaller::CLI
}
// Output the command preamble and command chain
- infoOut << "usage: <exe>" << commandChain;
+ infoOut << "usage: winget" << commandChain;
auto commands = GetCommands();
auto arguments = GetArguments();
diff --git a/src/AppInstallerCLICore/Core.cpp b/src/AppInstallerCLICore/Core.cpp
@@ -63,7 +63,7 @@ namespace AppInstaller::CLI
utf8Args.emplace_back(Utility::ConvertToUTF8(argv[i]));
}
- AICLI_LOG(CLI, Info, << "AppInstaller CLI invoked with arguments:" << [&]() {
+ AICLI_LOG(CLI, Info, << "WinGet invoked with arguments:" << [&]() {
std::stringstream strstr;
for (const auto& arg : utf8Args)
{
diff --git a/src/AppInstallerCLIE2ETests/Constants.cs b/src/AppInstallerCLIE2ETests/Constants.cs
@@ -20,9 +20,9 @@ namespace AppInstallerCLIE2ETests
public const string IndexPackageRootCert = "IndexPackageIntRoot.cer";
public const string IndexPackageRootCertThumbprint = "d17697cc206ed26e1a51f5bb96e9356d6d610b74";
- public const string AICLIPackageFamilyName = "AppInstallerCLI_8wekyb3d8bbwe";
- public const string AICLIPackageName = "AppInstallerCLI";
- public const string AICLIAppId = "AppInst";
+ public const string AICLIPackageFamilyName = "WinGetDevCLI_8wekyb3d8bbwe";
+ public const string AICLIPackageName = "WinGetDevCLI";
+ public const string AICLIAppId = "WinGetDev";
public const string TestPackage = "TestPackage.msix";
diff --git a/src/AppInstallerCLIE2ETests/SetUpFixture.cs b/src/AppInstallerCLIE2ETests/SetUpFixture.cs
@@ -38,7 +38,7 @@ namespace AppInstallerCLIE2ETests
if (TestCommon.PackagedContext)
{
// For packaged context, default to AppExecutionAlias
- TestCommon.AICLIPath = "AppInst.exe";
+ TestCommon.AICLIPath = "WinGetDev.exe";
}
else
{
diff --git a/src/AppInstallerCLIPackage/Package.appxmanifest b/src/AppInstallerCLIPackage/Package.appxmanifest
@@ -6,9 +6,9 @@
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap uap3 uap5 rescap">
- <Identity Name="AppInstallerCLI" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="0.0.0.2" />
+ <Identity Name="WinGetDevCLI" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="0.0.0.2" />
<Properties>
- <DisplayName>App Installer CLI</DisplayName>
+ <DisplayName>WinGet Dev CLI</DisplayName>
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>
@@ -21,8 +21,8 @@
<Resource Language="x-generate" />
</Resources>
<Applications>
- <Application Id="AppInst" Executable="AppInstallerCLI\AppInstallerCLI.exe" EntryPoint="Windows.FullTrustApplication">
- <uap:VisualElements DisplayName="App Installer Client" Square150x150Logo="Images\Square150x150Logo.png" Square44x44Logo="Images\Square44x44Logo.png" Description="The App Installer client application." BackgroundColor="#0078d7" AppListEntry="none" />
+ <Application Id="WinGetDev" Executable="AppInstallerCLI\AppInstallerCLI.exe" EntryPoint="Windows.FullTrustApplication">
+ <uap:VisualElements DisplayName="WinGet Dev Client" Square150x150Logo="Images\Square150x150Logo.png" Square44x44Logo="Images\Square44x44Logo.png" Description="The WinGet dev client." BackgroundColor="#0078d7" AppListEntry="none" />
<Extensions>
<uap3:Extension Category="windows.appExtensionHost">
<uap3:AppExtensionHost>
@@ -31,7 +31,7 @@
</uap3:Extension>
<uap5:Extension Category="windows.appExecutionAlias">
<uap5:AppExecutionAlias>
- <uap5:ExecutionAlias Alias="AppInst.exe" />
+ <uap5:ExecutionAlias Alias="WinGetDev.exe" />
</uap5:AppExecutionAlias>
</uap5:Extension>
</Extensions>
diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -286,7 +286,7 @@
<value>Remove current sources</value>
</data>
<data name="SourceResetCommandLongDescription" xml:space="preserve">
- <value>his command drops existing sources, potentially leaving any local data behind. Without any argument, it will drop all sources and add the defaults. If a named source is provided, only that source will be dropped.</value>
+ <value>This command drops existing sources, potentially leaving any local data behind. Without any argument, it will drop all sources and add the defaults. If a named source is provided, only that source will be dropped.</value>
</data>
<data name="SourceResetCommandShortDescription" xml:space="preserve">
<value>Reset sources</value>
@@ -304,7 +304,7 @@
<value>Filter results by tag</value>
</data>
<data name="ToolDescription" xml:space="preserve">
- <value>AppInstaller command line utility enables installing applications from the command line.</value>
+ <value>WinGet command line utility enables installing applications from the command line.</value>
</data>
<data name="ToolInfoArgumentDescription" xml:space="preserve">
<value>Display general info of the tool</value>
diff --git a/src/AppInstallerCLITests/Run-TestsInPackage.ps1 b/src/AppInstallerCLITests/Run-TestsInPackage.ps1
@@ -129,7 +129,7 @@ if ($Wait)
Write-Host "Executing tests at path: $Local:TestExePath"
Write-Host "Executing tests with args: $Local:TestArgs"
-Invoke-CommandInDesktopPackage -PackageFamilyName AppInstallerCLI_8wekyb3d8bbwe -AppId AppInst -Command $Local:TestExePath -Args $Local:TestArgs
+Invoke-CommandInDesktopPackage -PackageFamilyName WinGetDevCLI_8wekyb3d8bbwe -AppId WinGetDev -Command $Local:TestExePath -Args $Local:TestArgs
if ($ScriptWait)
{
@@ -147,5 +147,5 @@ if ($ScriptWait)
Write-Host "Done"
Write-Host "Remove registered package"
- Get-AppxPackage AppInstallerCLI | Remove-AppxPackage
+ Get-AppxPackage WinGetDevCLI | Remove-AppxPackage
}
\ No newline at end of file
diff --git a/src/AppInstallerCommonCore/Downloader.cpp b/src/AppInstallerCommonCore/Downloader.cpp
@@ -22,7 +22,7 @@ namespace AppInstaller::Utility
AICLI_LOG(Core, Info, << "Downloading from url: " << url);
wil::unique_hinternet session(InternetOpenA(
- "appinstaller-cli",
+ "winget-cli",
INTERNET_OPEN_TYPE_PRECONFIG,
NULL,
NULL,
diff --git a/src/AppInstallerCommonCore/Runtime.cpp b/src/AppInstallerCommonCore/Runtime.cpp
@@ -78,7 +78,7 @@ namespace AppInstaller::Runtime
localAppDataPath.resize(charCount - 1);
std::filesystem::path result = localAppDataPath;
- result /= "Microsoft/AppInstaller";
+ result /= "Microsoft/WinGet";
#ifndef AICLI_DISABLE_TEST_HOOKS
if (!s_Settings_TestHook_ForcedContainerPrepend.empty())
diff --git a/src/binver/binver/version.h b/src/binver/binver/version.h
@@ -6,14 +6,14 @@
#define VERSION_REVISION 0
#define VERSION_BUILD 2
-#define VER_FILE_DESCRIPTION_STR "App Installer CLI"
+#define VER_FILE_DESCRIPTION_STR "WinGet CLI"
#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
#define VER_FILE_VERSION_STR STRINGIZE(VERSION_MAJOR) \
"." STRINGIZE(VERSION_MINOR) \
"." STRINGIZE(VERSION_REVISION) \
"." STRINGIZE(VERSION_BUILD) \
-#define VER_PRODUCTNAME_STR "App Installer CLI"
+#define VER_PRODUCTNAME_STR "WinGet CLI"
#define VER_PRODUCT_VERSION VER_FILE_VERSION
#define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR
#define VER_ORIGINAL_FILENAME_STR "AppInstallerCLI.exe"
