From 4f6fbc4a7f8a002a023cb0cbdeae5a6c2e64cdea Mon Sep 17 00:00:00 2001 From: Livar Date: Sat, 22 Apr 2017 11:52:54 -0700 Subject: [PATCH 01/11] Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates Update templates and engine, pin ASP.NET package versions, add web item templates --- build/BundledTemplates.props | 1 + build/DependencyVersions.props | 6 +++--- build/compile/LzmaArchive.targets | 11 ++++++----- .../GenerateNuGetPackagesArchiveVersion.cs | 2 +- .../GivenThatIWantANewAppWithSpecifiedType.cs | 5 ++--- ...GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 12 ++---------- 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 1d7ef3d55..59606c8b5 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -1,6 +1,7 @@ + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 30ac513f1..b2a603cdc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,9 +11,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170410-189 - 1.0.0-beta2-20170410-189 - 1.0.0-beta2-20170410-189 + 1.0.0-beta2-20170421-198 + 1.0.0-beta2-20170421-198 + 1.0.0-beta2-20170421-198 2.0.0-preview1-001960 2.0.0-preview1-002022 0.1.0-alpha-142 diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index df6e34f30..ae7bf4646 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -78,7 +78,7 @@ - + @@ -91,15 +91,16 @@ Lines="$(NuGetConfigContent)" /> + TemplateType="mvc" + TemplateArgs="-au Individual --debug:ephemeral-hive --no-restore" + WorkingDirectory="$(NuGetPackagesArchiveProject)/MvcIndividual" /> + WorkingDirectory="$(NuGetPackagesArchiveProject)/MvcIndividual" /> + diff --git a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs index 316f813de..4ba8fb393 100644 --- a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs +++ b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs @@ -29,7 +29,7 @@ namespace Microsoft.DotNet.Cli.Build private static string[][] _templatesAndArgs = new string[][] { - new string[] { "console", "" }, + new string[] { "mvc", "-au individual" }, }; public override bool Execute() diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index e6f540c70..ce6d8aff0 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -21,9 +21,8 @@ namespace Microsoft.DotNet.New.Tests [InlineData("C#", "mstest", false)] [InlineData("C#", "xunit", false)] [InlineData("C#", "web", false)] - // Uncomment the tests below in PR#6362 - //[InlineData("C#", "mvc", false)] - //[InlineData("C#", "webapi", false)] + [InlineData("C#", "mvc", false)] + [InlineData("C#", "webapi", false)] // Uncomment the test below once https://github.com/dotnet/netcorecli-fsc/issues/92 is fixed. //[InlineData("F#", "console", false)] //[InlineData("F#", "classlib", false)] diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index d3ff7008c..fa6e693e2 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -97,11 +97,6 @@ A command is running to initially populate your local package cache, to improve "microsoft.netcore.app", "microsoft.netcore.platforms", "netstandard.library", - }; - - // https://github.com/dotnet/cli/issues/5505 - add the "2.0" asp.net packages into the offline cache - List unexpectedDirectories = new List() - { "microsoft.aspnetcore.diagnostics", "microsoft.aspnetcore.mvc", "microsoft.aspnetcore.routing", @@ -114,16 +109,13 @@ A command is running to initially populate your local package cache, to improve "microsoft.extensions.logging.console", "microsoft.extensions.logging.debug", "microsoft.extensions.options.configurationextensions", - "microsoft.visualstudio.web.browserlink", + //BrowserLink has been temporarily disabled until https://github.com/dotnet/templating/issues/644 is resolved + //"microsoft.visualstudio.web.browserlink", }; _nugetFallbackFolder .Should() .HaveDirectories(expectedDirectories); - - _nugetFallbackFolder - .Should() - .NotHaveDirectories(unexpectedDirectories); } private string GetDotnetVersion() From 6464e0152d1e1bea8381864e298e77d7c1c3ade3 Mon Sep 17 00:00:00 2001 From: Livar Date: Sat, 22 Apr 2017 11:52:13 -0700 Subject: [PATCH 02/11] Merge pull request #6380 from livarcocc/update_channel Updating the release/2.0.0 channel and the README to point to this new channel --- README.md | 62 +++++++++++++++++++++--------------------- build/BranchInfo.props | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index f426ff043..185f4c5c7 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,12 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! -> **Note:** the master branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the +> **Note:** the release/2.0.0 branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the > v1 of the tools. Found an issue? --------------- -You can consult the [known issues page](https://github.com/dotnet/core/blob/master/cli/known-issues.md) to find out the current issues and to see the workarounds. +You can consult the [known issues page](https://github.com/dotnet/core/blob/release/2.0.0/cli/known-issues.md) to find out the current issues and to see the workarounds. If you don't find your issue, please file one! However, given that this is a very high-frequency repo, we've setup some [basic guidelines](Documentation/project-docs/issue-filing-guide.md) to help you. Please consult those first. @@ -64,7 +64,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > **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). -| Platform | master
[![][version-badge]][version] | +| Platform | release/2.0.0
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -78,44 +78,44 @@ In order to download just the .NET Core runtime without the SDK, please visit ht *Note: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-ubuntu-x64.latest.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-ubuntu-x64.latest.deb.sha -[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu-x64.latest.tar.gz -[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu-x64.latest.tar.gz.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb.sha +[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz +[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz.sha -[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz -[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha +[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz +[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha -[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz -[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz.sha +[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz +[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz.sha -[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-centos-x64.latest.tar.gz -[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-centos-x64.latest.tar.gz.sha +[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz +[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz.sha -[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz -[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz.sha +[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz +[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz.sha -[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 +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz.sha # Debian daily feed diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 5510dc8b9..0d146ab2a 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - master - master + release/2.0.0 + release/2.0.0 From da398658dc82d042a535bf118d9aeb03ff3f6f14 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Apr 2017 16:56:34 -0700 Subject: [PATCH 03/11] Localization for CommonOptions --- src/dotnet/CommonLocalizableStrings.cs | 7 +++++++ src/dotnet/CommonOptions.cs | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/dotnet/CommonLocalizableStrings.cs b/src/dotnet/CommonLocalizableStrings.cs index d19b462d5..1c582f46a 100644 --- a/src/dotnet/CommonLocalizableStrings.cs +++ b/src/dotnet/CommonLocalizableStrings.cs @@ -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 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}"; + + /// 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."; } } diff --git a/src/dotnet/CommonOptions.cs b/src/dotnet/CommonOptions.cs index 4dc1dfacf..e2ea884ef 100644 --- a/src/dotnet/CommonOptions.cs +++ b/src/dotnet/CommonOptions.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Tools.Common; +using Microsoft.DotNet.Tools; namespace Microsoft.DotNet.Cli { @@ -18,7 +19,7 @@ namespace Microsoft.DotNet.Cli public static Option VerbosityOption() => Create.Option( "-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( "q", "quiet", "m", "minimal", @@ -30,7 +31,7 @@ namespace Microsoft.DotNet.Cli public static Option FrameworkOption() => Create.Option( "-f|--framework", - "Target framework to publish for. The target framework has to be specified in the project file.", + CommonLocalizableStrings.FrameworkOptionDescription, Accept.ExactlyOneArgument() .WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile()) .With(name: "FRAMEWORK") @@ -39,7 +40,7 @@ namespace Microsoft.DotNet.Cli public static Option RuntimeOption() => Create.Option( "-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() .WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile()) .With(name: "RUNTIME_IDENTIFIER") @@ -47,8 +48,8 @@ namespace Microsoft.DotNet.Cli public static Option ConfigurationOption() => Create.Option( - "-c|--configuration", - "Configuration to use for building the project. Default for most projects is \"Debug\".", + "-c|--configuration", + CommonLocalizableStrings.ConfigurationOptionDescription, Accept.ExactlyOneArgument() .With(name: "CONFIGURATION") .WithSuggestionsFrom("DEBUG", "RELEASE") @@ -57,7 +58,7 @@ namespace Microsoft.DotNet.Cli public static Option VersionSuffixOption() => Create.Option( "--version-suffix", - "Defines the value for the $(VersionSuffix) property in the project.", + CommonLocalizableStrings.CmdVersionSuffixDescription, Accept.ExactlyOneArgument() .With(name: "VERSION_SUFFIX") .ForwardAsSingle(o => $"/p:VersionSuffix={o.Arguments.Single()}")); From de0c37a48c5f95f2764100cdfbf9ddc85b1aa489 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Apr 2017 17:35:38 -0700 Subject: [PATCH 04/11] Remove accidental debug line --- src/dotnet/commands/dotnet-restore/Program.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dotnet/commands/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs index 1e1ff728d..e06ddc42d 100644 --- a/src/dotnet/commands/dotnet-restore/Program.cs +++ b/src/dotnet/commands/dotnet-restore/Program.cs @@ -23,8 +23,6 @@ namespace Microsoft.DotNet.Tools.Restore { DebugHelper.HandleDebugSwitch(ref args); - Reporter.Output.WriteLine(string.Join(" ", args)); - var parser = Parser.Instance; var result = parser.ParseFrom("dotnet restore", args); From 9014b1b1631eba2c65b3f317e9f3ffa5f82a560a Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 25 Apr 2017 16:25:27 -0700 Subject: [PATCH 05/11] Update templates and add 'baseline' feature --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b2a603cdc..f3464bcdf 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,9 +11,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170421-198 - 1.0.0-beta2-20170421-198 - 1.0.0-beta2-20170421-198 + 1.0.0-beta2-20170425-201 + 1.0.0-beta2-20170425-201 + 1.0.0-beta2-20170425-201 2.0.0-preview1-001960 2.0.0-preview1-002022 0.1.0-alpha-142 From fd112f45a04a599362e3390ffa4bc7a294648c73 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Wed, 26 Apr 2017 03:16:03 +0000 Subject: [PATCH 06/11] Update CoreSetup to preview1-002088 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b2a603cdc..a7d916df4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview1-002061-00 + 2.0.0-preview1-002088-00 15.2.0-preview-000093-02 2.0.0-rc4-61325-08 2.0.0-alpha-20170420-1 @@ -14,8 +14,8 @@ 1.0.0-beta2-20170421-198 1.0.0-beta2-20170421-198 1.0.0-beta2-20170421-198 - 2.0.0-preview1-001960 - 2.0.0-preview1-002022 + 2.0.0-preview1-002088 + 2.0.0-preview1-002088 0.1.0-alpha-142 From de139a3bf895e5180fe72de666e88c6814bde5f4 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 25 Apr 2017 22:29:50 -0500 Subject: [PATCH 07/11] Update core-setup channel to release/2.0.0 --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 0821f4f2c..6d3430d39 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -21,7 +21,7 @@ - master + release/2.0.0 https://dotnetcli.azureedge.net/dotnet/ $(CoreSetupBlobRootUrl)$(CoreSetupChannel) $(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion) From 126c42050d588d0d038a175ab762d06b25c3ff9f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 21 Apr 2017 21:54:35 -0500 Subject: [PATCH 08/11] Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. --- build/Stage0.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Stage0.props b/build/Stage0.props index 8cd6892f0..b337b34b3 100644 --- a/build/Stage0.props +++ b/build/Stage0.props @@ -5,8 +5,8 @@ $(Stage0Directory)/dotnet$(ExeExtension) False True - win7-$(Architecture) - osx.10.12-x64 + win-$(Architecture) + osx-x64 linux-x64 From dde0cee897547a3ed46de502eb7444a40a35e4f5 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 25 Apr 2017 21:31:12 -0700 Subject: [PATCH 09/11] Update to latest ASP.NET package versions & fix feed entry in NuGet.config --- NuGet.Config | 2 +- build/DependencyVersions.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index f35c58dc2..e7b530794 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -5,7 +5,7 @@ - + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f3464bcdf..3fc59514d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,8 +12,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170425-201 - 1.0.0-beta2-20170425-201 - 1.0.0-beta2-20170425-201 + 1.0.0-beta2-20170425-202 + 1.0.0-beta2-20170425-202 2.0.0-preview1-001960 2.0.0-preview1-002022 0.1.0-alpha-142 From 80c23d53d30730ad4a5edb97327680854e0c5427 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 25 Apr 2017 21:52:43 -0700 Subject: [PATCH 10/11] Temporarily remove tools --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3fc59514d..1dd26b0a8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,8 +12,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170425-201 - 1.0.0-beta2-20170425-202 - 1.0.0-beta2-20170425-202 + 1.0.0-beta2-20170425-203 + 1.0.0-beta2-20170425-203 2.0.0-preview1-001960 2.0.0-preview1-002022 0.1.0-alpha-142 From 51ce43cf5d2bf698892cdfe630339cb224c4c4cc Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 26 Apr 2017 11:45:26 -0700 Subject: [PATCH 11/11] Reverting some files that we don't want integrated back to master. --- README.md | 62 ++++++++++++++++++------------------- build/BranchInfo.props | 4 +-- build/BundledRuntimes.props | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 185f4c5c7..f426ff043 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,12 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! -> **Note:** the release/2.0.0 branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the +> **Note:** the master branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the > v1 of the tools. Found an issue? --------------- -You can consult the [known issues page](https://github.com/dotnet/core/blob/release/2.0.0/cli/known-issues.md) to find out the current issues and to see the workarounds. +You can consult the [known issues page](https://github.com/dotnet/core/blob/master/cli/known-issues.md) to find out the current issues and to see the workarounds. If you don't find your issue, please file one! However, given that this is a very high-frequency repo, we've setup some [basic guidelines](Documentation/project-docs/issue-filing-guide.md) to help you. Please consult those first. @@ -64,7 +64,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > **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). -| Platform | release/2.0.0
[![][version-badge]][version] | +| Platform | master
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -78,44 +78,44 @@ In order to download just the .NET Core runtime without the SDK, please visit ht *Note: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.zip.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb.sha -[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz -[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-ubuntu-x64.latest.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-ubuntu-x64.latest.deb.sha +[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu-x64.latest.tar.gz +[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu-x64.latest.tar.gz.sha -[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz -[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha +[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz +[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha -[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz -[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz.sha +[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz +[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.tar.gz.sha -[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz -[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz.sha +[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-centos-x64.latest.tar.gz +[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-centos-x64.latest.tar.gz.sha -[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz -[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz.sha +[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz +[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz.sha +[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 diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 0d146ab2a..5510dc8b9 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.0.0 - release/2.0.0 + master + master diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 6d3430d39..0821f4f2c 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -21,7 +21,7 @@ - release/2.0.0 + master https://dotnetcli.azureedge.net/dotnet/ $(CoreSetupBlobRootUrl)$(CoreSetupChannel) $(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion)