From 8a315605e1cf595a7ac04c88810828375a8fef71 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 31 May 2018 18:18:43 +0000 Subject: [PATCH 01/23] Updated Version.props --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 47493fa53..aacae03a0 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 301 + 302 preview $(VersionMajor).$(VersionMinor) From 79e5822e324bdc08814b0a4db990612b5bf51915 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 10:34:02 -0700 Subject: [PATCH 02/23] Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change --- build/BundledRuntimes.props | 2 +- build/DependencyVersions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 40003b788..e290e4daf 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -37,7 +37,7 @@ $(AspNetCoreSharedFxInstallerRid) x64 - aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerEndSuffix)$(InstallerExtension) + aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib $(PackagesDirectory)/$(DownloadedAspNetCoreSharedFxInstallerFileName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d79ed2c5e..f9ea37abf 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0 + 2.1.1-rtm-30818 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.0 $(MicrosoftNETCoreAppPackageVersion) From e00b935e07904e06e60b0a5a6eeccc828c23b465 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 11:07:55 -0700 Subject: [PATCH 03/23] Fixup myget feed for aspnetcore --- build/NugetConfigFile.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 5e72d79b7..266a9cf81 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -19,7 +19,7 @@ - + From aad98ed7ff683088672bf3b69ae2d26da4653a2f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 11:54:12 -0700 Subject: [PATCH 04/23] Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable --- build/DependencyVersions.props | 1 + src/dotnet/dotnet.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f9ea37abf..f23e59336 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,6 +3,7 @@ 2.1.1-rtm-30818 $(MicrosoftAspNetCoreAllPackageVersion) + 2.1.0 2.1.0 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index b739ba700..3b6a976f2 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -77,7 +77,7 @@ - + From 74d81ad2538c39993f9b9fb270e99fc67d229de2 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 12:39:56 -0700 Subject: [PATCH 05/23] Set package versions for bundled aspnet tools separately from the metapackage version --- build/BundledDotnetTools.props | 10 +++++----- build/DependencyVersions.props | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build/BundledDotnetTools.props b/build/BundledDotnetTools.props index 1df3521de..bd3259451 100644 --- a/build/BundledDotnetTools.props +++ b/build/BundledDotnetTools.props @@ -1,9 +1,9 @@ - - - - - + + + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f23e59336..b1f97ce19 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,6 +4,11 @@ 2.1.1-rtm-30818 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.0 + 2.1.1-rtm-30818 + 2.1.0 + 2.1.0 + 2.1.0 + 2.1.0 2.1.0 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 From 4eaf45ba85290fee3c7114c465b171fd40e136ba Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 14:44:21 -0700 Subject: [PATCH 06/23] Fix mismatch of dotnet-watch with package variable name --- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 222c14025..51f9ce940 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -52,7 +52,7 @@ DotnetToolsLayoutDirectory=$(SdkOutputDirectory)/DotnetTools; TemplateFillInPackageName=dotnet-watch; - TemplateFillInPackageVersion=$(AspNetCoreVersion); + TemplateFillInPackageVersion=$(DotnetWatchPackageVersion); PreviousStageDirectory=$(PreviousStageDirectory); DotnetToolsLayoutDirectory=$(testAssetSourceRoot); DotnetToolsRestoreProjectStyle=DotnetToolReference From 6a39ef5c7b96bdc969acd18b699795ab75ea0f27 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 4 Jun 2018 18:41:13 +0000 Subject: [PATCH 07/23] Merged PR 126122: Fix alpine file ownership issues with newer docker Fix alpine file ownership issues with newer docker Upgrades to a newer docker version (18.03.1-ce) caused files created inside to be owned by root on alpine. It appears that the logic to set up the user in the container so that this doesn't happen was missing from alpine. While it's not clear why it worked before at all, the logic has been duplicated (tweaked for the alpine base image). --- scripts/docker/alpine.3.6/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/docker/alpine.3.6/Dockerfile b/scripts/docker/alpine.3.6/Dockerfile index 746f1bd4b..2dc797963 100644 --- a/scripts/docker/alpine.3.6/Dockerfile +++ b/scripts/docker/alpine.3.6/Dockerfile @@ -9,6 +9,15 @@ FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156 # This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker # from issuing a warning ARG USER_ID=0 +RUN adduser code_executor -u ${USER_ID} -G root -D +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permssions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home + +# Set user to the one we just created +USER ${USER_ID} # Set working directory WORKDIR /opt/code From fec5f38b9341ba675814dfa022a137c31a5d1c24 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 5 Jun 2018 16:51:32 +0000 Subject: [PATCH 08/23] Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*" --- build/Test.targets | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/Test.targets b/build/Test.targets index 39cc79f83..9f4ce8778 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -89,7 +89,7 @@ - diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 89d74d82f..6fbf38387 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.1.0"); + result.Args.Should().Contain("--fx-version 2.1."); } [Fact] diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index bb2c148f5..98e17ce06 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -75,8 +75,7 @@ namespace Microsoft.DotNet.New.Tests } [Theory] - [InlineData("console", "microsoft.netcore.app")] - // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574 + // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420" [InlineData("classlib", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName) { @@ -107,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.0")); + .Single(d => d.Name.StartsWith("2.1.")); if (packageName == "microsoft.netcore.app") { From 5541529bbe2a7e0e5b169d84b7a135684f2f3589 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 5 Jun 2018 17:51:19 +0000 Subject: [PATCH 09/23] Update the version for 'microsoft.netcore.app' to "2.1.1*" --- build/DependencyVersions.props | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b1f97ce19..fd00a864f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ 2.1.0 2.1.0 2.1.0 - 2.1.0 + 2.1.1-rtm-26531-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 6fbf38387..632a1cc36 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.1."); + result.Args.Should().Contain("--fx-version 2.1.1"); } [Fact] diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 98e17ce06..84c0011e5 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -75,7 +75,7 @@ namespace Microsoft.DotNet.New.Tests } [Theory] - // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420" + [InlineData("console", "microsoft.netcore.app")] [InlineData("classlib", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName) { @@ -106,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.")); + .Single(d => d.Name.StartsWith("2.1.1")); if (packageName == "microsoft.netcore.app") { From 2e7e6950e2553e426b4ddb93a7f1174af467e44a Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 5 Jun 2018 18:25:07 +0000 Subject: [PATCH 10/23] Disable NewProjectRestoresCorrectPackageVersion "console" test for now. --- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 84c0011e5..cb9d8135e 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -75,7 +75,7 @@ namespace Microsoft.DotNet.New.Tests } [Theory] - [InlineData("console", "microsoft.netcore.app")] + // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420" [InlineData("classlib", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName) { From 41d2418bfbf13c8a2899de8c9e1f97d6218b1155 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 5 Jun 2018 17:32:01 -0700 Subject: [PATCH 11/23] Update expected versions to 2.1.2 --- .../GivenAProjectToolsCommandResolver.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 632a1cc36..b031a50ee 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.1.1"); + result.Args.Should().Contain("--fx-version 2.1.2"); } [Fact] diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index cb9d8135e..fc16d412f 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -106,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.1")); + .Single(d => d.Name.StartsWith("2.1.2")); if (packageName == "microsoft.netcore.app") { From 922ba141424a23cedf95dc23abadf73d574009d1 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 12 Jun 2018 12:07:09 -0700 Subject: [PATCH 12/23] Update CLI branding to 2.1.202. This commit updates the CLI branding to 2.1.202. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 0f129da74..b07528589 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.201 + Microsoft .NET Core SDK - 2.1.202 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 76eecf3a2..f1c4d1d12 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 201 + 202 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index a16d00f35..eb0ffe705 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.201
    • +
  • .NET Core SDK 2.1.202
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 9e5751518..c62660c02 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.201 + • .NET Core SDK 2.1.202 • .NET Core Runtime 2.0.7 • Runtime Package Store From 725814c601b58fea914efdd44f88984b5ca2ed52 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Jun 2018 15:15:02 -0700 Subject: [PATCH 13/23] Update runtime versions in 2.0.0 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 8d00204c3..23f898e92 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ - 2.0.7 + 2.0.9-servicing-26612-03 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 $(MicrosoftBuildPackageVersion) From 0bd478b31e5722086a9ce641a878137c2d624cf1 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 12 Jun 2018 15:30:29 -0700 Subject: [PATCH 14/23] Update the runtime branding to 2.0.9. This commit updates the runtime branding to 2.0.9. --- build/Branding.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index b07528589..580260010 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.202 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.7 + Microsoft .NET Core Runtime - 2.0.9 Microsoft .NET Core Host - 2.0.1 Microsoft .NET Core Host FX Resolver - 2.0.0 diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index eb0ffe705..b66d897b2 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.202
    • -
  • .NET Core Runtime 2.0.7
    • +
  • .NET Core Runtime 2.0.9
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index c62660c02..f6fe64faf 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -51,7 +51,7 @@ The following were installed at [DOTNETHOME] • .NET Core SDK 2.1.202 - • .NET Core Runtime 2.0.7 + • .NET Core Runtime 2.0.9 • Runtime Package Store This product collects usage data diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 90f68472c..0d905bc79 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.7"); + result.Args.Should().Contain("--fx-version 2.0.9-servicing-26612-03"); } [Fact] From 5f3ad071ec6e02abfa296d632bccf013a34c6a26 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Jun 2018 14:49:35 -0700 Subject: [PATCH 15/23] Update to aspnet 2.0.9-rtm-10029 --- build/DependencyVersions.props | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 23f898e92..ecca29455 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -59,16 +59,16 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.8 + 2.0.9 notimestamp - 2.0.8 + 2.0.9 rtm - 2.0.8 - 10026 + 2.0.9 + 10029 $(AspNetCoreVersion) $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) @@ -82,6 +82,7 @@ This list should be sorted most recent version to oldest. --> + From 04f285629d5eedfa2bbd3fc8b15b1b763ba61af3 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 14 Jun 2018 18:32:26 +0000 Subject: [PATCH 16/23] Updated the expected implicit NETStandard.Library to 2.0.3 --- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 06d8b1b4d..bdc9ac9ec 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -76,7 +76,7 @@ namespace Microsoft.DotNet.New.Tests [Theory] [InlineData("console", "microsoft.netcore.app", "2.0.0")] - [InlineData("classlib", "netstandard.library", "2.0.1")] + [InlineData("classlib", "netstandard.library", "2.0.3")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion) { var rootPath = TestAssets.CreateTestDirectory(identifier: $"_{type}").FullName; From bdcc3b4c874392ae5248ffdceb01076894b3baab Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 15 Jun 2018 10:33:54 -0700 Subject: [PATCH 17/23] Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1. --- test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs index dc780f792..18086970a 100644 --- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs +++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs @@ -16,8 +16,10 @@ namespace EndToEnd { private const string AspNetTestProject = "TestWebAppSimple"; + private const string PinnedAspNetCoreImplicitVersion = "2.1.1"; + [Fact] - public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion() + public void PortablePublishWithLatestTFMUsesPinnedDownAspNetCoreAppVersion() { var _testInstance = TestAssets.Get(AspNetTestProject) .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion) @@ -48,10 +50,7 @@ namespace EndToEnd var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true); restoredVersion.Should().NotBeNull(); - var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion"); - var bundledVersion = File.ReadAllText(bundledVersionPath).Trim(); - - restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion, + restoredVersion.ToNormalizedString().Should().BeEquivalentTo(PinnedAspNetCoreImplicitVersion, "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." + "Please update MSBuildExtensions.targets in this repo so these versions match."); } From e46c410acc00bfcca849a4352f072e42a45967b1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 20 Jun 2018 14:36:27 -0700 Subject: [PATCH 18/23] Bump runtime versions to 2.0.9 stable --- build/DependencyVersions.props | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ecca29455..315e65c47 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ - 2.0.9-servicing-26612-03 + 2.0.9 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 0d905bc79..856fdad53 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.9-servicing-26612-03"); + result.Args.Should().Contain("--fx-version 2.0.9"); } [Fact] From dc2fefdc99a287edb6c349dd81cf85d5fa9ac8d7 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 20 Jun 2018 16:47:45 -0700 Subject: [PATCH 19/23] Update to aspnet 2.0.9-rtm-10030 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 315e65c47..330948649 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.9 rtm 2.0.9 - 10029 + 10030 $(AspNetCoreVersion) $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From dd83b0c2b3e11672b96bf462d31b74140e74675e Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 25 Jun 2018 13:04:14 -0700 Subject: [PATCH 20/23] Updates asp.net versions to match prodcon Fixes https://github.com/dotnet/cli/issues/9550 --- build/DependencyVersions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a141031dd..691f47d54 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,15 +1,15 @@ - 2.1.1-rtm-30818 + 2.1.1 $(MicrosoftAspNetCoreAllPackageVersion) - 2.1.0 + 2.1.1 2.1.1 - 2.1.1-rtm-30818 - 2.1.0 - 2.1.0 - 2.1.0 - 2.1.0 + 2.1.1 + 2.1.1 + 2.1.1 + 2.1.1 + 2.1.1 2.1.1 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 From 3b69038bc4eae74c3c9dc2e0e96cbe5326a6e6d5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 3 Jul 2018 04:19:14 +0000 Subject: [PATCH 21/23] Update to ASP.NET Core 2.0.9 build 10031 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 330948649..92435b9e4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.9 rtm 2.0.9 - 10030 + 10031 $(AspNetCoreVersion) $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From 0134d4b6610b50b813974688f5abed1f7a9427a9 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 10 Jul 2018 14:46:44 -0700 Subject: [PATCH 22/23] Update dependency versions to 2.1.2. This also refactors the ASP.NET SDKs to have independent versions from the ASP.NET version. --- build/BundledTemplates.props | 6 +++--- build/DependencyVersions.props | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 1a77f6043..b95bbc7b9 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -4,8 +4,8 @@ - - - + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cebbbf0ac..b5a4e043f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.1 + 2.1.2 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.1 2.1.1 @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.1 + 2.1.2 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 $(MicrosoftBuildPackageVersion) @@ -25,7 +25,10 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.301 $(MicrosoftNETSdkPackageVersion) - $(MicrosoftAspNetCoreAppPackageVersion) + 2.1.1 + 2.1.1 + 2.1.1 + 2.1.1 2.1.301 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From bf3e772075e3940169e7af086da7299c89d103a1 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 11 Jul 2018 11:17:02 -0700 Subject: [PATCH 23/23] Revert version change for ASP.NET bundled templates. The bundled ASP.NET templates should match the ASP.NET version. Confusion over versions and missing packages caused a previous commit to keep the bundled template versions the same while reving the ASP.NET version from the private branch. This commit reverts those changes. --- build/BundledTemplates.props | 6 +++--- build/DependencyVersions.props | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index b95bbc7b9..1a77f6043 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -4,8 +4,8 @@ - - - + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b5a4e043f..0a33ee1db 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -26,9 +26,6 @@ 2.1.301 $(MicrosoftNETSdkPackageVersion) 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 2.1.301 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion)