Skip to content

Change the more user visible strings to winget #105

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

Merged
JohnMcPMS merged 2 commits into from
May 6, 2020
Merged

Change the more user visible strings to winget #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88a55df
Change the more user visible strings to winget
JohnMcPMS May 6, 2020
91b82a7
Fix tests affected by name changes
JohnMcPMS May 6, 2020
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/Command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,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();
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/Core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
6 changes: 3 additions & 3 deletions src/AppInstallerCLIE2ETests/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLIE2ETests/SetUpFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
10 changes: 5 additions & 5 deletions src/AppInstallerCLIPackage/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

@jamespik jamespik May 6, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why dev?

@JohnMcPMS JohnMcPMS May 6, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original purpose of this package was to enable F5 scenarios inside of a package. If we decide to ship a standalone winget msix, we can reconsider or create a different project for that. But it is nice to have a package that can co-exist with the product.

In reply to: 421073051 [](ancestors = 421073051)

<Properties>
<DisplayName>App Installer CLI</DisplayName>
<DisplayName>WinGet Dev CLI</DisplayName>
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,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>
Expand All @@ -300,7 +300,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>
Expand Down
4 changes: 2 additions & 2 deletions src/AppInstallerCLITests/Run-TestsInPackage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -147,5 +147,5 @@ if ($ScriptWait)
Write-Host "Done"

Write-Host "Remove registered package"
Get-AppxPackage AppInstallerCLI | Remove-AppxPackage
Get-AppxPackage WinGetDevCLI | Remove-AppxPackage
}
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/Downloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/Runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions src/binver/binver/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down