Skip to content

Fixed https://github.com/NuGet/Home/issues/467 #1

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
danliu merged 2 commits into from
Sep 30, 2015
Merged

Fixed https://github.com/NuGet/Home/issues/467 #1

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
4c9d0d2
Fixed https://github.com/NuGet/Home/issues/467
danliu Sep 29, 2015
b6c1c7e
Make names consistent
danliu Sep 30, 2015
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 src/NuGet.Clients/PackageManagement.PowerShellCmdlets/Cmdlets/SyncPackageCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected override void ProcessRecordCore()
SubscribeToProgressEvents();
if (_projects.Count == 0)
{
LogCore(ProjectManagement.MessageLevel.Info, string.Format(CultureInfo.CurrentCulture, Resources.Cmdlets_NoProjectsToSyncPackage, Id));
LogCore(ProjectManagement.MessageLevel.Info, string.Format(CultureInfo.CurrentCulture, Resources.Cmdlet_NoProjectsToSyncPackage, Id));
}
else if (identity == null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet.Clients/PackageManagement.PowerShellCmdlets/Cmdlets/UpdatePackageCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private async Task UpdateOrReinstallSinglePackage()

if (!_isPackageInstalled)
{
Log(ProjectManagement.MessageLevel.Error, Resources.PackageNotInstalledInAnyProject, Id);
Log(ProjectManagement.MessageLevel.Error, Resources.Cmdlet_PackageNotInstalledInAnyProject, Id);
}
}
catch (Exception ex)
Expand Down
4 changes: 2 additions & 2 deletions src/NuGet.Clients/PackageManagement.PowerShellCmdlets/NuGetPowerShellBaseCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ public FileConflictAction ResolveFileConflict(string message)
new ChoiceDescription(Resources.Cmdlet_NoAll, Resources.Cmdlet_FileConflictNoAllHelp)
};

int choice = Host.UI.PromptForChoice(Resources.FileConflictTitle, message, choices, defaultChoice: 2);
int choice = Host.UI.PromptForChoice(Resources.Cmdlet_FileConflictTitle, message, choices, defaultChoice: 2);

Debug.Assert(choice >= 0 && choice < 4);
switch (choice)
Expand Down Expand Up @@ -921,7 +921,7 @@ public void ExecutePSScriptInternal(string path)
if (path != null)
{
string command = "& " + ProjectManagement.PathUtility.EscapePSPath(path) + " $__rootPath $__toolsPath $__package $__project";
LogCore(ProjectManagement.MessageLevel.Info, String.Format(CultureInfo.CurrentCulture, Resources.ExecutingScript, path));
LogCore(ProjectManagement.MessageLevel.Info, String.Format(CultureInfo.CurrentCulture, Resources.Cmdlet_ExecutingScript, path));

InvokeCommand.InvokeScript(command, false, PipelineResultTypes.Error, null, null);
}
Expand Down
Loading