From 75daf410aa81f4339156258117876358ce8f5cf7 Mon Sep 17 00:00:00 2001 From: JohnMcPMS Date: Wed, 6 May 2020 14:13:47 -0700 Subject: [PATCH] Change the more user visible strings to winget (#105) --- README.md | 2 +- src/AppInstallerCLICore/Command.cpp | 2 +- src/AppInstallerCLICore/Core.cpp | 2 +- src/AppInstallerCLIE2ETests/Constants.cs | 6 +++--- src/AppInstallerCLIE2ETests/SetUpFixture.cs | 2 +- src/AppInstallerCLIPackage/Package.appxmanifest | 10 +++++----- .../Shared/Strings/en-us/winget.resw | 4 ++-- src/AppInstallerCLITests/Run-TestsInPackage.ps1 | 4 ++-- src/AppInstallerCommonCore/Downloader.cpp | 2 +- src/AppInstallerCommonCore/Runtime.cpp | 2 +- src/binver/binver/version.h | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index c53a32ce635d3..d52b91eb785bd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://dev.azure.com/ms/pkg/_apis/build/status/microsoft.appinstaller-cli?branchName=master)](https://dev.azure.com/ms/pkg/_build/latest?definitionId=308&branchName=master) +[![Build Status](https://dev.azure.com/ms/winget-cli/_apis/build/status/microsoft.winget-cli?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 index 084e611472115..bede35f5d00f2 100644 --- 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: " << commandChain; + infoOut << "usage: winget" << commandChain; auto commands = GetCommands(); auto arguments = GetArguments(); diff --git a/src/AppInstallerCLICore/Core.cpp b/src/AppInstallerCLICore/Core.cpp index 2cbf2ea47e1d9..7a722b22bfada 100644 --- 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 index c75d4fa04395e..cfef4401c3f60 100644 --- a/src/AppInstallerCLIE2ETests/Constants.cs +++ b/src/AppInstallerCLIE2ETests/Constants.cs @@ -20,9 +20,9 @@ public class Constants 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 index c210c068e305e..ef6f6e6ccaadf 100644 --- a/src/AppInstallerCLIE2ETests/SetUpFixture.cs +++ b/src/AppInstallerCLIE2ETests/SetUpFixture.cs @@ -38,7 +38,7 @@ public void Setup() 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 index 93c97fd203bf9..cb71006ccb4bb 100644 --- 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"> - + - App Installer CLI + WinGet Dev CLI Microsoft Corporation Images\StoreLogo.png @@ -21,8 +21,8 @@ - - + + @@ -31,7 +31,7 @@ - + diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw index e1405385f22c0..82e48290a711e 100644 --- a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw +++ b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw @@ -286,7 +286,7 @@ Remove current sources - 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. + 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. Reset sources @@ -304,7 +304,7 @@ Filter results by tag - AppInstaller command line utility enables installing applications from the command line. + WinGet command line utility enables installing applications from the command line. Display general info of the tool diff --git a/src/AppInstallerCLITests/Run-TestsInPackage.ps1 b/src/AppInstallerCLITests/Run-TestsInPackage.ps1 index 4b9fb243b5fcf..f6c950d0656f7 100644 --- 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 index d02f0a9c11023..774bb781c413f 100644 --- 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 index aa992872e334f..8598365b61054 100644 --- 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 index ab9b98e71ba64..99b7959b0f703 100644 --- 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"