From 0c97a82d92e6e504b2a81442eee86a70a3296b9c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 4 Dec 2017 21:23:14 -0800 Subject: [PATCH 01/51] Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5. --- build/Branding.props | 4 ++-- build/DependencyVersions.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 4 ++-- packaging/windows/clisdk/bundle.wxl | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 600150fd1..34d574a42 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,8 +1,8 @@ - Microsoft .NET Core SDK - 2.1.3 + Microsoft .NET Core SDK - 2.1.4 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.4 + Microsoft .NET Core Runtime - 2.0.5 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 dc88a8f43..d1f9c9f7d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.4 + 2.0.5-servicing-26004-03 15.5.179 2.6.0-beta3-62309-01 1.6.0-beta2-25304 diff --git a/build/Version.props b/build/Version.props index 9d6c3a926..6a2b2f136 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 3 + 4 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 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • 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 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • 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 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • 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 0b53ef890..f130fe0a4 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,8 +7,8 @@

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

    -
  • .NET Core SDK 2.1.3
    • -
  • .NET Core Runtime 2.0.4
    • +
  • .NET Core SDK 2.1.4
    • +
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 2a359f587..cb379de96 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,8 +50,8 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.3 - • .NET Core Runtime 2.0.4 + • .NET Core SDK 2.1.4 + • .NET Core Runtime 2.0.5 • Runtime Package Store This product collects usage data From 60ba27d2dbf41749bf8f570f7e9d7dac24d20052 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 7 Dec 2017 12:19:43 -0800 Subject: [PATCH 02/51] Adding a separate dependency version for Microsoft.Build.Runtime. --- build/DependencyVersions.props | 3 ++- src/tool_msbuild/tool_msbuild.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d1f9c9f7d..68e98eef6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,8 @@ 2.0.5-servicing-26004-03 - 15.5.179 + 15.5.180 + 15.5.180.1 2.6.0-beta3-62309-01 1.6.0-beta2-25304 4.2.0-rtm-171104-0 diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 7a109b08d..9a2131a46 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -10,7 +10,7 @@ - + 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 dce7b8e2e..db6d59294 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 @@ -39,6 +39,6 @@ - + From f5a93d57da9917e22afda9bcc3aa3cf9cfacfed9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 7 Dec 2017 13:41:36 -0800 Subject: [PATCH 03/51] Fixing the expected fx-version. --- .../GivenAProjectToolsCommandResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index b894101f5..ed788dc1d 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.4"); + result.Args.Should().Contain("--fx-version 2.0.5-servicing-26004-03"); } [Fact] From 2c931b810d1c8a6c5107e5b235dae067ad6cc4dd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Dec 2017 10:10:08 -0800 Subject: [PATCH 04/51] Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified --- scripts/obtain/dotnet-install.ps1 | 13 +++++++++---- scripts/obtain/dotnet-install.sh | 14 ++++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index e267edc76..1b92f0c20 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -472,10 +472,15 @@ if ($DryRun) { $InstallRoot = Resolve-Installation-Path $InstallDir Say-Verbose "InstallRoot: $InstallRoot" -$IsSdkInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage "sdk" -SpecificVersion $SpecificVersion -Say-Verbose ".NET SDK installed? $IsSdkInstalled" -if ($IsSdkInstalled) { - Say ".NET SDK version $SpecificVersion is already installed." +$dotnetPackageRelativePath = if ($SharedRuntime) { "shared\Microsoft.NETCore.App" } else { "sdk" } + +$isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion +if ($isAssetInstalled) { + if ($SharedRuntime) { + Say ".NET Core Runtime version $SpecificVersion is already installed." + } else { + Say ".NET Core SDK version $SpecificVersion is already installed." + } Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath exit 0 } diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 628751836..e69e3a1fa 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -688,9 +688,16 @@ install_dotnet() { eval $invocation local download_failed=false - if is_dotnet_package_installed "$install_root" "sdk" "$specific_version"; then - say ".NET SDK version $specific_version is already installed." - return 0 + if [ "$shared_runtime" = true ]; then + if is_dotnet_package_installed "$install_root" "shared/Microsoft.NETCore.App" "$specific_version"; then + say ".NET Core Runtime version $specific_version is already installed." + return 0 + fi + else + if is_dotnet_package_installed "$install_root" "sdk" "$specific_version"; then + say ".NET Core SDK version $specific_version is already installed." + return 0 + fi fi mkdir -p "$install_root" @@ -786,7 +793,6 @@ do runtime_id="$1" ;; --skip-non-versioned-files|-[Ss]kip[Nn]on[Vv]ersioned[Ff]iles) - shift override_non_versioned_files=false ;; -?|--?|-h|--help|-[Hh]elp) From 6313f4fc7a016800f90362000690936fe406aaab Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 11 Dec 2017 11:01:24 -0800 Subject: [PATCH 05/51] The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index adb5987c7..d476476b5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -5,7 +5,7 @@ $(MicrosoftNETCoreAppPackageVersion) 15.4.8 $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) + 15.4.8.1 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 4.2.0-rtm-171027-0 From ed4413b9fb188bb4ecc24e9fc4691d0736c46902 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 11 Dec 2017 11:25:52 -0800 Subject: [PATCH 06/51] Fixing a typo... --- .../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 1a5f9fe31..97c931472 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 @@ -39,6 +39,6 @@ - + From 94e43afa68f0774910b5492e5dcc8accc353a1b2 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 11 Dec 2017 16:54:35 -0800 Subject: [PATCH 07/51] Use explict and non-preview versions for the build DLL --- .../Microsoft.DotNet.Cli.Build.Framework.csproj | 2 +- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 5 +++-- .../shared-build-targets-utils.csproj | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj index dd2f94e91..fcaae1196 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj @@ -13,7 +13,7 @@ - + diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 015c4b70d..2006a0122 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -18,16 +18,17 @@ - + - + + diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj index 14a4c4a33..34994fa7d 100644 --- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj +++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj @@ -16,12 +16,12 @@ - + - + From b3d565da5690044bbe4be3d61c12e0961ec230b2 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 12 Dec 2017 12:46:22 -0800 Subject: [PATCH 08/51] Update to consume aspnetcore 2.0.5-142 --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 362a90256..fd8e6b7bc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -35,14 +35,14 @@ 0.2.0 0.2.0-beta-000042 - 2.0.3 + 2.0.5 notimestamp - 2.0.3 + 2.0.5 rtm - 2.0.3 - 127 + 2.0.5 + 142 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From ed916733ee43f83054fcdd8417ab439c856e1a70 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 13 Dec 2017 09:27:06 -0800 Subject: [PATCH 09/51] Updating the runtime to 2.0.5. --- 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 fd8e6b7bc..022b64fc4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.5-servicing-26004-03 + 2.0.5 15.5.180 15.5.180.1 2.6.0-beta3-62309-01 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index ed788dc1d..01967abfc 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-servicing-26004-03"); + result.Args.Should().Contain("--fx-version 2.0.5"); } [Fact] From 34ec8c248046febcce0660f1fae0fd9d362f7b3b Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 13 Dec 2017 15:33:00 -0800 Subject: [PATCH 10/51] Update to consume aspnetcore 2.0.5-146 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 022b64fc4..6bfb7e6d4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -42,7 +42,7 @@ 2.0.5 rtm 2.0.5 - 142 + 146 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From af258af0356d8f9b1caa54cc0c6dce9803fa50f7 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Thu, 14 Dec 2017 14:00:39 -0800 Subject: [PATCH 11/51] Update the support package on the CLI to fix binding redirects on 4.7.1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d530499eb..86fe2881e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(CLI_NETSDK_Version) 4.5.0-rtm-4651 - 2.0.1-servicing-25908-02 + 2.0.1-servicing-26011-01 2.0.0-rel-20171110-671 15.5.0 $(CLI_SharedFrameworkVersion) From bf3102d718092810d31980c981755e0d8aec7f74 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 14 Dec 2017 20:45:17 -0800 Subject: [PATCH 12/51] Update to consume aspnetcore 2.0.5-147 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6bfb7e6d4..7b4c0fa31 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -42,7 +42,7 @@ 2.0.5 rtm 2.0.5 - 146 + 147 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From d5c613323855393c06eaac37b691e9336731fc78 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 15 Dec 2017 14:46:42 -0800 Subject: [PATCH 13/51] Adding the 2.0.3 asp.net store to the native installer tests. --- build/package/Installer.DEB.proj | 4 ++++ build/package/Installer.DEB.targets | 8 +++++++- build/package/Installer.RPM.targets | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index c3baf267b..ce2a2e27d 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -26,6 +26,7 @@ + @@ -89,6 +90,7 @@ + @@ -110,6 +112,7 @@ + @@ -125,6 +128,7 @@ + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 00afd7f30..9224596be 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -37,6 +37,7 @@ dotnet-host $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-2.0.0 + $(AspNetCoreRuntimePackageBrandName)-2.0.3 $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -125,12 +126,17 @@ DependsOnTargets="SetupDebProps"> $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200 + $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb + $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200) + $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index a4f7853ca..e987eb530 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -54,6 +54,7 @@ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-2.0.0 + $(AspNetCoreRuntimePackageBrandName)-2.0.3 $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm @@ -187,12 +188,17 @@ DependsOnTargets="SetupDebProps"> $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm + $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) + $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) + @@ -232,6 +238,7 @@ + @@ -248,6 +255,7 @@ + From 1912ce9e2095b69a31138f6cafd4cab2f3e57dc9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 18 Dec 2017 18:16:55 -0800 Subject: [PATCH 14/51] Commit to trigger a rebuild of the CLI because of a build in place from the Runtime. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e6d7174b4..8807beaa1 100644 --- a/README.md +++ b/README.md @@ -226,3 +226,4 @@ License ------- By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula). + From 559d880cc22bae12651e46e145ac917a10e59ca0 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 19 Dec 2017 15:17:03 -0800 Subject: [PATCH 15/51] Update to consume aspnetcore 2.0.5-152 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7b4c0fa31..a84cad443 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -42,7 +42,7 @@ 2.0.5 rtm 2.0.5 - 147 + 152 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 7af8cd0ae2f9e2762d5d5c12f2cb3416aee5b8d3 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 19 Dec 2017 15:18:35 -0800 Subject: [PATCH 16/51] Revert "Update to consume aspnetcore 2.0.5-152" This reverts commit 559d880cc22bae12651e46e145ac917a10e59ca0. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a84cad443..7b4c0fa31 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -42,7 +42,7 @@ 2.0.5 rtm 2.0.5 - 152 + 147 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From ed511c4e299ef29b34874256a7ed45329d3c8e9d Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 19 Dec 2017 15:19:20 -0800 Subject: [PATCH 17/51] Update to consume aspnetcore 2.0.5-152 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7b4c0fa31..a84cad443 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -42,7 +42,7 @@ 2.0.5 rtm 2.0.5 - 147 + 152 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 8c93b6d96084e786c90272d47431fac054558f5f Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 20 Dec 2017 19:25:45 -0800 Subject: [PATCH 18/51] Update to consume aspnetcore 2.0.5-155 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a84cad443..ded07c4be 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -42,7 +42,7 @@ 2.0.5 rtm 2.0.5 - 152 + 155 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 860de6339c9fc2323f426fa2db95501556020b57 Mon Sep 17 00:00:00 2001 From: William Lee Date: Tue, 2 Jan 2018 12:37:00 -0800 Subject: [PATCH 19/51] Update wix version (#8313) --- build/package/Installer.MSI.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 2a4e131b8..e1baf462d 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -2,7 +2,7 @@ - 3.10.2 + 3.10.4 https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip $(IntermediateDirectory)/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 80933404d0fcf7011447d6289fe3462211f6aa53 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 5 Jan 2018 12:53:03 -0800 Subject: [PATCH 20/51] Fix tool_roslyn_satellite by making it use the new dependency version properties. --- src/tool_roslyn_satellites/tool_roslyn_satellites.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj index d42c632b0..8e961be59 100644 --- a/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj +++ b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj @@ -5,7 +5,7 @@ $(CliVersionPrefix) $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) $(RoslynDirectory)/bincore $(CommitCount) false @@ -14,8 +14,8 @@ - - + + Date: Fri, 5 Jan 2018 15:36:45 -0800 Subject: [PATCH 21/51] Fixing redist to use the new way to consume roslyn. I merged it wrong before. --- build/DependencyVersions.props | 2 +- src/redist/redist.csproj | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 049a08108..69bc33d1b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ 4.2.0-rtm-171104-0 2.6.0-beta3-62309-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) 15.5.0-preview-20171116-1 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 183cb0fe6..b8349f820 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -22,10 +22,9 @@ - - + + All + @@ -75,7 +74,7 @@ BeforeTargets="Publish"> - + @@ -88,7 +87,7 @@ "version": ".*" - "version": "$(CLI_SharedFrameworkVersion)" + "version": "$(MicrosoftNETCoreAppPackageVersion)" Date: Mon, 8 Jan 2018 16:58:16 -0600 Subject: [PATCH 22/51] MSBuild 15.6.44 --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 69bc33d1b..f7ebe42a6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,9 +3,9 @@ 2.0.4 $(MicrosoftNETCoreAppPackageVersion) - 15.5.180 + 15.6.0-preview-000044-1264514 $(MicrosoftBuildPackageVersion) - 15.5.180.1 + $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 4.2.0-rtm-171104-0 From 168bbff95d6b424d0e875ac75b946d55196ed2e9 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 9 Jan 2018 16:58:29 -0800 Subject: [PATCH 23/51] Insert NuGet Build 4.6.0-rtm-4791 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 69bc33d1b..69fb5311c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.5.0-rtm-4651 + 4.6.0-rtm-4791 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 34ce5c5fdd08f8ca96c11341968fa4764eb054e4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 9 Jan 2018 18:52:34 -0800 Subject: [PATCH 24/51] Adding aspnet dev feed. --- build/NugetConfigFile.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 06d67c109..ae5e96175 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -31,6 +31,7 @@ + ]]> From d6d3b451d6303a71d0ad277ddc61fd64f5de5fca Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 12 Jan 2018 15:37:54 -0800 Subject: [PATCH 25/51] Updating the branding of the CLI to 2.1.100 --- build/BranchInfo.props | 4 ++-- 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 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index f048a677e..73adbce90 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/15.5 - release/15.5 + release/2.0 + release/2.1.1xx diff --git a/build/Branding.props b/build/Branding.props index 34d574a42..e1ea0a1a6 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.4 + Microsoft .NET Core SDK - 2.1.100 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.5 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 6a2b2f136..27be01588 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 4 + 100 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 f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • 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 f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • 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 f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • 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 f130fe0a4..30bd2b485 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.4
    • +
  • .NET Core SDK 2.1.100
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index cb379de96..74f1df4d6 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.4 + • .NET Core SDK 2.1.100 • .NET Core Runtime 2.0.5 • Runtime Package Store From a4afbc9f1f65b1dd3a41840e498c05f669f7bcb8 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 12 Jan 2018 15:47:42 -0800 Subject: [PATCH 26/51] Updates the TestPlatform to 15.6.0-preview-20180109-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index efe394cf1..f12b76a57 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -40,7 +40,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.5.0 + 15.6.0-preview-20180109-01 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From af8ea2ffb7f38d6d22c581e527c770a6f3cb0acb Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Sat, 13 Jan 2018 23:22:34 -0800 Subject: [PATCH 27/51] MSBuild 15.6.54 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index efe394cf1..6db71b172 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.5 $(MicrosoftNETCoreAppPackageVersion) - 15.6.0-preview-000044-1264514 + 15.6.0-preview-000054-1286830 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 8caa7b9f0d11699c7b555c6da42199b38aa50579 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 16 Jan 2018 09:37:59 -0800 Subject: [PATCH 28/51] Updating the channel to release/2.1.1xx. We can manually update release/2.0 if necessary, but LTS is always updated every time we release. --- build/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 73adbce90..03b91267f 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.0 + release/2.1.1xx release/2.1.1xx From c5cf9994e26551be5338b8d044a63bd884b84854 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Thu, 18 Jan 2018 12:15:22 -0800 Subject: [PATCH 29/51] Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2f838edd4..87f4e93e8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.6.0-beta3-62309-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 15.5.0-preview-62507-01 + 15.5.0-preview-62518-04 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) From a9c4a1ccab438208a197059ab03de5c817f6ad04 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 18 Jan 2018 13:06:33 -0800 Subject: [PATCH 30/51] Fixing the prefercliruntime asset --- .../dotnet-prefercliruntime/dotnet-prefercliruntime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj index 21eb0a6d1..e024fb2ba 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj @@ -10,7 +10,7 @@ true - \prefercliruntime + / From d0cdc9c266f320c6be489e1bdc19a1e7985440e8 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Thu, 18 Jan 2018 16:13:18 -0800 Subject: [PATCH 31/51] Insert NuGet Build 4.6.0-rtm-4825 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6fe05c54e..cbc657e71 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.6.0-rtm-4791 + 4.6.0-rtm-4825 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From d41b99205a3f99b36a90ea8d274d61c7a52760a8 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 23 Jan 2018 13:50:44 -0800 Subject: [PATCH 32/51] update fsharp compiler to match vs2017.6 preview 3 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cbc657e71..a9bd7893d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -8,7 +8,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 4.2.0-rtm-171104-0 + 10.1.0-rtm-180115-0 2.6.0-beta3-62309-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From b3c241480440dad5e55c45a40ee8547e21a64b82 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 23 Jan 2018 15:42:57 -0800 Subject: [PATCH 33/51] Update package reference --- src/tool_fsharp/tool_fsc.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj index d4088da28..c1847c6bd 100644 --- a/src/tool_fsharp/tool_fsc.csproj +++ b/src/tool_fsharp/tool_fsc.csproj @@ -14,6 +14,7 @@ + From e55de710cbfb154db2bd20e95f7db89f919e56fd Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Wed, 24 Jan 2018 09:14:40 -0800 Subject: [PATCH 34/51] MSBuild 15.6.69 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a9bd7893d..6ab777c79 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.5 $(MicrosoftNETCoreAppPackageVersion) - 15.6.0-preview-000054-1286830 + 15.6.0-preview-000069-1314993 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 352a99b38e7c0342870080958d27112e42114e13 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 24 Jan 2018 18:06:07 -0800 Subject: [PATCH 35/51] Insert NuGet Build 4.6.0-rtm-4859 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6ab777c79..cdb330722 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.6.0-rtm-4825 + 4.6.0-rtm-4859 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 46f55c34c63e676633d57031d14b8bbf28515f8c Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Thu, 25 Jan 2018 12:57:10 -0800 Subject: [PATCH 36/51] MSBuild 15.6.70 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cdb330722..1384d9973 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.5 $(MicrosoftNETCoreAppPackageVersion) - 15.6.0-preview-000069-1314993 + 15.6.0-preview-000070-1317370 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From ef6e049f27bde327c151b1326b2531427fc588e8 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Thu, 25 Jan 2018 13:17:38 -0800 Subject: [PATCH 37/51] Insert NuGet Build 4.6.0-rtm-4862 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cdb330722..b7e3893de 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.6.0-rtm-4859 + 4.6.0-rtm-4862 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From e6c8fa6cdd33cc7bfbeea4d7fd9f77b1667fc49d Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 25 Jan 2018 18:13:02 -0800 Subject: [PATCH 38/51] Update fsharp compiler to match preview 4 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1384d9973..442b1bcad 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -8,7 +8,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.0-rtm-180115-0 + 10.1.1-rtm-180125-0 2.6.0-beta3-62309-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 6fd727b646699bfcd3fd05dc54de99914e34a0b3 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 29 Jan 2018 14:16:51 -0800 Subject: [PATCH 39/51] Updating Roslyn to 2.7.0-beta3-62529-05. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0aa1ef434..45dee7b15 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.1-rtm-180125-0 - 2.6.0-beta3-62309-01 + 2.7.0-beta3-62529-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 15.5.0-preview-62518-04 From dc6ae8beae003b1fc45e1cf280582af6c7abc92c Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 30 Jan 2018 15:18:26 -0800 Subject: [PATCH 40/51] Insert NuGet Build 4.6.0-rtm-4880 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0aa1ef434..ef2048ff4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.6.0-rtm-4862 + 4.6.0-rtm-4880 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 3bf4751a8d49f991db969e5f12d6101e61919ebf Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 30 Jan 2018 14:02:40 -0800 Subject: [PATCH 41/51] Excluding shared framework assemblies from the Roslyn folder in the SDK. --- src/redist/redist.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index b8349f820..900d43f55 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -84,6 +84,7 @@ + "version": ".*" @@ -99,7 +100,7 @@ Configuration="$(Configuration)" ProjectPath="$(SrcDirectory)/tool_roslyn_satellites/tool_roslyn_satellites.csproj" /> - + Date: Wed, 31 Jan 2018 16:26:57 -0800 Subject: [PATCH 42/51] Update F# to match dev15.6 preview 4 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0aa1ef434..de477c674 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -8,7 +8,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.1-rtm-180125-0 + 10.1.2-rtm-180131-0 2.6.0-beta3-62309-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 617aa3725c61f9f0fc4fead4cf82d0730f2ec680 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Thu, 1 Feb 2018 14:57:27 -0800 Subject: [PATCH 43/51] MSBuild 15.6.76 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0aa1ef434..d01f03729 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.5 $(MicrosoftNETCoreAppPackageVersion) - 15.6.0-preview-000070-1317370 + 15.6.0-preview-000076-1343104 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From ad1292bac26b5f66146269e9852be4f65555f772 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 1 Feb 2018 23:02:01 +0100 Subject: [PATCH 44/51] Remove obsolete F# satellite package --- build/DependencyVersions.props | 1 - src/tool_fsharp/tool_fsc.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index de477c674..e116574f3 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -46,7 +46,6 @@ 0.2.0-beta-000042 0.2.0 2.6.0-pre-20171122-1 - 4.4.1-pre-20171122-1 diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj index c1847c6bd..9e55f68ab 100644 --- a/src/tool_fsharp/tool_fsc.csproj +++ b/src/tool_fsharp/tool_fsc.csproj @@ -13,7 +13,6 @@ - From bc486e787a561954c723fcb907a0fbfb06e6b3e4 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 5 Feb 2018 11:34:52 -0800 Subject: [PATCH 45/51] Ensure ASP.NET Core is included in macos .pkg installer and update to 2.1.0-preview1-28226 --- build/BundledRuntimes.props | 2 +- build/DependencyVersions.props | 2 +- build/OutputDirectories.props | 5 ++--- build/package/Layout.targets | 2 +- src/redist/redist.csproj | 26 +++++++++++++------------- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 50dc51106..0ab61c2ce 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -59,7 +59,7 @@ Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)')"> $(CoreSetupRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedFxArchiveFile) - $(SharedFrameworkPublishDirectory) + $(AspNetCoreSharedFxPublishDirectory) <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2fb3a2ed9..e6f6cec53 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0-preview1-28124 + 2.1.0-preview1-28226 2.1.0-preview1-26116-04 $(MicrosoftNETCoreAppPackageVersion) 15.6.0-preview-000054-1286830 diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props index 5ffd7a590..b5d26d549 100644 --- a/build/OutputDirectories.props +++ b/build/OutputDirectories.props @@ -20,15 +20,14 @@ $(BaseOutputDirectory)/intermediate $(BaseOutputDirectory)/packages $(IntermediateDirectory)/sharedFrameworkPublish - - $(BaseOutputDirectory)/AspRT + $(IntermediateDirectory)/aspnetSharedFxPublish $(IntermediateDirectory)/backwardsCompatibleSharedFrameworksPublish $(BaseOutputDirectory)/test/ $(OutputDirectory)/dotnet$(ExeExtension) $(IntermediateDirectory)/GeneratedMSBuildExtensions $(IntermediateDirectory)/MSBuildExtensionsLayout $(MSBuildExtensionsLayoutDirectory)/MSBuildSdkResolver - + $(BaseOutputDirectory)/PreviousStage.props diff --git a/build/package/Layout.targets b/build/package/Layout.targets index 4c14f6ee3..0ba2c3cfd 100644 --- a/build/package/Layout.targets +++ b/build/package/Layout.targets @@ -16,7 +16,7 @@ - + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 9b5208eee..7f1f5e01c 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -37,15 +37,15 @@ - - - + + - + - + @@ -104,7 +104,7 @@ - + @@ -141,7 +141,7 @@ $(PublishDir)/%(MSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension) - + @@ -262,11 +262,11 @@ - + - + @@ -291,7 +291,7 @@ CreateSymbols="$(CreateCrossgenSymbols)" DiasymReaderPath="@(DiasymReaderPath)" PlatformAssemblyPaths="@(PlatformAssemblies);@(RoslynFolders);$(SharedFrameworkNameVersionPath)" /> - + - + @@ -330,7 +330,7 @@ - From 5ea7f68d59bb4fba944d55bf7a284b21bd9f7956 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 5 Feb 2018 14:26:08 -0800 Subject: [PATCH 46/51] Adding the VBCSCompiler to the list of signed files due to crossgen. --- build/Signing.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Signing.proj b/build/Signing.proj index d3eebb140..59addaebd 100644 --- a/build/Signing.proj +++ b/build/Signing.proj @@ -38,6 +38,7 @@ - 2.1.0-preview1-28226 + 2.1.0-preview1-28228 2.1.0-preview1-26116-04 $(MicrosoftNETCoreAppPackageVersion) 15.6.0-preview-000054-1286830 diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 8e1c1e069..f8b41839b 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -4,7 +4,7 @@ - + - + @@ -29,7 +29,7 @@ - + ]]> @@ -39,13 +39,13 @@ ]]> - + - + - + diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config index 5383ef159..a9542bcc3 100644 --- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config @@ -5,7 +5,7 @@ - + From 4ac4751b02b8d9de6c483f5335ddc7ef2dcb64f5 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 7 Feb 2018 04:36:31 +0000 Subject: [PATCH 48/51] The BuildTasksFeedTool version and the VersionTools version should be in sync to prevent incompatabilities between these two packages. --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index abe9da39c..644f257c7 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -66,9 +66,9 @@ - 2.1.0-prerelease-02411-04 - 2.0.0-preview2-25331-01 2.1.0-prerelease-02430-04 + $(BuildTasksFeedToolVersion) + 2.0.0-preview2-25331-01 From d3263aafb8b65578222528227ea262cb4090c9f0 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 7 Feb 2018 09:59:13 -0800 Subject: [PATCH 49/51] Fixing recent CLI test failures around ASP.NETcore in the orchestrated build (#8553) * Fixing recent CLI test failures around ASP.NETcore in the orchestrated build. * Put back the dotnet-migrate test's 'tempaspnetpatch' Nuget.config * Fixing typos... --- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 0ffdf83e8..b195d55bb 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -44,11 +44,7 @@ namespace Microsoft.DotNet.New.Tests var rootPath = TestAssets.CreateTestDirectory().FullName; var packagesDirectory = Path.Combine(rootPath, "packages"); - // For testing the 2.1 templates - some of their packages are currently only in private feeds. - var configFile = Path.Combine(rootPath, "NuGet.Config"); - AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(configFile); - // For "normal" builds, once the packages needed for 2.1 templates are in the public feeds - //var configFile = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config"); + var configFile = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config"); foreach (string cSharpTemplate in cSharpTemplates) { From b69d9bda40a53a727a759bf9a043d275b9cf8771 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 6 Feb 2018 11:34:16 -0800 Subject: [PATCH 50/51] Updating the MSI Installation Note message. Also had to shift components around slightly to make it fit. --- packaging/windows/clisdk/bundle.thm | 17 +++++++++-------- packaging/windows/clisdk/bundle.wxl | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm index a9c3d64d3..797d2cab1 100644 --- a/packaging/windows/clisdk/bundle.thm +++ b/packaging/windows/clisdk/bundle.thm @@ -24,14 +24,15 @@ #(loc.WelcomeHeaderMessage) - #(loc.WelcomeDescription) - #(loc.LearnMoreTitle) - #(loc.CoreDocumentationLink) - #(loc.SDKDocumentation) - #(loc.PrivacyStatementLink) - #(loc.MITLicenseLink) - #(loc.InstallationNoteTitle) - #(loc.InstallationNote) + #(loc.WelcomeDescription) + #(loc.LearnMoreTitle) + #(loc.CoreDocumentationLink) + #(loc.SDKDocumentation) + #(loc.PrivacyStatementLink) + #(loc.MITLicenseLink) + #(loc.InstallationNoteTitle) + #(loc.InstallationNote) + #(loc.VisualStudioWarning) diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 09d08194b..92deb5132 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -74,4 +74,6 @@ Resources Installation note A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. + If you plan to use .NET Core 2.1 with Visual Studio, Visual Studio 2017 15.7 or newer is recommended. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Learn More</A>. + From be228a492faf6064d87e4adeb4dffe68cc551ce3 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 7 Feb 2018 14:58:09 -0800 Subject: [PATCH 51/51] Removing all references to a static 'aspnetpatch' Nuget.Config (#8556) --- .../NuGet.tempaspnetpatch.config | 10 ----- .../dotnet-migrate.Tests.csproj | 6 --- .../AspNetNuGetConfiguration.cs | 17 ------- .../GivenThatIWantANewAppWithSpecifiedType.cs | 44 ++++++++----------- .../NuGet.tempaspnetpatch.config | 11 ----- test/dotnet-new.Tests/dotnet-new.Tests.csproj | 5 --- 6 files changed, 19 insertions(+), 74 deletions(-) delete mode 100644 test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config delete mode 100644 test/dotnet-new.Tests/AspNetNuGetConfiguration.cs delete mode 100644 test/dotnet-new.Tests/NuGet.tempaspnetpatch.config diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config deleted file mode 100644 index 6629beca5..000000000 --- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 076146534..e2bce1d11 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -7,12 +7,6 @@ $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 - - - PreserveNewest - - - diff --git a/test/dotnet-new.Tests/AspNetNuGetConfiguration.cs b/test/dotnet-new.Tests/AspNetNuGetConfiguration.cs deleted file mode 100644 index b49c81009..000000000 --- a/test/dotnet-new.Tests/AspNetNuGetConfiguration.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.IO; - -namespace Microsoft.DotNet.New.Tests -{ - public class AspNetNuGetConfiguration - { - public static void WriteNuGetConfigWithAspNetPrivateFeeds(string path) - { - string resourceName = "dotnet-new.Tests.NuGet.tempaspnetpatch.config"; - using (Stream input = typeof(GivenThatIWantANewAppWithSpecifiedType).Assembly.GetManifestResourceStream(resourceName)) - using (Stream output = File.OpenWrite(path)) - { - input.CopyTo(output); - } - } - } -} \ No newline at end of file diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 6be4d1b0e..5a080e772 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -16,30 +16,29 @@ namespace Microsoft.DotNet.New.Tests public class GivenThatIWantANewAppWithSpecifiedType : TestBase { [Theory] - [InlineData("C#", "console", false, false)] - [InlineData("C#", "classlib", false, false)] - [InlineData("C#", "mstest", false, false)] - [InlineData("C#", "xunit", false, false)] - [InlineData("C#", "web", true, false)] - [InlineData("C#", "mvc", true, false)] - [InlineData("C#", "webapi", true, false)] - [InlineData("C#", "angular", false, true)] - [InlineData("C#", "react", false, true)] - [InlineData("C#", "reactredux", false, true)] - [InlineData("F#", "console", false, false)] + [InlineData("C#", "console", false)] + [InlineData("C#", "classlib", false)] + [InlineData("C#", "mstest", false)] + [InlineData("C#", "xunit", false)] + [InlineData("C#", "web", false)] + [InlineData("C#", "mvc", false)] + [InlineData("C#", "webapi", false)] + [InlineData("C#", "angular", true)] + [InlineData("C#", "react", true)] + [InlineData("C#", "reactredux", true)] + [InlineData("F#", "console", false)] // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574 - //[InlineData("F#", "classlib", false, false)] - [InlineData("F#", "mstest", false, false)] - [InlineData("F#", "xunit", false, false)] - [InlineData("F#", "mvc", true, false)] - [InlineData("VB", "console", false, false)] - [InlineData("VB", "classlib", false, false)] - [InlineData("VB", "mstest", false, false)] - [InlineData("VB", "xunit", false, false)] + //[InlineData("F#", "classlib", false)] + [InlineData("F#", "mstest", false)] + [InlineData("F#", "xunit", false)] + [InlineData("F#", "mvc", false)] + [InlineData("VB", "console", false)] + [InlineData("VB", "classlib", false)] + [InlineData("VB", "mstest", false)] + [InlineData("VB", "xunit", false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType, - bool useNuGetConfigForAspNet, bool skipSpaWebpackSteps) { string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; @@ -49,11 +48,6 @@ namespace Microsoft.DotNet.New.Tests .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive {noRestoreDirective}") .Should().Pass(); - if (useNuGetConfigForAspNet) - { - AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(Path.Combine(rootPath, "NuGet.Config")); - } - if (skipSpaWebpackSteps) { // Not all CI machines have Node installed, so the build would fail if we tried diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config deleted file mode 100644 index a9542bcc3..000000000 --- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index f022c49be..1d1a34da0 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -7,11 +7,6 @@ $(AssetTargetFallback);dnxcore50;portable-net45+win8 - - - - -