mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #6422 from livarcocc/merge_release_200

Browse source 
Merge release/2.0.0 back into master
This commit is contained in:
Livar 2017-04-26 13:23:42 -07:00 • committed by GitHub
commit c9e0989152
5 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NuGet.Config
View file

@ -5,7 +5,7 @@
<clear /> <clear />
<add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" /> <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" /> <add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> <add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" /> <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" /> <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />

10
build/DependencyVersions.props
View file

@ -11,11 +11,11 @@
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion> <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion> <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion> <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170421-198</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta2-20170425-201</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170421-198</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta2-20170425-203</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170421-198</TemplateEngineTemplate2_0Version> <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170425-203</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview2-002081</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.0.0-preview1-002088</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview2-002081</DependencyModelVersion> <DependencyModelVersion>2.0.0-preview1-002088</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
</PropertyGroup> </PropertyGroup>

7
src/dotnet/CommonLocalizableStrings.cs
View file

@ -185,5 +185,12 @@ namespace Microsoft.DotNet.Tools
public const string ProjectNotCompatibleWithFrameworks = "Project `{0}` cannot be added due to incompatible targeted frameworks between the two projects. Please review the project you are trying to add and verify that is compatible with the following targets:"; public const string ProjectNotCompatibleWithFrameworks = "Project `{0}` cannot be added due to incompatible targeted frameworks between the two projects. Please review the project you are trying to add and verify that is compatible with the following targets:";
public const string ProjectDoesNotTargetFramework = "Project `{0}` does not target framework `{1}`."; public const string ProjectDoesNotTargetFramework = "Project `{0}` does not target framework `{1}`.";
public const string ProjectCouldNotBeEvaluated = "Project `{0}` could not be evaluated. Evaluation failed with following error:\n{1}"; public const string ProjectCouldNotBeEvaluated = "Project `{0}` could not be evaluated. Evaluation failed with following error:\n{1}";
/// common options
public const string VerbosityOptionDescription = "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]";
public const string FrameworkOptionDescription = "Target framework to publish for. The target framework has to be specified in the project file.";
public const string RuntimeOptionDescription = "Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependent app.";
public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default for most projects is \"Debug\".";
public const string CmdVersionSuffixDescription = "Defines the value for the $(VersionSuffix) property in the project.";
} }
} }

13
src/dotnet/CommonOptions.cs
View file

@ -3,6 +3,7 @@ using System.IO;
using System.Linq; using System.Linq;
using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Tools.Common; using Microsoft.DotNet.Tools.Common;
using Microsoft.DotNet.Tools;
namespace Microsoft.DotNet.Cli namespace Microsoft.DotNet.Cli
{ {
@ -18,7 +19,7 @@ namespace Microsoft.DotNet.Cli
public static Option VerbosityOption() => public static Option VerbosityOption() =>
Create.Option( Create.Option(
"-v|--verbosity", "-v|--verbosity",
"Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]", CommonLocalizableStrings.VerbosityOptionDescription,
Accept.AnyOneOf( Accept.AnyOneOf(
"q", "quiet", "q", "quiet",
"m", "minimal", "m", "minimal",
@ -30,7 +31,7 @@ namespace Microsoft.DotNet.Cli
public static Option FrameworkOption() => public static Option FrameworkOption() =>
Create.Option( Create.Option(
"-f|--framework", "-f|--framework",
"Target framework to publish for. The target framework has to be specified in the project file.", CommonLocalizableStrings.FrameworkOptionDescription,
Accept.ExactlyOneArgument() Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile()) .WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile())
.With(name: "FRAMEWORK") .With(name: "FRAMEWORK")
@ -39,7 +40,7 @@ namespace Microsoft.DotNet.Cli
public static Option RuntimeOption() => public static Option RuntimeOption() =>
Create.Option( Create.Option(
"-r|--runtime", "-r|--runtime",
"Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependent app.", CommonLocalizableStrings.RuntimeOptionDescription,
Accept.ExactlyOneArgument() Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile()) .WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
.With(name: "RUNTIME_IDENTIFIER") .With(name: "RUNTIME_IDENTIFIER")
@ -47,8 +48,8 @@ namespace Microsoft.DotNet.Cli
public static Option ConfigurationOption() => public static Option ConfigurationOption() =>
Create.Option( Create.Option(
"-c|--configuration", "-c|--configuration",
"Configuration to use for building the project. Default for most projects is \"Debug\".", CommonLocalizableStrings.ConfigurationOptionDescription,
Accept.ExactlyOneArgument() Accept.ExactlyOneArgument()
.With(name: "CONFIGURATION") .With(name: "CONFIGURATION")
.WithSuggestionsFrom("DEBUG", "RELEASE") .WithSuggestionsFrom("DEBUG", "RELEASE")
@ -57,7 +58,7 @@ namespace Microsoft.DotNet.Cli
public static Option VersionSuffixOption() => public static Option VersionSuffixOption() =>
Create.Option( Create.Option(
"--version-suffix", "--version-suffix",
"Defines the value for the $(VersionSuffix) property in the project.", CommonLocalizableStrings.CmdVersionSuffixDescription,
Accept.ExactlyOneArgument() Accept.ExactlyOneArgument()
.With(name: "VERSION_SUFFIX") .With(name: "VERSION_SUFFIX")
.ForwardAsSingle(o => $"/p:VersionSuffix={o.Arguments.Single()}")); .ForwardAsSingle(o => $"/p:VersionSuffix={o.Arguments.Single()}"));

2
src/dotnet/commands/dotnet-restore/Program.cs
View file

@ -23,8 +23,6 @@ namespace Microsoft.DotNet.Tools.Restore
{ {
DebugHelper.HandleDebugSwitch(ref args); DebugHelper.HandleDebugSwitch(ref args);
Reporter.Output.WriteLine(string.Join(" ", args));
var parser = Parser.Instance; var parser = Parser.Instance;
var result = parser.ParseFrom("dotnet restore", args); var result = parser.ParseFrom("dotnet restore", args);