Merge pull request #5741 from spboyer/master

Update help text for dotnet-add-package
This commit is contained in:
Piotr Puszkiewicz 2017-03-01 00:36:57 -08:00 committed by GitHub
commit a1d27b6843
10 changed files with 14 additions and 14 deletions

View file

@ -422,7 +422,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]
Installing 1.1.0-567890 (RTM) which is incompatible since 1.0.2 Installing 1.1.0-567890 (RTM) which is incompatible since 1.0.2
Note: User is unable to run apps targetting 1.0.1 or 1.0.2 until compatible version is installed. Note: User is unable to run apps targeting 1.0.1 or 1.0.2 until compatible version is installed.
``` ```
NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1
@ -445,7 +445,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]
Installing 1.0.0-rc2-123456 to a clean machine Installing 1.0.0-rc2-123456 to a clean machine
Note: User is unable to run apps targetting 1.0.0 until RTM is installed. Note: User is unable to run apps targeting 1.0.0 until RTM is installed.
``` ```
ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1
@ -455,7 +455,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]
Installing 1.0.1-rc1-234567 Installing 1.0.1-rc1-234567
Note: User is still unable to run apps targetting 1.0.0 until any 1.0.0+ RTM is installed. Note: User is still unable to run apps targeting 1.0.0 until any 1.0.0+ RTM is installed.
``` ```
NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1

View file

@ -174,7 +174,7 @@ namespace Microsoft.DotNet.Tools
return false; return false;
} }
public bool IsTargettingFramework(NuGetFramework framework) public bool IsTargetingFramework(NuGetFramework framework)
{ {
foreach (var tfm in GetTargetFrameworks()) foreach (var tfm in GetTargetFrameworks())
{ {

View file

@ -9,11 +9,11 @@ namespace Microsoft.DotNet.Tools.Add.PackageReference
public const string AppDescription = "Command to add package reference"; public const string AppDescription = "Command to add package reference";
public const string CmdPackageDescription = "Package references to add"; public const string CmdPackageDescription = "Package reference to add";
public const string SpecifyExactlyOnePackageReference = "Please specify one package reference to add."; public const string SpecifyExactlyOnePackageReference = "Please specify one package reference to add.";
public const string CmdFrameworkDescription = "Add reference only when targetting a specific framework"; public const string CmdFrameworkDescription = "Add reference only when targeting a specific framework";
public const string CmdNoRestoreDescription = "Add reference without performing restore preview and compatibility check."; public const string CmdNoRestoreDescription = "Add reference without performing restore preview and compatibility check.";

View file

@ -11,6 +11,6 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference
public const string AppHelpText = "Project to project references to add"; public const string AppHelpText = "Project to project references to add";
public const string CmdFrameworkDescription = "Add reference only when targetting a specific framework"; public const string CmdFrameworkDescription = "Add reference only when targeting a specific framework";
} }
} }

View file

@ -74,7 +74,7 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference
else else
{ {
var framework = NuGetFramework.Parse(frameworkString); var framework = NuGetFramework.Parse(frameworkString);
if (!msbuildProj.IsTargettingFramework(framework)) if (!msbuildProj.IsTargetingFramework(framework))
{ {
Reporter.Error.WriteLine(string.Format( Reporter.Error.WriteLine(string.Format(
CommonLocalizableStrings.ProjectDoesNotTargetFramework, CommonLocalizableStrings.ProjectDoesNotTargetFramework,

View file

@ -11,6 +11,6 @@ namespace Microsoft.DotNet.Tools.Remove.ProjectToProjectReference
public const string AppHelpText = "Project to project references to remove"; public const string AppHelpText = "Project to project references to remove";
public const string CmdFrameworkDescription = "Remove reference only when targetting a specific framework"; public const string CmdFrameworkDescription = "Remove reference only when targeting a specific framework";
} }
} }

View file

@ -223,7 +223,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
} }
[Fact] [Fact]
public void MigratingScriptsWithMultiTFMCreatesTargetWithIsCrossTargettingBuildNotEqualTrueCondition() public void MigratingScriptsWithMultiTFMCreatesTargetWithIsCrosstargetingBuildNotEqualTrueCondition()
{ {
var scriptMigrationRule = new MigrateScriptsRule(); var scriptMigrationRule = new MigrateScriptsRule();
ProjectRootElement mockProj = ProjectRootElement.Create(); ProjectRootElement mockProj = ProjectRootElement.Create();
@ -241,7 +241,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
} }
[Fact] [Fact]
public void MigratingScriptsWithSingleTFMDoesNotCreateTargetWithIsCrossTargettingBuild() public void MigratingScriptsWithSingleTFMDoesNotCreateTargetWithIsCrosstargetingBuild()
{ {
var scriptMigrationRule = new MigrateScriptsRule(); var scriptMigrationRule = new MigrateScriptsRule();
ProjectRootElement mockProj = ProjectRootElement.Create(); ProjectRootElement mockProj = ProjectRootElement.Create();

View file

@ -15,7 +15,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
{ {
public class GivenThatIWantToMigrateTFMs : TestBase public class GivenThatIWantToMigrateTFMs : TestBase
{ {
[Fact(Skip="Emitting this until x-targetting full support is in")] [Fact(Skip="Emitting this until x-targeting full support is in")]
public void MigratingNetcoreappProjectDoesNotPopulateTargetFrameworkIdentifierAndTargetFrameworkVersion() public void MigratingNetcoreappProjectDoesNotPopulateTargetFrameworkIdentifierAndTargetFrameworkVersion()
{ {
var testDirectory = Temp.CreateDirectory().Path; var testDirectory = Temp.CreateDirectory().Path;

View file

@ -23,7 +23,7 @@ Arguments:
Options: Options:
-h|--help Show help information -h|--help Show help information
-f|--framework <FRAMEWORK> Add reference only when targetting a specific framework -f|--framework <FRAMEWORK> Add reference only when targeting a specific framework
Additional Arguments: Additional Arguments:
Project to project references to add Project to project references to add

View file

@ -22,7 +22,7 @@ Arguments:
Options: Options:
-h|--help Show help information -h|--help Show help information
-f|--framework <FRAMEWORK> Remove reference only when targetting a specific framework -f|--framework <FRAMEWORK> Remove reference only when targeting a specific framework
Additional Arguments: Additional Arguments:
Project to project references to remove Project to project references to remove