From b329bb7bd167645473df2df71945871f18b26d3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 18:48:20 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/aspnet/AspNetCore build 20191101.9 (#5474) - dotnet-dev-certs - 3.0.1-servicing.19551.9 - dotnet-user-secrets - 3.0.1-servicing.19551.9 - dotnet-watch - 3.0.1-servicing.19551.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19551.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19551.9 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbfa085b0..37bfec5ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,25 +45,25 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - 2c6456d4634df947e3cafd5e7dee02289dc12697 + 0f54cd75536340715c02e9913aa5a8d435e76518 - + https://github.com/aspnet/AspNetCore - 2c6456d4634df947e3cafd5e7dee02289dc12697 + 0f54cd75536340715c02e9913aa5a8d435e76518 - + https://github.com/aspnet/AspNetCore - 2c6456d4634df947e3cafd5e7dee02289dc12697 + 0f54cd75536340715c02e9913aa5a8d435e76518 - + https://github.com/aspnet/AspNetCore - 2c6456d4634df947e3cafd5e7dee02289dc12697 + 0f54cd75536340715c02e9913aa5a8d435e76518 - + https://github.com/aspnet/AspNetCore - 2c6456d4634df947e3cafd5e7dee02289dc12697 + 0f54cd75536340715c02e9913aa5a8d435e76518 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 0e9c8b7ea..74c19c674 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.1-servicing.19528.7 + 3.0.1-servicing.19551.9 3.0.0 - 3.0.1-servicing.19528.7 - 3.0.1-servicing.19528.7 - 3.0.1-servicing.19528.7 - 3.0.1-servicing.19528.7 + 3.0.1-servicing.19551.9 + 3.0.1-servicing.19551.9 + 3.0.1-servicing.19551.9 + 3.0.1-servicing.19551.9 From c5a4069bcd99805d5d7d01becf01a442f86c75fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 22:28:54 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/toolset build 20191101.17 (#5476) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19551.17 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37bfec5ff..b39a4f99d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - c3fb2eec9067143c7b175bbf5d30e60858b22547 + 6dab769e2e7a25765543fb27a4f58d6bfb31238b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 74c19c674..c64fea96c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19531.27 + 3.0.101-servicing.19551.17 From 88b33a0f8cdc09f2887eca96f38abc92d032873b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 03:31:56 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/toolset build 20191104.6 (#5531) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19554.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19554.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b39a4f99d..a33edbf38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,17 +69,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 6dab769e2e7a25765543fb27a4f58d6bfb31238b + cdeb9fe42575a336e130da975b2848b03f1c96cd https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - abc73b807191ff9c7d1b503aec70f6eb0e64f1fa + 3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea diff --git a/eng/Versions.props b/eng/Versions.props index c64fea96c..6e45aa341 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19551.17 + 3.0.101-servicing.19554.6 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19529.3 + 3.0.101-servicing.19554.2 0.2.0 From 8b9de75a227239a04b449cca6ac431d571fdf97a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 21:42:29 -0800 Subject: [PATCH 04/11] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#5526) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1 * Fix blob URLs for stabilized ASP.NET 3.0.x Unpin 3.0.x ASP.NET targeting pack Revert dotnet-* tools packages to 3.0.0 versions * Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1 * Fix version of the targeting pack * Fix targeting pack version --- NuGet.config | 3 +- eng/Version.Details.xml | 36 ++++++++++++----------- eng/Versions.props | 12 ++++---- src/redist/targets/GenerateLayout.targets | 7 ++--- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index b88b1688e..0604f9df5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a33edbf38..4c6694aa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,29 +41,31 @@ 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + + https://github.com/aspnet/AspNetCore + 0b713e577716e915082021942065aff1d20a0604 + + + https://github.com/aspnet/AspNetCore + 22dedcb2f0de59022e0383e1f05c9caffc708522 + + + + + https://github.com/aspnet/AspNetCore + 22dedcb2f0de59022e0383e1f05c9caffc708522 + + https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - 0f54cd75536340715c02e9913aa5a8d435e76518 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - 0f54cd75536340715c02e9913aa5a8d435e76518 - - - https://github.com/aspnet/AspNetCore - 0f54cd75536340715c02e9913aa5a8d435e76518 - - - https://github.com/aspnet/AspNetCore - 0f54cd75536340715c02e9913aa5a8d435e76518 - - - https://github.com/aspnet/AspNetCore - 0f54cd75536340715c02e9913aa5a8d435e76518 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 6e45aa341..1074f6309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.1-servicing.19551.9 - 3.0.0 - 3.0.1-servicing.19551.9 - 3.0.1-servicing.19551.9 - 3.0.1-servicing.19551.9 - 3.0.1-servicing.19551.9 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19554.7 + 3.0.0-rc2.19465.2 + 3.0.0-rc2.19465.2 + 3.0.0-rc2.19465.2 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 25713d97e..db089843c 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -10,12 +10,12 @@ - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion) $(MicrosoftNETCoreAppInternalPackageVersion) 3.0.0 - 3.0.0 + $(AspNetCoreBlobVersion) 3.0.0 3.0.0 @@ -226,8 +226,7 @@ - $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) - $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(DownloadedAspNetTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) From 17c09ac2b2d58baba889db22ac204c06e09d78c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 22:41:45 -0800 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/toolset build 20191104.11 (#5541) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19554.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c6694aa7..546c75b0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - cdeb9fe42575a336e130da975b2848b03f1c96cd + 4742a2d9c56b249808bab066a12a50554377a90b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1074f6309..dd6ef2b11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19554.6 + 3.0.101-servicing.19554.11 From a79f31732b5e5d1f6e7105c5e1204b9ba8bb45a1 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 4 Nov 2019 22:41:51 -0800 Subject: [PATCH 06/11] Stabilize package versions (#5540) --- src/redist/targets/Versions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index fb880e60d..44726c949 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -8,7 +8,7 @@ - false + true From 246b25d71936dfc607281ef3a442e17db06d1a16 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 5 Nov 2019 06:00:52 -0800 Subject: [PATCH 07/11] Update dependencies from aspnetcore (#5547) --- NuGet.config | 1 - eng/Version.Details.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0604f9df5..d6d5860c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 546c75b0e..a3031f55c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,7 +43,7 @@ https://github.com/aspnet/AspNetCore - 0b713e577716e915082021942065aff1d20a0604 + 22dedcb2f0de59022e0383e1f05c9caffc708522 https://github.com/aspnet/AspNetCore From ec736cbd54dc2b75a36acda4a7c00e4b99c7d094 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 7 Nov 2019 07:05:11 -0800 Subject: [PATCH 08/11] Update implicit package versions for 2.2.7 and 2.1.14 (#5566) --- src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 996017818..d2975fe69 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -82,28 +82,28 @@ + LatestVersion="2.1.14" /> + LatestVersion="2.2.8" /> + LatestVersion="2.1.14"/> + LatestVersion="2.1.14"/> + LatestVersion="2.2.8"/> + LatestVersion="2.2.8"/> From fd5b02d5a7f7595c7903e96ef8f88e302081c463 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 7 Nov 2019 07:42:22 -0800 Subject: [PATCH 09/11] Fixup version property files --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 316f8b33b..b4ce8dc3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,7 +47,7 @@ https://github.com/aspnet/AspNetCore 80fec4e3edea3972e95885f5c0db6ee06072f917 - + https://github.com/aspnet/AspNetCore 80fec4e3edea3972e95885f5c0db6ee06072f917 diff --git a/eng/Versions.props b/eng/Versions.props index f463a8fa0..a1afd785c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 - 3.1.0-preview3.19555.2 + 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 From 4abb5e7a4fc7aedc5994bbae8925d41fa858a366 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 7 Nov 2019 21:48:56 -0800 Subject: [PATCH 10/11] Move pinned dependencies later in file (#5579) Under the current CPD algorithm, which uses first found, work around issues with pinned dependencies by moving them after other dependencies from the same repository --- eng/Version.Details.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3031f55c..d915f08c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,10 @@ - - - https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 - https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - - - https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 - https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 @@ -36,6 +26,16 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea From 5e444258cbc75de10ba590f12a62c77c10e39379 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 8 Nov 2019 13:58:10 -0800 Subject: [PATCH 11/11] Set DOTNET_ROOT in tests (#5584) --- .../Commands/TestCommand.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs index a82872429..c25fcd533 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs @@ -145,6 +145,17 @@ namespace Microsoft.DotNet.Tools.Test.Utilities psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0"; psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; + // Set DOTNET_ROOT to ensure sub process find the same host fxr + string dotnetDirectoryPath = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); + if (System.Environment.Is64BitProcess) + { + psi.Environment.Add("DOTNET_ROOT", dotnetDirectoryPath); + } + else + { + psi.Environment.Add("DOTNET_ROOT(x86)", dotnetDirectoryPath); + } + AddEnvironmentVariablesTo(psi); AddWorkingDirectoryTo(psi);