Browse Source

Return the NuGet version number for the PowerShell host version.

pull/15/head
Matt Ward 14 years ago
parent
commit
2f3d89a313
  1. 1
      src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
  2. 1
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPowerShellHost.cs
  3. 24
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/NuGetVersion.cs
  4. 13
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageManagementConsoleHost.cs
  5. 3
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PowerShellHost.cs
  6. 7
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePowerShellHost.cs
  7. 7
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageManagementConsoleHost.cs
  8. 2
      src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs

1
src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj

@ -179,6 +179,7 @@ @@ -179,6 +179,7 @@
<Compile Include="Src\Scripting\IPackageScriptFactory.cs" />
<Compile Include="Src\Scripting\IPackageScriptFileName.cs" />
<Compile Include="Src\Scripting\IPackageScriptSession.cs" />
<Compile Include="Src\Scripting\NuGetVersion.cs" />
<Compile Include="Src\Scripting\PackageInitializeScript.cs" />
<Compile Include="Src\Scripting\PackageInitializeScriptFileName.cs" />
<Compile Include="Src\Scripting\PackageInstallScript.cs" />

1
src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPowerShellHost.cs

@ -9,6 +9,7 @@ namespace ICSharpCode.PackageManagement.Scripting @@ -9,6 +9,7 @@ namespace ICSharpCode.PackageManagement.Scripting
public interface IPowerShellHost
{
IList<string> ModulesToImport { get; }
Version Version { get; }
void SetRemoteSignedExecutionPolicy();
void UpdateFormatting(IEnumerable<string> formattingFiles);

24
src/AddIns/Misc/PackageManagement/Project/Src/Scripting/NuGetVersion.cs

@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Reflection;
using NuGet;
namespace ICSharpCode.PackageManagement.Scripting
{
public static class NuGetVersion
{
static readonly Version version;
static NuGetVersion()
{
AssemblyName name = typeof(PackageSource).Assembly.GetName();
version = name.Version;
}
public static Version Version {
get { return version; }
}
}
}

13
src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageManagementConsoleHost.cs

@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using ICSharpCode.AvalonEdit;
@ -23,7 +22,6 @@ namespace ICSharpCode.PackageManagement.Scripting @@ -23,7 +22,6 @@ namespace ICSharpCode.PackageManagement.Scripting
IPackageManagementAddInPath addinPath;
int autoIndentSize = 0;
string prompt = "PM> ";
Version nuGetVersion;
public PackageManagementConsoleHost(
IPackageManagementSolution solution,
@ -123,19 +121,10 @@ namespace ICSharpCode.PackageManagement.Scripting @@ -123,19 +121,10 @@ namespace ICSharpCode.PackageManagement.Scripting
void WriteNuGetVersionInfo()
{
string versionInfo = String.Format("NuGet {0}", GetNuGetVersion());
string versionInfo = String.Format("NuGet {0}", powerShellHost.Version);
WriteLine(versionInfo);
}
protected virtual Version GetNuGetVersion()
{
if (nuGetVersion == null) {
AssemblyName name = typeof(PackageSource).Assembly.GetName();
nuGetVersion = name.Version;
}
return nuGetVersion;
}
void WriteLine(string message)
{
ScriptingConsole.WriteLine(message, ScriptingStyle.Out);

3
src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PowerShellHost.cs

@ -21,7 +21,6 @@ namespace ICSharpCode.PackageManagement.Scripting @@ -21,7 +21,6 @@ namespace ICSharpCode.PackageManagement.Scripting
CultureInfo currentUICulture = Thread.CurrentThread.CurrentUICulture;
CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
Guid instanceId = Guid.NewGuid();
Version version = new Version(0, 1);
Runspace runspace;
PowerShellHostUserInterface userInterface;
List<string> modulesToImport = new List<string>();
@ -97,7 +96,7 @@ namespace ICSharpCode.PackageManagement.Scripting @@ -97,7 +96,7 @@ namespace ICSharpCode.PackageManagement.Scripting
}
public override Version Version {
get { return version; }
get { return NuGetVersion.Version; }
}
public override PSHostUserInterface UI {

7
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePowerShellHost.cs

@ -9,6 +9,11 @@ namespace PackageManagement.Tests.Helpers @@ -9,6 +9,11 @@ namespace PackageManagement.Tests.Helpers
{
public class FakePowerShellHost : IPowerShellHost
{
public FakePowerShellHost()
{
Version = new Version(1, 0);
}
public bool IsSetRemoteSignedExecutionPolicyCalled;
public void SetRemoteSignedExecutionPolicy()
@ -37,5 +42,7 @@ namespace PackageManagement.Tests.Helpers @@ -37,5 +42,7 @@ namespace PackageManagement.Tests.Helpers
{
FormattingFilesPassedToUpdateFormatting = formattingFiles;
}
public Version Version { get; set; }
}
}

7
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageManagementConsoleHost.cs

@ -51,13 +51,6 @@ namespace PackageManagement.Tests.Helpers @@ -51,13 +51,6 @@ namespace PackageManagement.Tests.Helpers
return FakeThread;
}
public Version VersionToReturnFromGetNuGetVersion = new Version("1.2");
protected override Version GetNuGetVersion()
{
return VersionToReturnFromGetNuGetVersion;
}
public string TextToReturnFromGetHelpInfo = String.Empty;
protected override string GetHelpInfo()

2
src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs

@ -218,7 +218,7 @@ namespace PackageManagement.Tests.Scripting @@ -218,7 +218,7 @@ namespace PackageManagement.Tests.Scripting
public void Run_TextDisplayedBeforeFirstPromptDisplayed_NuGetVersionDisplayed()
{
CreateHost();
host.VersionToReturnFromGetNuGetVersion = new Version("1.2.0.4");
powerShellHost.Version = new Version("1.2.0.4");
RunHost();
string expected = "NuGet 1.2.0.4";

Loading…
Cancel
Save