diff --git a/README.md b/README.md index 8807beaa1..e6d7174b4 100644 --- a/README.md +++ b/README.md @@ -226,4 +226,3 @@ License ------- By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula). - diff --git a/build/Branding.props b/build/Branding.props index e1ea0a1a6..3d0b29db1 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.100 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.5 + Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 Microsoft .NET Core Host FX Resolver - 2.0.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d467d2629..a0f45390e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.5 + 2.0.6-servicing-26118-01 $(MicrosoftNETCoreAppPackageVersion) 15.6.81 $(MicrosoftBuildPackageVersion) @@ -17,7 +17,7 @@ 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) - 1.0.0-beta3-20171110-312 + 1.0.0-beta3-20171117-314 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.0-beta3-20171117-314 @@ -58,14 +58,14 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.5 + 2.0.6 notimestamp - 2.0.5 + 2.0.6 rtm - 2.0.5 - 155 + 2.0.6 + 10007 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index ae5e96175..c37260b8e 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -50,7 +50,7 @@ + @@ -90,6 +91,7 @@ + @@ -113,6 +115,7 @@ + @@ -128,6 +131,7 @@ + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 9224596be..f4cfc11a2 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -38,6 +38,7 @@ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-2.0.5 $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -127,8 +128,10 @@ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb + $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203) + $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index e987eb530..04d79e051 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -55,6 +55,7 @@ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-2.0.5 $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm @@ -189,8 +190,10 @@ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm + $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203) + $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) + @@ -239,6 +245,7 @@ + @@ -255,6 +262,7 @@ + diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • 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 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • 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 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • 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 30bd2b485..c7644d4e9 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.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 74f1df4d6..94b9d6efc 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.100 - • .NET Core Runtime 2.0.5 + • .NET Core Runtime 2.0.6 • 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 01967abfc..273605674 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.5"); + result.Args.Should().Contain("--fx-version 2.0.6-servicing-26118-01"); } [Fact]