From 83f3a3ec86841c68f5295d406a85581c68a69cca Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 12 Apr 2017 16:03:45 -0700 Subject: [PATCH 01/13] Fix dotnet run double dash passing arguments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When run “dotnet run -- foo”, foo should be the argument passed to the subject app. After replacing the original parser, dotnet-run did not utilize the “unparsedtoken” of the parsed result. To append unparsedtoken to RunCommand’s argument is not straight forward. RunCommand has an “immutable constructor”, which is a good thing, so I made update RunCommand’s argument following the immutable pattern -- create a new object with the original field but only change the arguments. I also made these filed private set. --- .../TestProjects/MSBuildTestApp/Program.cs | 4 ++ .../commands/dotnet-complete/ParseCommand.cs | 7 +++- src/dotnet/commands/dotnet-run/Program.cs | 23 +++++++---- src/dotnet/commands/dotnet-run/RunCommand.cs | 38 ++++++++++++++++--- .../commands/dotnet-run/RunCommandParser.cs | 16 ++++---- .../GivenDotnetRunRunsCsProj.cs | 19 ++++++++++ .../ParserTests/RunParserTests.cs | 29 ++++++++++++++ 7 files changed, 115 insertions(+), 21 deletions(-) create mode 100644 test/dotnet.Tests/ParserTests/RunParserTests.cs diff --git a/TestAssets/TestProjects/MSBuildTestApp/Program.cs b/TestAssets/TestProjects/MSBuildTestApp/Program.cs index 20b3f028d..353ad5fbd 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/Program.cs +++ b/TestAssets/TestProjects/MSBuildTestApp/Program.cs @@ -9,6 +9,10 @@ namespace MSBuildTestApp { public static void Main(string[] args) { + if (args.Length > 0) + { + Console.WriteLine("echo args:"+ String.Join(";", args)); + } Console.WriteLine("Hello World!"); } } diff --git a/src/dotnet/commands/dotnet-complete/ParseCommand.cs b/src/dotnet/commands/dotnet-complete/ParseCommand.cs index 4a09e0468..dc86dab3d 100644 --- a/src/dotnet/commands/dotnet-complete/ParseCommand.cs +++ b/src/dotnet/commands/dotnet-complete/ParseCommand.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; @@ -24,6 +24,11 @@ namespace Microsoft.DotNet.Cli Console.WriteLine(result.Diagram()); + if (result.UnparsedTokens.Any()) { + Console.WriteLine("Unparsed Tokens: "); + Console.WriteLine(string.Join(" ", (result.UnparsedTokens))); + } + var optionValuesToBeForwarded = result.AppliedCommand() .OptionValuesToBeForwarded(); if (optionValuesToBeForwarded.Any()) diff --git a/src/dotnet/commands/dotnet-run/Program.cs b/src/dotnet/commands/dotnet-run/Program.cs index 6bfaffefa..75c37cdca 100644 --- a/src/dotnet/commands/dotnet-run/Program.cs +++ b/src/dotnet/commands/dotnet-run/Program.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.DotNet.Cli.CommandLine; +using System.Collections.Generic; +using System.Linq; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli; using Parser = Microsoft.DotNet.Cli.Parser; @@ -13,13 +13,22 @@ namespace Microsoft.DotNet.Tools.Run { public static RunCommand FromArgs(string[] args, string msbuildPath = null) { - var parser = Parser.Instance; - - var result = parser.ParseFrom("dotnet run", args); + var result = Parser.Instance.ParseFrom("dotnet run", args); result.ShowHelpOrErrorIfAppropriate(); - return result["dotnet"]["run"].Value(); + var runCommand = result["dotnet"]["run"].Value(); + return IncludingArgumentsAfterDoubleDash(runCommand, result.UnparsedTokens); + } + + private static RunCommand IncludingArgumentsAfterDoubleDash( + RunCommand runCommand, + IEnumerable unparsedTokens) + { + return runCommand.MakeNewWithReplaced( + args: runCommand.Args + .Concat(unparsedTokens) + .ToList()); } public static int Run(string[] args) @@ -27,7 +36,7 @@ namespace Microsoft.DotNet.Tools.Run DebugHelper.HandleDebugSwitch(ref args); RunCommand cmd; - + try { cmd = FromArgs(args); diff --git a/src/dotnet/commands/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs index 240b3971f..5a60765ee 100644 --- a/src/dotnet/commands/dotnet-run/RunCommand.cs +++ b/src/dotnet/commands/dotnet-run/RunCommand.cs @@ -13,11 +13,11 @@ namespace Microsoft.DotNet.Tools.Run { public partial class RunCommand { - public string Configuration { get; set; } - public string Framework { get; set; } - public bool NoBuild { get; set; } - public string Project { get; set; } - public IReadOnlyCollection Args { get; set; } + public string Configuration { get; private set; } + public string Framework { get; private set; } + public bool NoBuild { get; private set; } + public string Project { get; private set; } + public IReadOnlyCollection Args { get; private set; } private List _args; private bool ShouldBuild => !NoBuild; @@ -38,6 +38,34 @@ namespace Microsoft.DotNet.Tools.Run .ExitCode; } + public RunCommand(string configuration, + string framework, + bool noBuild, + string project, + IReadOnlyCollection args) + { + Configuration = configuration; + Framework = framework; + NoBuild = noBuild; + Project = project; + Args = args; + } + + public RunCommand MakeNewWithReplaced(string configuration = null, + string framework = null, + bool? noBuild = null, + string project = null, + IReadOnlyCollection args = null) + { + return new RunCommand( + configuration ?? this.Configuration, + framework ?? this.Framework, + noBuild ?? this.NoBuild, + project ?? this.Project, + args ?? this.Args + ); + } + private void EnsureProjectIsBuilt() { List buildArgs = new List(); diff --git a/src/dotnet/commands/dotnet-run/RunCommandParser.cs b/src/dotnet/commands/dotnet-run/RunCommandParser.cs index db6c64a70..54f439d79 100644 --- a/src/dotnet/commands/dotnet-run/RunCommandParser.cs +++ b/src/dotnet/commands/dotnet-run/RunCommandParser.cs @@ -15,14 +15,14 @@ namespace Microsoft.DotNet.Cli LocalizableStrings.AppFullName, treatUnmatchedTokensAsErrors: false, arguments: Accept.ZeroOrMoreArguments() - .MaterializeAs(o => new RunCommand - { - Configuration = o.SingleArgumentOrDefault("--configuration"), - Framework = o.SingleArgumentOrDefault("--framework"), - NoBuild = o.HasOption("--no-build"), - Project = o.SingleArgumentOrDefault("--project"), - Args = o.Arguments - }), + .MaterializeAs(o => new RunCommand + ( + configuration: o.SingleArgumentOrDefault("--configuration"), + framework: o.SingleArgumentOrDefault("--framework"), + noBuild: o.HasOption("--no-build"), + project: o.SingleArgumentOrDefault("--project"), + args: o.Arguments + )), options: new[] { CommonOptions.HelpOption(), diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 86d9fb0e5..8ce1730be 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -181,5 +181,24 @@ namespace Microsoft.DotNet.Cli.Run.Tests .Should().Fail() .And.HaveStdErrContaining("--framework"); } + + [Fact] + public void ItCanPassArgumentsToSubjectAppByDoubleDash() + { + const string testAppName = "MSBuildTestApp"; + var testInstance = TestAssets.Get(testAppName) + .CreateInstance() + .WithSourceFiles() + .WithRestoreFiles(); + + var testProjectDirectory = testInstance.Root.FullName; + + new RunCommand() + .WithWorkingDirectory(testProjectDirectory) + .ExecuteWithCapturedOutput("-- foo bar baz") + .Should() + .Pass() + .And.HaveStdOutContaining("echo args:foo;bar;baz"); + } } } diff --git a/test/dotnet.Tests/ParserTests/RunParserTests.cs b/test/dotnet.Tests/ParserTests/RunParserTests.cs new file mode 100644 index 000000000..6fdee951b --- /dev/null +++ b/test/dotnet.Tests/ParserTests/RunParserTests.cs @@ -0,0 +1,29 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Linq; +using FluentAssertions; +using Microsoft.DotNet.Tools.Run; +using Xunit; +using Xunit.Abstractions; +using System; + +namespace Microsoft.DotNet.Tests.ParserTests +{ + public class RunParserTests + { + public RunParserTests(ITestOutputHelper output) + { + this.output = output; + } + + private readonly ITestOutputHelper output; + + [Fact] + public void RunParserCanGetArguementFromDoubleDash() + { + var runCommand = RunCommand.FromArgs(new[]{ "--", "foo" }); + runCommand.Args.Single().Should().Be("foo"); + } + } +} From f56306cc62a06c9e9024f13a8d4824021e943caf Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 14 Apr 2017 09:40:46 -0700 Subject: [PATCH 02/13] Adding a CLI Test: Execute a 1.0 tool in a netcoreapp1.1 project https://github.com/dotnet/cli/issues/6229 --- Microsoft.DotNet.Cli.sln | 51 +++++++++++++++++++ .../Program.cs | 15 ++++++ ...tputsframeworkversion-netcoreapp1.0.csproj | 15 ++++++ .../TestAppWithCLIToolReferences/NuGet.Config | 6 +++ .../TestAppWithCLIToolReferences/Program.cs | 15 ++++++ .../TestAppWithCLIToolReferences.csproj | 14 +++++ build/test/TestPackageProjects.targets | 9 ++++ ...ntToBeBackwardsCompatibleWith1xProjects.cs | 19 +++++++ 8 files changed, 144 insertions(+) create mode 100644 TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/Program.cs create mode 100644 TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/dotnet-outputsframeworkversion-netcoreapp1.0.csproj create mode 100644 TestAssets/TestProjects/TestAppWithCLIToolReferences/NuGet.Config create mode 100644 TestAssets/TestProjects/TestAppWithCLIToolReferences/Program.cs create mode 100644 TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index c18e98378..08da39cfa 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -226,6 +226,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-back-compat.Tests", "test\dotnet-back-compat.Tests\dotnet-back-compat.Tests.csproj", "{A4C198B4-D46E-4CA8-87DF-B2B206DCCAE6}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-outputsframeworkversion-netcoreapp1.0", "TestAssets\TestPackages\dotnet-outputsframeworkversion\dotnet-outputsframeworkversion-netcoreapp1.0\dotnet-outputsframeworkversion-netcoreapp1.0.csproj", "{3F7D56A3-A280-467E-8916-C18659C243BA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -962,6 +964,30 @@ Global {BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}.RelWithDebInfo|x86.Build.0 = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Debug|x64.ActiveCfg = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Debug|x64.Build.0 = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Debug|x86.ActiveCfg = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Debug|x86.Build.0 = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Release|Any CPU.Build.0 = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Release|x64.ActiveCfg = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Release|x64.Build.0 = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Release|x86.ActiveCfg = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.Release|x86.Build.0 = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {8AA88E83-6A98-4AD6-86EB-2ED4F6EDA17F}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {726D2CB9-80E5-4496-9C86-910AC452C45E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {726D2CB9-80E5-4496-9C86-910AC452C45E}.Debug|Any CPU.Build.0 = Debug|Any CPU {726D2CB9-80E5-4496-9C86-910AC452C45E}.Debug|x64.ActiveCfg = Release|Any CPU @@ -1538,6 +1564,30 @@ Global {A4C198B4-D46E-4CA8-87DF-B2B206DCCAE6}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {A4C198B4-D46E-4CA8-87DF-B2B206DCCAE6}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {A4C198B4-D46E-4CA8-87DF-B2B206DCCAE6}.RelWithDebInfo|x86.Build.0 = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Debug|x64.ActiveCfg = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Debug|x64.Build.0 = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Debug|x86.Build.0 = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Release|Any CPU.Build.0 = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Release|x64.ActiveCfg = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Release|x64.Build.0 = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Release|x86.ActiveCfg = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.Release|x86.Build.0 = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {3F7D56A3-A280-467E-8916-C18659C243BA}.RelWithDebInfo|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1607,5 +1657,6 @@ Global {3275D006-54C8-4C64-A537-B9941C5D2F0C} = {89905EC4-BC0F-443B-8ADF-691321F10108} {DE4D1AEB-871B-4E7C-945A-453F9A490C06} = {89905EC4-BC0F-443B-8ADF-691321F10108} {A4C198B4-D46E-4CA8-87DF-B2B206DCCAE6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {3F7D56A3-A280-467E-8916-C18659C243BA} = {1AB5B24B-B317-4142-A5D1-A6E84F15BA34} EndGlobalSection EndGlobal diff --git a/TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/Program.cs b/TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/Program.cs new file mode 100644 index 000000000..02952b8b4 --- /dev/null +++ b/TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/Program.cs @@ -0,0 +1,15 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; + +namespace ConsoleApplication +{ + public class Program + { + public static void Main() + { + Console.WriteLine("netcoreapp1.0"); + } + } +} diff --git a/TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/dotnet-outputsframeworkversion-netcoreapp1.0.csproj b/TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/dotnet-outputsframeworkversion-netcoreapp1.0.csproj new file mode 100644 index 000000000..17c0af923 --- /dev/null +++ b/TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0/dotnet-outputsframeworkversion-netcoreapp1.0.csproj @@ -0,0 +1,15 @@ + + + + + netcoreapp1.0 + dotnet-outputsframeworkversion-netcoreapp1.0 + Exe + 1.1.1 + + + + $(ProjectRuntimeConfigFilePath) + + + diff --git a/TestAssets/TestProjects/TestAppWithCLIToolReferences/NuGet.Config b/TestAssets/TestProjects/TestAppWithCLIToolReferences/NuGet.Config new file mode 100644 index 000000000..b8e876fcb --- /dev/null +++ b/TestAssets/TestProjects/TestAppWithCLIToolReferences/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/TestAssets/TestProjects/TestAppWithCLIToolReferences/Program.cs b/TestAssets/TestProjects/TestAppWithCLIToolReferences/Program.cs new file mode 100644 index 000000000..2130cd0a7 --- /dev/null +++ b/TestAssets/TestProjects/TestAppWithCLIToolReferences/Program.cs @@ -0,0 +1,15 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; + +namespace ConsoleApplication +{ + public class Program + { + public static void Main(string[] args) + { + Console.WriteLine("Hello World!"); + } + } +} diff --git a/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj b/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj new file mode 100644 index 000000000..c684ab90b --- /dev/null +++ b/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj @@ -0,0 +1,14 @@ + + + + + Exe + netcoreapp1.1 + $(CLI_SharedFrameworkVersion) + netcoreapp1.1 + + + + + + \ No newline at end of file diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index 88b80d3b4..986fc569a 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -118,6 +118,15 @@ True + + dotnet-outputsframeworkversion-netcoreapp1.0 + dotnet-outputsframeworkversion-netcoreapp1.0.csproj + True + True + 1.0.0 + + True + dotnet-portable dotnet-portable.csproj diff --git a/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs b/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs index f3537bc79..5b6ff3ebf 100644 --- a/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs +++ b/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs @@ -78,6 +78,25 @@ namespace Microsoft.DotNet.Cli.Build.Tests .Should().Pass(); } + [Theory] + [InlineData("netcoreapp1.0")] + public void ItRunsABackwardsVersionedTool(string target) + { + var testInstance = TestAssets.Get("TestAppWithCLIToolReferences") + .CreateInstance() + .WithSourceFiles() + .WithRestoreFiles(); + + var testProjectDirectory = testInstance.Root; + + new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) + .WithWorkingDirectory(testInstance.Root) + .ExecuteWithCapturedOutput("outputsframeworkversion-" + target) + .Should() + .Pass() + .And + .HaveStdOutContaining(target); + } void ChangeProjectTargetFramework(FileInfo projectFile, string target) { From def43227833a94a0bab661086773091de8726107 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 14 Apr 2017 10:27:24 -0700 Subject: [PATCH 03/13] Fix format --- TestAssets/TestProjects/MSBuildTestApp/Program.cs | 4 ++-- src/dotnet/commands/dotnet-complete/ParseCommand.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/TestAssets/TestProjects/MSBuildTestApp/Program.cs b/TestAssets/TestProjects/MSBuildTestApp/Program.cs index 353ad5fbd..e50829e81 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/Program.cs +++ b/TestAssets/TestProjects/MSBuildTestApp/Program.cs @@ -9,9 +9,9 @@ namespace MSBuildTestApp { public static void Main(string[] args) { - if (args.Length > 0) + if (args.Length > 0) { - Console.WriteLine("echo args:"+ String.Join(";", args)); + Console.WriteLine("echo args:" + string.Join(";", args)); } Console.WriteLine("Hello World!"); } diff --git a/src/dotnet/commands/dotnet-complete/ParseCommand.cs b/src/dotnet/commands/dotnet-complete/ParseCommand.cs index dc86dab3d..dccba0271 100644 --- a/src/dotnet/commands/dotnet-complete/ParseCommand.cs +++ b/src/dotnet/commands/dotnet-complete/ParseCommand.cs @@ -24,9 +24,10 @@ namespace Microsoft.DotNet.Cli Console.WriteLine(result.Diagram()); - if (result.UnparsedTokens.Any()) { + if (result.UnparsedTokens.Any()) + { Console.WriteLine("Unparsed Tokens: "); - Console.WriteLine(string.Join(" ", (result.UnparsedTokens))); + Console.WriteLine(string.Join(" ", result.UnparsedTokens)); } var optionValuesToBeForwarded = result.AppliedCommand() From c51221d2f17b3b390d0fd587fed98df684ebcfe6 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 14 Apr 2017 13:31:12 -0700 Subject: [PATCH 04/13] Adding "RequiresSpecificFrameworkFact("netcoreapp1.0")" to the 'ItRunsABackwardsVersionedTool' CLI test. --- .../TestAppWithCLIToolReferences.csproj | 2 -- ...venThatWeWantToBeBackwardsCompatibleWith1xProjects.cs | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj b/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj index c684ab90b..6dd25f7f6 100644 --- a/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj +++ b/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj @@ -4,8 +4,6 @@ Exe netcoreapp1.1 - $(CLI_SharedFrameworkVersion) - netcoreapp1.1 diff --git a/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs b/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs index 5b6ff3ebf..63050ca1d 100644 --- a/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs +++ b/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs @@ -78,9 +78,8 @@ namespace Microsoft.DotNet.Cli.Build.Tests .Should().Pass(); } - [Theory] - [InlineData("netcoreapp1.0")] - public void ItRunsABackwardsVersionedTool(string target) + [RequiresSpecificFrameworkFact("netcoreapp1.0")] // https://github.com/dotnet/cli/issues/6087 + public void ItRunsABackwardsVersionedTool() { var testInstance = TestAssets.Get("TestAppWithCLIToolReferences") .CreateInstance() @@ -91,11 +90,11 @@ namespace Microsoft.DotNet.Cli.Build.Tests new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) .WithWorkingDirectory(testInstance.Root) - .ExecuteWithCapturedOutput("outputsframeworkversion-" + target) + .ExecuteWithCapturedOutput("outputsframeworkversion-netcoreapp1.0") .Should() .Pass() .And - .HaveStdOutContaining(target); + .HaveStdOutContaining("netcoreapp1.0"); } void ChangeProjectTargetFramework(FileInfo projectFile, string target) From bfab25c259b7a808266c1246f403d2eec66ae86c Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 14 Apr 2017 16:08:32 -0500 Subject: [PATCH 05/13] Rename publish --target to --manifest. Fix #6244 --- src/dotnet/commands/dotnet-publish/LocalizableStrings.cs | 4 ++-- src/dotnet/commands/dotnet-publish/PublishCommandParser.cs | 6 +++--- .../Commands/PublishCommand.cs | 4 ++-- test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs index b077da201..a1ebc0a2b 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs @@ -15,9 +15,9 @@ namespace Microsoft.DotNet.Tools.Publish public const string OutputOptionDescription = "Output directory in which to place the published artifacts."; - public const string TargetOption = "target.xml"; + public const string ManifestOption = "manifest.xml"; - public const string TargetOptionDescription = "The path to a target manifest file that contains the list of packages to be excluded from the publish step."; + public const string ManifestOptionDescription = "The path to a target manifest file that contains the list of packages to be excluded from the publish step."; public const string SelfContainedOptionDescription = "Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. Defaults to 'true' if a runtime identifier is specified."; } diff --git a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs index e023dc121..aa2b9bc2e 100644 --- a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs @@ -26,10 +26,10 @@ namespace Microsoft.DotNet.Cli CommonOptions.ConfigurationOption(), CommonOptions.VersionSuffixOption(), Create.Option( - "--target", - LocalizableStrings.TargetOptionDescription, + "--manifest", + LocalizableStrings.ManifestOptionDescription, Accept.OneOrMoreArguments() - .With(name: LocalizableStrings.TargetOption) + .With(name: LocalizableStrings.ManifestOption) .ForwardAsSingle(o => $"/p:TargetManifestFiles={string.Join("%3B", o.Arguments)}")), Create.Option( "--self-contained", diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs index 4c5be8ac2..ada6a80be 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs @@ -38,9 +38,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities return this; } - public PublishCommand WithTargetManifest(string target) + public PublishCommand WithTargetManifest(string manifest) { - _targetManifests.Add( $"--target {target}"); + _targetManifests.Add( $"--manifest {manifest}"); return this; } diff --git a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs index 218cfcda5..f7cf3838d 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs @@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [InlineData(new string[] { "-c", "" }, "/p:Configuration=")] [InlineData(new string[] { "--configuration", "" }, "/p:Configuration=")] [InlineData(new string[] { "--version-suffix", "" }, "/p:VersionSuffix=")] - [InlineData(new string[] { "--target", "" }, "/p:TargetManifestFiles=")] + [InlineData(new string[] { "--manifest", "" }, "/p:TargetManifestFiles=")] [InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")] [InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")] [InlineData(new string[] { "" }, "")] @@ -60,7 +60,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [InlineData(new string[] { "-c", "" }, "/p:Configuration=")] [InlineData(new string[] { "--configuration", "" }, "/p:Configuration=")] [InlineData(new string[] { "--version-suffix", "" }, "/p:VersionSuffix=")] - [InlineData(new string[] { "--target", "" }, "/p:TargetManifestFiles=")] + [InlineData(new string[] { "--manifest", "" }, "/p:TargetManifestFiles=")] [InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")] [InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")] public void OptionForwardingIsCorrect(string[] args, string expectedAdditionalArgs) From bb4298ddc2888fd64affa43cb79f06513f1109f7 Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Thu, 13 Apr 2017 20:03:01 -0700 Subject: [PATCH 06/13] Updating SDk to 20170414 --- build/DependencyVersions.props | 2 +- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +- .../GivenDotnetStoresAndPublishesProjects.cs | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7a0fd921d..75fc8689d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.0-preview1-001978-00 15.2.0-preview-000093-02 2.0.0-rc4-61325-08 - 2.0.0-alpha-20170413-1 + 2.0.0-alpha-20170414-1 4.3.0-beta1-2418 1.0.0-rel-20170410-441 15.1.0-preview-20170316-05 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index c708b6327..abace8f08 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -27,7 +27,7 @@ - + diff --git a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs index afd87bb00..d10dcca6b 100644 --- a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs +++ b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs @@ -72,6 +72,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests { var testAppName = "NewtonSoftDependentProject"; var profileProjectName = "NewtonsoftProfile"; + var targetManifestFileName = "NewtonsoftFilterProfile.xml"; var testInstance = TestAssets.Get(testAppName) .CreateInstance() @@ -80,7 +81,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testProjectDirectory = testInstance.Root.ToString(); var profileProjectPath = TestAssets.Get(profileProjectName).Root.FullName; - var profileFilter = Path.Combine(profileProjectPath, "NewtonsoftFilterProfile.xml"); + var profileFilter = Path.Combine(profileProjectPath, targetManifestFileName); new RestoreCommand() .WithWorkingDirectory(testProjectDirectory) @@ -101,7 +102,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new DotnetCommand() .ExecuteWithCapturedOutput(outputDll) .Should().Fail() - .And.HaveStdErrContaining("assembly specified in the dependencies manifest was not found -- package: 'Newtonsoft.Json',"); + .And.HaveStdErrContaining($"Error: assembly specified in the dependencies manifest was not found probably due to missing runtime store associated with {targetManifestFileName} -- package: 'Newtonsoft.Json',"); } [Fact] From 645bb43291f715ecfed9b4548b3d3ac815c95db3 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 11 Apr 2017 15:51:20 -0700 Subject: [PATCH 07/13] Hook 'new' into the CLI telemetry pipeline --- src/dotnet/commands/dotnet-new/NewCommandShim.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-new/NewCommandShim.cs b/src/dotnet/commands/dotnet-new/NewCommandShim.cs index 9aa51e860..bc06185cc 100644 --- a/src/dotnet/commands/dotnet-new/NewCommandShim.cs +++ b/src/dotnet/commands/dotnet-new/NewCommandShim.cs @@ -6,7 +6,10 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; +using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; +using Microsoft.DotNet.Tools.MSBuild; using Microsoft.TemplateEngine.Abstractions; using Microsoft.TemplateEngine.Cli; using Microsoft.TemplateEngine.Edge; @@ -24,7 +27,16 @@ namespace Microsoft.DotNet.Tools.New public static int Run(string[] args) { - return New3Command.Run(CommandName, CreateHost(), new TelemetryLogger(null), FirstRun, args); + var sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName); + var telemetry = new Telemetry(new NuGetCacheSentinel(new CliFallbackFolderPathCalculator()), sessionId); + var logger = new TelemetryLogger((name, props, measures) => + { + if (telemetry.Enabled) + { + telemetry.TrackEvent(name, props, measures); + } + }); + return New3Command.Run(CommandName, CreateHost(), logger, FirstRun, args); } private static ITemplateEngineHost CreateHost() From 65ebbded915011527c4905a1b064b559943edd0d Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Mon, 17 Apr 2017 15:09:44 +0000 Subject: [PATCH 08/13] Update CoreSetup to preview1-002021 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 75fc8689d..5a75a6504 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview1-001978-00 + 2.0.0-preview1-002021-00 15.2.0-preview-000093-02 2.0.0-rc4-61325-08 2.0.0-alpha-20170414-1 From a8eb0d0f50257fad33d0d3162daf1d08957b3f34 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 17 Apr 2017 09:27:25 -0700 Subject: [PATCH 09/13] Changes per PR code review. --- .../11TestAppWith10CLIToolReferences.csproj} | 0 .../NuGet.Config | 0 .../Program.cs | 0 .../GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename TestAssets/TestProjects/{TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj => 11TestAppWith10CLIToolReferences/11TestAppWith10CLIToolReferences.csproj} (100%) rename TestAssets/TestProjects/{TestAppWithCLIToolReferences => 11TestAppWith10CLIToolReferences}/NuGet.Config (100%) rename TestAssets/TestProjects/{TestAppWithCLIToolReferences => 11TestAppWith10CLIToolReferences}/Program.cs (100%) diff --git a/TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj b/TestAssets/TestProjects/11TestAppWith10CLIToolReferences/11TestAppWith10CLIToolReferences.csproj similarity index 100% rename from TestAssets/TestProjects/TestAppWithCLIToolReferences/TestAppWithCLIToolReferences.csproj rename to TestAssets/TestProjects/11TestAppWith10CLIToolReferences/11TestAppWith10CLIToolReferences.csproj diff --git a/TestAssets/TestProjects/TestAppWithCLIToolReferences/NuGet.Config b/TestAssets/TestProjects/11TestAppWith10CLIToolReferences/NuGet.Config similarity index 100% rename from TestAssets/TestProjects/TestAppWithCLIToolReferences/NuGet.Config rename to TestAssets/TestProjects/11TestAppWith10CLIToolReferences/NuGet.Config diff --git a/TestAssets/TestProjects/TestAppWithCLIToolReferences/Program.cs b/TestAssets/TestProjects/11TestAppWith10CLIToolReferences/Program.cs similarity index 100% rename from TestAssets/TestProjects/TestAppWithCLIToolReferences/Program.cs rename to TestAssets/TestProjects/11TestAppWith10CLIToolReferences/Program.cs diff --git a/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs b/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs index 63050ca1d..30ecc1f38 100644 --- a/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs +++ b/test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs @@ -81,7 +81,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests [RequiresSpecificFrameworkFact("netcoreapp1.0")] // https://github.com/dotnet/cli/issues/6087 public void ItRunsABackwardsVersionedTool() { - var testInstance = TestAssets.Get("TestAppWithCLIToolReferences") + var testInstance = TestAssets.Get("11TestAppWith10CLIToolReferences") .CreateInstance() .WithSourceFiles() .WithRestoreFiles(); From e9f2b224925508f767a9e3dd9f1bbc00656dd1dc Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Mon, 17 Apr 2017 10:00:42 -0700 Subject: [PATCH 10/13] Updating the websdk version to 1.0.0-rel-20170413-451 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5a75a6504..c6f37d753 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -6,7 +6,7 @@ 2.0.0-rc4-61325-08 2.0.0-alpha-20170414-1 4.3.0-beta1-2418 - 1.0.0-rel-20170410-441 + 1.0.0-rel-20170413-451 15.1.0-preview-20170316-05 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From 4c9ee21b27b6fb149dab0e72598a0540916300f5 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 17 Apr 2017 20:55:58 -0500 Subject: [PATCH 11/13] Remove the conclusion.html from the OSX installer. Also, bump the min version to 10.12, since that is all .NET Core 2.0 supports. Fix #6322 --- packaging/osx/clisdk/Distribution-Template | 3 +-- .../osx/clisdk/resources/cs.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/de.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/en.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/es.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/fr.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/it.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/ja.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/ko.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/pl.lproj/conclusion.html | 14 -------------- .../clisdk/resources/pt-br.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/ru.lproj/conclusion.html | 14 -------------- .../osx/clisdk/resources/tr.lproj/conclusion.html | 14 -------------- .../clisdk/resources/zh-hans.lproj/conclusion.html | 14 -------------- .../clisdk/resources/zh-hant.lproj/conclusion.html | 14 -------------- 15 files changed, 1 insertion(+), 198 deletions(-) delete mode 100644 packaging/osx/clisdk/resources/cs.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/de.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/en.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/es.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/fr.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/it.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/ja.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/ko.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/pl.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/ru.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/tr.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html delete mode 100644 packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template index d70c70cc4..5d4390ac3 100644 --- a/packaging/osx/clisdk/Distribution-Template +++ b/packaging/osx/clisdk/Distribution-Template @@ -5,10 +5,9 @@ - - + diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html deleted file mode 100644 index aacc80cfc..000000000 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET Core CLI! - - -
-

The installation was successful.

-

.NET Core CLI was successfully installed.

-
- - From 7d6e8bf9198235a3c70babb0b5bf2a535286a56d Mon Sep 17 00:00:00 2001 From: Roger Date: Tue, 18 Apr 2017 10:54:50 -0400 Subject: [PATCH 12/13] Mac OS X is now macOS --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf6bb2ea3..58880137e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ -|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 | +|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 | |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| |[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][linux-build-badge]][linux-build]| @@ -97,7 +97,7 @@ apt-cache search dotnet-sdk | grep 2.0.0 | **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
[tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] | | **Ubuntu 16.04** | [tar.gz][ubuntu-16.04-targz] - [Checksum][ubuntu-16.04-targz-checksum] | | **Debian 8.2** | [tar.gz][debian-8.2-targz] - [Checksum][debian-8.2-targz-checksum] | -| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | +| **macOS** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **CentOS 7.1 / Oracle Linux 7** | [tar.gz][centos-targz] - [Checksum][centos-targz-checksum] | | **RHEL 7.2** | [tar.gz][rhel-targz] - [Checksum][rhel-targz-checksum] | | **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | From b6e3b46df904a705749b0c44aff2bc63633289c2 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 18 Apr 2017 14:01:07 -0500 Subject: [PATCH 13/13] Move the installer and binaries table under the Installers and Binaries section in the README. --- README.md | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index cf6bb2ea3..7656f9873 100644 --- a/README.md +++ b/README.md @@ -61,32 +61,6 @@ You can download .NET Core SDK as either an installer (MSI, PKG) or a zip (zip, In order to download just the .NET Core runtime without the SDK, please visit https://github.com/dotnet/core-setup#daily-builds. -# Debian daily feed - -Newest SDK binaries for 2.0.0 in debian feed may be delayed due to external issues by up to 24h. - -## Obtaining binaries - -Add debian feed: - -``` -sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' - -sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 - -sudo apt-get update -``` - -Install: -``` -sudo apt-get install = -``` - -To list available packages: -``` -apt-cache search dotnet-sdk | grep 2.0.0 -``` - > **Note:** please be aware that below installers are the **latest bits**. If you > want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling). @@ -143,6 +117,32 @@ apt-cache search dotnet-sdk | grep 2.0.0 [linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-linux-x64.latest.tar.gz [linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-linux-x64.latest.tar.gz.sha +# Debian daily feed + +Newest SDK binaries for 2.0.0 in debian feed may be delayed due to external issues by up to 24h. + +## Obtaining binaries + +Add debian feed: + +``` +sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' + +sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 + +sudo apt-get update +``` + +Install: +``` +sudo apt-get install = +``` + +To list available packages: +``` +apt-cache search dotnet-sdk | grep 2.0.0 +``` + Docker ------