From 725814c601b58fea914efdd44f88984b5ca2ed52 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Jun 2018 15:15:02 -0700 Subject: [PATCH 1/2] 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 2/2] 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]