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 001/114] 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 002/114] 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 c46588ae63f75b07a3cdcfcb0814229a9c58450d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 17:18:38 -0800 Subject: [PATCH 003/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.4 (#5528) - dotnet-user-secrets - 3.1.0-preview3.19554.4 - dotnet-watch - 3.1.0-preview3.19554.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19554.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19554.4 - dotnet-dev-certs - 3.1.0-preview3.19554.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19554.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f4d614d1..d3514c8aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - da20a1208694e8ed361a44d1225bd92d1ca1729a + e3b971a75e2512d267605aa190122b874d9d948d - + https://github.com/aspnet/AspNetCore - da20a1208694e8ed361a44d1225bd92d1ca1729a + e3b971a75e2512d267605aa190122b874d9d948d - + https://github.com/aspnet/AspNetCore - da20a1208694e8ed361a44d1225bd92d1ca1729a + e3b971a75e2512d267605aa190122b874d9d948d - + https://github.com/aspnet/AspNetCore - da20a1208694e8ed361a44d1225bd92d1ca1729a + e3b971a75e2512d267605aa190122b874d9d948d - + https://github.com/aspnet/AspNetCore - da20a1208694e8ed361a44d1225bd92d1ca1729a + e3b971a75e2512d267605aa190122b874d9d948d - + https://github.com/aspnet/AspNetCore - da20a1208694e8ed361a44d1225bd92d1ca1729a + e3b971a75e2512d267605aa190122b874d9d948d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index faacec199..6d0a01755 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 + 3.1.0-preview3.19554.4 + 3.1.0-preview3.19554.4 + 3.1.0-preview3.19554.4 + 3.1.0-preview3.19554.4 + 3.1.0-preview3.19554.4 + 3.1.0-preview3.19554.4 From 2fd19531aeaff98ee56287970c7d2cf734511fff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 01:46:56 +0000 Subject: [PATCH 004/114] Update dependencies from https://github.com/dotnet/toolset build 20191104.4 (#5529) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.4 --- 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 d3514c8aa..910ce05c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 03f891808be9383ab5dc5bb7aee935c331649507 + 4e84b1d15eb841ae4168ae462b4b5fa5d52a407f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6d0a01755..ce2cb469a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19553.9 + 3.1.100-preview3.19554.4 From cfaedd8b05c18b30e5571172276ef0dba88fde92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 18:22:16 -0800 Subject: [PATCH 005/114] Update dependencies from https://github.com/dotnet/toolset build 20191104.7 (#5535) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19554.3 (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 910ce05c4..bef6d5a5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 4e84b1d15eb841ae4168ae462b4b5fa5d52a407f + 3d0b233f2e7cb529c88395fc09d8be421822cf4f https://github.com/dotnet/sdk cecb7196560c8b8b732ef9c07494cac7e0745c76 - + https://github.com/dotnet/cli - cef679a0db78024555057298fbcf7ff356427ee0 + 88badb441d9477067b76916f046b8d0a212a6eca diff --git a/eng/Versions.props b/eng/Versions.props index ce2cb469a..5d861b956 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19554.4 + 3.1.100-preview3.19554.7 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19553.3 + 3.1.100-preview3.19554.3 0.2.0 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 006/114] 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 21e769f21edccd39eda5a1bfbbe6275d56f2c6fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 20:36:32 -0800 Subject: [PATCH 007/114] Update dependencies from https://github.com/dotnet/toolset build 20191104.8 (#5537) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.8 --- 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 bef6d5a5c..d541ee891 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 3d0b233f2e7cb529c88395fc09d8be421822cf4f + ebf7a7628695cbb26f1a70e9963c16cefc3df116 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5d861b956..9e5eb70ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19554.7 + 3.1.100-preview3.19554.8 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 008/114] [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 009/114] 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 010/114] 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 011/114] 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 9cdce1995dc25fad49751caba829d4ca60656938 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 15:05:58 +0000 Subject: [PATCH 012/114] Update dependencies from https://github.com/dotnet/toolset build 20191105.3 (#5549) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19555.3 --- 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 d541ee891..b3c1d0837 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - ebf7a7628695cbb26f1a70e9963c16cefc3df116 + e588fc8d1fe642da8ea53c3a97f6982a1ede2f9a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9e5eb70ae..3985a895e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19554.8 + 3.1.100-preview3.19555.3 From 161162afafe2a9ba89f3cbe231b38e0931375447 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 22:55:38 +0000 Subject: [PATCH 013/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191105.2 (#5552) - dotnet-user-secrets - 3.1.0-preview3.19555.2 - dotnet-watch - 3.1.0-preview3.19555.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19555.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19555.2 - dotnet-dev-certs - 3.1.0-preview3.19555.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19555.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3c1d0837..8866394b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - e3b971a75e2512d267605aa190122b874d9d948d + 80fec4e3edea3972e95885f5c0db6ee06072f917 - + https://github.com/aspnet/AspNetCore - e3b971a75e2512d267605aa190122b874d9d948d + 80fec4e3edea3972e95885f5c0db6ee06072f917 - + https://github.com/aspnet/AspNetCore - e3b971a75e2512d267605aa190122b874d9d948d + 80fec4e3edea3972e95885f5c0db6ee06072f917 - + https://github.com/aspnet/AspNetCore - e3b971a75e2512d267605aa190122b874d9d948d + 80fec4e3edea3972e95885f5c0db6ee06072f917 - + https://github.com/aspnet/AspNetCore - e3b971a75e2512d267605aa190122b874d9d948d + 80fec4e3edea3972e95885f5c0db6ee06072f917 - + https://github.com/aspnet/AspNetCore - e3b971a75e2512d267605aa190122b874d9d948d + 80fec4e3edea3972e95885f5c0db6ee06072f917 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3985a895e..020ae99a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19554.4 - 3.1.0-preview3.19554.4 - 3.1.0-preview3.19554.4 - 3.1.0-preview3.19554.4 - 3.1.0-preview3.19554.4 - 3.1.0-preview3.19554.4 + 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 b32d27f4b3215218bdf8128e52db1f1bce53ce8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 17:00:47 -0800 Subject: [PATCH 014/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5553) * Update dependencies from https://github.com/dotnet/toolset build 20191105.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19555.5 * Update dependencies from https://github.com/dotnet/toolset build 20191105.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19555.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19555.1 (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 8866394b0..52b63c392 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e588fc8d1fe642da8ea53c3a97f6982a1ede2f9a + 72de8462a112d42ba595430d7ddadaa85889bc17 https://github.com/dotnet/sdk cecb7196560c8b8b732ef9c07494cac7e0745c76 - + https://github.com/dotnet/cli - 88badb441d9477067b76916f046b8d0a212a6eca + c774787db6ccb86203eedc5b22b66d130cdd6425 diff --git a/eng/Versions.props b/eng/Versions.props index 020ae99a6..e22e8ac0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19555.3 + 3.1.100-preview3.19555.6 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19554.3 + 3.1.100-preview3.19555.1 0.2.0 From 4e297402454bc180247dd6aec2c46c605fb0826a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2019 01:05:18 +0000 Subject: [PATCH 015/114] Update dependencies from https://github.com/dotnet/wcf build 20191105.3 - System.ServiceModel.Primitives - 4.7.0 --- NuGet.config | 1 + eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84e92e811..8e23dbc9d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52b63c392..0b0b1aed9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,9 +94,9 @@ - + https://github.com/dotnet/wcf - fbb5aef10b235e98332c6f5c27de47826e84ef4d + df0f9f36689252fa72c902d19c5197c0723983e0 From 07b9e33493ea1cd79b668d1cba567b33e422c74b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2019 14:25:41 +0000 Subject: [PATCH 016/114] Update dependencies from https://github.com/dotnet/toolset build 20191106.2 (#5564) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19556.2 --- 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 52b63c392..316f8b33b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 72de8462a112d42ba595430d7ddadaa85889bc17 + 99ff32c4f4c1618f4d536cedfc088d747c65f8ce https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e22e8ac0e..f463a8fa0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19555.6 + 3.1.100-preview3.19556.2 From 22495aa28ca5cc2a896e8a6af4d9f81571677671 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2019 03:20:18 +0000 Subject: [PATCH 017/114] Update dependencies from https://github.com/dotnet/toolset build 20191106.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19556.6 --- 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 316f8b33b..6fe74092e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 99ff32c4f4c1618f4d536cedfc088d747c65f8ce + 4fa55c7d1de3c424a15fc53b0db8748a2f39cc90 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f463a8fa0..b962e2d8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19556.2 + 3.1.100-preview3.19556.6 From 231e7094a847afcf770c9d6dae12b92e2671295d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2019 13:50:21 +0000 Subject: [PATCH 018/114] Update dependencies from https://github.com/dotnet/toolset build 20191107.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19557.1 --- 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 6fe74092e..0b3d9e368 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 4fa55c7d1de3c424a15fc53b0db8748a2f39cc90 + 7cb85c0f1fd221143aa4d60d5cc4351a1ebd3c1c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b962e2d8e..326b62f71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19556.6 + 3.1.100-preview3.19557.1 From ec736cbd54dc2b75a36acda4a7c00e4b99c7d094 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 7 Nov 2019 07:05:11 -0800 Subject: [PATCH 019/114] 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 020/114] 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 021/114] 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 a456420130c501b1e2e78bab37f3d1ad2a0521a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2019 13:55:22 +0000 Subject: [PATCH 022/114] Update dependencies from https://github.com/dotnet/toolset build 20191108.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19558.1 --- 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 0b3d9e368..8e0aada56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7cb85c0f1fd221143aa4d60d5cc4351a1ebd3c1c + 87f6a9baeee7e86504d2ffafb42d9cd7b20550bf https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 326b62f71..c9a475c9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19557.1 + 3.1.100-preview3.19558.1 From 5e444258cbc75de10ba590f12a62c77c10e39379 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 8 Nov 2019 13:58:10 -0800 Subject: [PATCH 023/114] 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); From bc5f8df0f5a860e8f37c552780753a81e835bcaf Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 8 Nov 2019 14:24:42 -0800 Subject: [PATCH 024/114] Download from blob storage (#5586) Do not use the CDN as this can cause caching issues if bits have to be overwritten (which should not happen automatically, but may happen manually in certain cases) --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index db089843c..d8f36a72e 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -28,7 +28,7 @@ $(DOTNETCLIMSRC_READ_SAS_TOKEN) https://dotnetclimsrc.blob.core.windows.net/dotnet/ - https://dotnetcli.azureedge.net/dotnet/ + https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetclimsrc.blob.core.windows.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ From 36fd0e0e6e29619a29b1d935ac5c950e170023bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2019 14:45:28 +0000 Subject: [PATCH 025/114] Update dependencies from https://github.com/dotnet/toolset build 20191109.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19559.2 --- 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 8e0aada56..6ac3794f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 87f6a9baeee7e86504d2ffafb42d9cd7b20550bf + d7d959d8d034c989fb9234f5afeaeafcb463c0e7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c9a475c9a..bcc06f5b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19558.1 + 3.1.100-preview3.19559.2 From b6eeb93ece2b0b5b6ea7a7b426bafaf365dad778 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 11 Nov 2019 10:53:58 -0800 Subject: [PATCH 026/114] Revert "Remove rhel.6" This reverts commit 58537a3b9f9d2bf77e85a5db7f07da38c72ce14f. --- .vsts-ci.yml | 14 ++++++++ eng/docker/rhel.6/Dockerfile | 34 +++++++++++++++++++ src/redist/targets/Badge.targets | 1 + src/redist/targets/GenerateLayout.targets | 1 + .../targets/GetRuntimeInformation.targets | 2 ++ src/redist/targets/SetBuildDefaults.targets | 1 + 6 files changed, 53 insertions(+) create mode 100644 eng/docker/rhel.6/Dockerfile diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6748aa26d..094e31178 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -129,6 +129,13 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' + Build_Rhel_6_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker rhel.6' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id rhel.6-x64' + _BuildArchitecture: 'x64' + _DropSuffix: '' Build_Arm_Debug: _BuildConfig: Debug _DockerParameter: '' @@ -179,6 +186,13 @@ stages: _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' _DropSuffix: '' + Build_Rhel_6_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel.6' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id rhel.6-x64' + _BuildArchitecture: 'x64' + _DropSuffix: '' Build_Linux_musl_Release_x64: _BuildConfig: Release _DockerParameter: '--docker alpine.3.6' diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile new file mode 100644 index 000000000..9e2e572d0 --- /dev/null +++ b/eng/docker/rhel.6/Dockerfile @@ -0,0 +1,34 @@ +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331 + +# yum doesn't work with the special curl version we have in the base docker image, +# so we remove /usr/local/lib from the library path for this command +RUN yum -q -y install sudo + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g root +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permssions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/bin/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set library path to make CURL and ICU libraries that are in /usr/local/lib visible +ENV LD_LIBRARY_PATH /usr/local/lib + +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} + +# Set up Azure Artifacts credential provider +RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets index f7416fef7..8e9ccc4ac 100644 --- a/src/redist/targets/Badge.targets +++ b/src/redist/targets/Badge.targets @@ -19,6 +19,7 @@ $(OSName)_$(Architecture) + rhel.6_x64 linux_musl_x64 linux_$(Architecture) all_linux_distros_native_installer diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index d8f36a72e..e595067aa 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -70,6 +70,7 @@ dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) + linux-x64 $(AspNetCoreSharedFxInstallerRid) x64 diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 695a56908..bdc42db26 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -26,10 +26,12 @@ $(Rid) $(OSName)-$(Architecture) $(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index 268100720..52d64447a 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -15,6 +15,7 @@ true true From 8d09f0d40320bc5eea14e081b7b55f7a227bcd1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 12:43:22 -0800 Subject: [PATCH 027/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5609) * Update dependencies from https://github.com/dotnet/toolset build 20191111.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19555.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191111.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19555.3 (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 28edb6ebe..d23c3defd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - d7d959d8d034c989fb9234f5afeaeafcb463c0e7 + 72c972ad4eb85f20fe7070fe7da843d0f4e76c70 https://github.com/dotnet/sdk cecb7196560c8b8b732ef9c07494cac7e0745c76 - + https://github.com/dotnet/cli - c774787db6ccb86203eedc5b22b66d130cdd6425 + b560c4b529fdf0d04ce684c2ec9c17652b68641d diff --git a/eng/Versions.props b/eng/Versions.props index 1e23af208..237ef78fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19559.2 + 3.1.100-preview3.19561.3 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19555.1 + 3.1.100-preview3.19555.3 0.2.0 From 0b801c8f8b6a879f8f20624fb4f4211abb74f3e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 14:04:48 -0800 Subject: [PATCH 028/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.3 (#5614) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19561.3 - dotnet-user-secrets - 3.1.0-preview3.19561.3 - dotnet-watch - 3.1.0-preview3.19561.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19561.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.3 - dotnet-dev-certs - 3.1.0-preview3.19561.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d23c3defd..a152244ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - 80fec4e3edea3972e95885f5c0db6ee06072f917 + ec5ccaca22a75559d90c88795b5cd6b1136c8a0a - + https://github.com/aspnet/AspNetCore - 80fec4e3edea3972e95885f5c0db6ee06072f917 + ec5ccaca22a75559d90c88795b5cd6b1136c8a0a - + https://github.com/aspnet/AspNetCore - 80fec4e3edea3972e95885f5c0db6ee06072f917 + ec5ccaca22a75559d90c88795b5cd6b1136c8a0a - + https://github.com/aspnet/AspNetCore - 80fec4e3edea3972e95885f5c0db6ee06072f917 + ec5ccaca22a75559d90c88795b5cd6b1136c8a0a - + https://github.com/aspnet/AspNetCore - 80fec4e3edea3972e95885f5c0db6ee06072f917 + ec5ccaca22a75559d90c88795b5cd6b1136c8a0a - + https://github.com/aspnet/AspNetCore - 80fec4e3edea3972e95885f5c0db6ee06072f917 + ec5ccaca22a75559d90c88795b5cd6b1136c8a0a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 237ef78fe..dfe6e5944 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 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.19561.3 + 3.1.0-preview3.19561.3 + 3.1.0-preview3.19561.3 + 3.1.0-preview3.19561.3 + 3.1.0-preview3.19561.3 + 3.1.0-preview3.19561.3 From 217e67a4a9d8814873175f4dcbad631f97b29d63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 22:21:14 +0000 Subject: [PATCH 029/114] Update dependencies from https://github.com/dotnet/toolset build 20191111.4 (#5612) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.4 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19561.1 (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 a152244ac..4843a26ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,13 +71,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 72c972ad4eb85f20fe7070fe7da843d0f4e76c70 + 64955c27b2c69a63b559c9b1577c13f7ebe2d57c - + https://github.com/dotnet/sdk - cecb7196560c8b8b732ef9c07494cac7e0745c76 + d1373812342cdb91abce399e1926bb1f0421e17c https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index dfe6e5944..7e4cf78d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.3 + 3.1.100-preview3.19561.4 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19553.1 + 3.1.100-preview3.19561.1 $(MicrosoftNETSdkPackageVersion) From 3baf993218921ee790d4b4dff5eeb22a8c543cc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 14:47:58 -0800 Subject: [PATCH 030/114] Update dependencies from https://github.com/dotnet/core-setup build 20191111.2 (#5615) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.2 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19561.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19561.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19561.2 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19561.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4843a26ac..98ce59c7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 diff --git a/eng/Versions.props b/eng/Versions.props index 7e4cf78d7..8b21f49b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,13 +61,13 @@ - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 2.1.0 From 1ab813761895ef7548995506fb9fb19fd93ffc31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 15:39:50 -0800 Subject: [PATCH 031/114] Update dependencies from https://github.com/dotnet/toolset build 20191111.7 (#5617) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.7 --- 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 98ce59c7e..f981a3fb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 64955c27b2c69a63b559c9b1577c13f7ebe2d57c + 60f094ac708db74a37c43e076a67300928d6a632 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8b21f49b9..957d2fbbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.4 + 3.1.100-preview3.19561.7 From a042d8a5ce16bf2ff3ece02b1062a9a00630e276 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 02:05:28 +0000 Subject: [PATCH 032/114] Update dependencies from https://github.com/dotnet/toolset build 20191111.8 (#5618) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.8 --- 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 f981a3fb9..95e3e7101 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 60f094ac708db74a37c43e076a67300928d6a632 + 4b561f1b65d460db7ee368629eb5eacbde6b05ad https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 957d2fbbd..b54d5423c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.7 + 3.1.100-preview3.19561.8 From 86eacbbb7087bf82ccd0f5ea52256a9c9ac2e401 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 18:20:52 -0800 Subject: [PATCH 033/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.6 (#5619) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19561.6 - dotnet-user-secrets - 3.1.0-preview3.19561.6 - dotnet-watch - 3.1.0-preview3.19561.6 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19561.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.6 - dotnet-dev-certs - 3.1.0-preview3.19561.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95e3e7101..05197a127 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - ec5ccaca22a75559d90c88795b5cd6b1136c8a0a + a89b11096697d2742edb5719fee3b600a0ee8e63 - + https://github.com/aspnet/AspNetCore - ec5ccaca22a75559d90c88795b5cd6b1136c8a0a + a89b11096697d2742edb5719fee3b600a0ee8e63 - + https://github.com/aspnet/AspNetCore - ec5ccaca22a75559d90c88795b5cd6b1136c8a0a + a89b11096697d2742edb5719fee3b600a0ee8e63 - + https://github.com/aspnet/AspNetCore - ec5ccaca22a75559d90c88795b5cd6b1136c8a0a + a89b11096697d2742edb5719fee3b600a0ee8e63 - + https://github.com/aspnet/AspNetCore - ec5ccaca22a75559d90c88795b5cd6b1136c8a0a + a89b11096697d2742edb5719fee3b600a0ee8e63 - + https://github.com/aspnet/AspNetCore - ec5ccaca22a75559d90c88795b5cd6b1136c8a0a + a89b11096697d2742edb5719fee3b600a0ee8e63 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b54d5423c..b2f4e00fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19561.3 - 3.1.0-preview3.19561.3 - 3.1.0-preview3.19561.3 - 3.1.0-preview3.19561.3 - 3.1.0-preview3.19561.3 - 3.1.0-preview3.19561.3 + 3.1.0-preview3.19561.6 + 3.1.0-preview3.19561.6 + 3.1.0-preview3.19561.6 + 3.1.0-preview3.19561.6 + 3.1.0-preview3.19561.6 + 3.1.0-preview3.19561.6 From 08ac1f488dba86d64d574c1037ba034f32d8ea1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 02:35:59 +0000 Subject: [PATCH 034/114] Update dependencies from https://github.com/dotnet/core-setup build 20191111.4 (#5620) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.4 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19561.4 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19561.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19561.4 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19561.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.4 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview3.19561.3 (parent: Microsoft.NetCore.App.Internal) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19557.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19558.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05197a127..f7a8f6afd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 046765913dff824f9ed0f2d2fe0fb9b111906cf5 + b59b5d67cf03324176b659ef1812969ac1e24c6f https://github.com/aspnet/AspNetCore @@ -84,13 +84,13 @@ b560c4b529fdf0d04ce684c2ec9c17652b68641d - + https://github.com/dotnet/winforms - 4475da4f210f28bff944084d5b3e96880f1c51f8 + 922e41002e66fb10d703705d9be700c8b30cd63d - + https://github.com/dotnet/wpf - 3dfee2019cb6e2294cdfed441f1ac0e6026ceff7 + af68b9cea7d449b1b95ba3899abe629f5d15b167 diff --git a/eng/Versions.props b/eng/Versions.props index b2f4e00fe..501e02154 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19552.1 + 4.8.1-preview1.19557.8 - 3.1.0-preview2.19553.1 + 3.1.0-preview2.19558.3 @@ -57,17 +57,17 @@ - 3.1.0-preview3.19551.4 + 3.1.0-preview3.19561.3 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 2.1.0 From 7c814f57596c9f7d3acc08d7fdbb82429abc51cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 19:02:59 -0800 Subject: [PATCH 035/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5621) * Update dependencies from https://github.com/dotnet/toolset build 20191111.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.9 * Update dependencies from https://github.com/dotnet/toolset build 20191111.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.10 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.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 f7a8f6afd..0e1b1634c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 4b561f1b65d460db7ee368629eb5eacbde6b05ad + ca3ba4794740483cb91204a6a17d52a77f98c401 https://github.com/dotnet/sdk d1373812342cdb91abce399e1926bb1f0421e17c - + https://github.com/dotnet/cli - b560c4b529fdf0d04ce684c2ec9c17652b68641d + d5c007333c6ce428c2183738764fcdabe890e774 diff --git a/eng/Versions.props b/eng/Versions.props index 501e02154..8450694e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.8 + 3.1.100-preview3.19561.10 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19555.3 + 3.1.100-preview3.19561.2 0.2.0 From 96c2ccfed60f24055c3dc2aaa70390309f27a667 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 19:48:59 -0800 Subject: [PATCH 036/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5623) * Update dependencies from https://github.com/dotnet/toolset build 20191111.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.11 * Update dependencies from https://github.com/dotnet/toolset build 20191111.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.12 * Update dependencies from https://github.com/dotnet/toolset build 20191111.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.13 * Update dependencies from https://github.com/dotnet/toolset build 20191111.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.14 * Update dependencies from https://github.com/dotnet/toolset build 20191111.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.15 * Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e23dbc9d..301efba9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e1b1634c..2d863e1ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,21 +67,21 @@ https://github.com/dotnet/test-templates 6ae8a6e7dd862c9447771c108d43fb9028f22c22 - + https://github.com/dotnet/templating - fa98e14b1b8d84a1a711ef909384f16ada8bbe7c + 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - ca3ba4794740483cb91204a6a17d52a77f98c401 + 370709d8543bb2bb5e5c1cb01001f46107057a38 https://github.com/dotnet/sdk d1373812342cdb91abce399e1926bb1f0421e17c - + https://github.com/dotnet/cli - d5c007333c6ce428c2183738764fcdabe890e774 + e89ee5eed6774ede5beef71092414426ab159dec diff --git a/eng/Versions.props b/eng/Versions.props index 8450694e6..ed2ec1b16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.10 + 3.1.100-preview3.19561.15 @@ -24,7 +24,7 @@ - 3.1.0-preview1.19476.7 + 3.1.0 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19561.2 + 3.1.100-preview3.19561.6 0.2.0 From 2b9765f7c54dc82467de79f6a38eac09d16a68c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 20:22:49 -0800 Subject: [PATCH 037/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5624) * Update dependencies from https://github.com/dotnet/toolset build 20191111.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.16 * Update dependencies from https://github.com/dotnet/toolset build 20191111.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.17 * Update dependencies from https://github.com/dotnet/toolset build 20191111.18 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.18 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19561.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 2d863e1ed..65c783f1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,13 +71,13 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 370709d8543bb2bb5e5c1cb01001f46107057a38 + 262d32eea7254f7e32c3da7f2cd588555c4a127e - + https://github.com/dotnet/sdk - d1373812342cdb91abce399e1926bb1f0421e17c + 03f15d127b0c326bf35704dffaeb0f94b3ae9628 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index ed2ec1b16..56e24a679 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.15 + 3.1.100-preview3.19561.18 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19561.1 + 3.1.100-preview3.19561.2 $(MicrosoftNETSdkPackageVersion) From 1db6d6e50b0d5bca21ee9642ac17cc2e36fe9c5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 20:41:08 -0800 Subject: [PATCH 038/114] Update dependencies from https://github.com/dotnet/core-setup build 20191111.5 (#5625) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.5 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19561.5 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19561.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19561.5 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19561.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.5 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview3.19561.4 (parent: Microsoft.NetCore.App.Internal) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65c783f1e..fd2e1e034 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - b59b5d67cf03324176b659ef1812969ac1e24c6f + 686da8f7f583c49fe820a8f694f0b968323d575b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 56e24a679..0e3377212 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,17 +57,17 @@ - 3.1.0-preview3.19561.3 + 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 2.1.0 From ff6ccb7ccfb2e73c64675bec271de09f379d766e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 22:07:10 -0800 Subject: [PATCH 039/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5627) * Update dependencies from https://github.com/dotnet/toolset build 20191111.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191111.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191111.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.21 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19561.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd2e1e034..92ee9883d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 262d32eea7254f7e32c3da7f2cd588555c4a127e + 75d42be7d4edd03444f863acdc0d451696dfef9d - + https://github.com/dotnet/sdk - 03f15d127b0c326bf35704dffaeb0f94b3ae9628 + 9dfccc24dd0b76db7a50bbe14f02b8b173d49aca - + https://github.com/dotnet/cli - e89ee5eed6774ede5beef71092414426ab159dec + 1e934beee2533c3c386145f9cdedade822e68c60 diff --git a/eng/Versions.props b/eng/Versions.props index 0e3377212..e60e7397c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.18 + 3.1.100-preview3.19561.21 @@ -45,14 +45,14 @@ - 3.1.100-preview3.19561.6 + 3.1.100-preview3.19561.9 0.2.0 - 3.1.100-preview3.19561.2 + 3.1.100-preview3.19561.3 $(MicrosoftNETSdkPackageVersion) From 88b9d6215155a6ac435e18c99f4abb6ada9dd3d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 22:41:26 -0800 Subject: [PATCH 040/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.14 (#5628) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19561.14 - dotnet-user-secrets - 3.1.0-preview3.19561.14 - dotnet-watch - 3.1.0-preview3.19561.14 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19561.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.14 - dotnet-dev-certs - 3.1.0-preview3.19561.14 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92ee9883d..5cf3f2d53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 686da8f7f583c49fe820a8f694f0b968323d575b - + https://github.com/aspnet/AspNetCore - a89b11096697d2742edb5719fee3b600a0ee8e63 + 2548e40f65ae5941fec3c99294604eba92f7ff80 - + https://github.com/aspnet/AspNetCore - a89b11096697d2742edb5719fee3b600a0ee8e63 + 2548e40f65ae5941fec3c99294604eba92f7ff80 - + https://github.com/aspnet/AspNetCore - a89b11096697d2742edb5719fee3b600a0ee8e63 + 2548e40f65ae5941fec3c99294604eba92f7ff80 - + https://github.com/aspnet/AspNetCore - a89b11096697d2742edb5719fee3b600a0ee8e63 + 2548e40f65ae5941fec3c99294604eba92f7ff80 - + https://github.com/aspnet/AspNetCore - a89b11096697d2742edb5719fee3b600a0ee8e63 + 2548e40f65ae5941fec3c99294604eba92f7ff80 - + https://github.com/aspnet/AspNetCore - a89b11096697d2742edb5719fee3b600a0ee8e63 + 2548e40f65ae5941fec3c99294604eba92f7ff80 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e60e7397c..dde76745a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19561.6 - 3.1.0-preview3.19561.6 - 3.1.0-preview3.19561.6 - 3.1.0-preview3.19561.6 - 3.1.0-preview3.19561.6 - 3.1.0-preview3.19561.6 + 3.1.0-preview3.19561.14 + 3.1.0-preview3.19561.14 + 3.1.0-preview3.19561.14 + 3.1.0-preview3.19561.14 + 3.1.0-preview3.19561.14 + 3.1.0-preview3.19561.14 From 4114beec2f6bd99238c53a20e3aefb2bdb52168f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 07:46:40 +0000 Subject: [PATCH 041/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5629) * Update dependencies from https://github.com/dotnet/toolset build 20191111.22 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.22 * Update dependencies from https://github.com/dotnet/toolset build 20191111.23 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.23 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19561.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191111.24 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.24 * Update dependencies from https://github.com/dotnet/toolset build 20191111.25 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.25 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19561.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191111.26 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.26 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19561.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cf3f2d53..b64a3f922 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 75d42be7d4edd03444f863acdc0d451696dfef9d + 628e305187f8705aa420fca0d9671a9ef102722e - + https://github.com/dotnet/sdk - 9dfccc24dd0b76db7a50bbe14f02b8b173d49aca + 3b26982a3da07bb863e6cd9827e59c057c6cbbb0 - + https://github.com/dotnet/cli - 1e934beee2533c3c386145f9cdedade822e68c60 + 805ed54b5cd558c9a4431015850f4459facf52fb diff --git a/eng/Versions.props b/eng/Versions.props index dde76745a..1bc1f3ce7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.21 + 3.1.100-preview3.19561.26 @@ -45,14 +45,14 @@ - 3.1.100-preview3.19561.9 + 3.1.100-preview3.19561.10 0.2.0 - 3.1.100-preview3.19561.3 + 3.1.100-preview3.19561.4 $(MicrosoftNETSdkPackageVersion) From 7dc64d13b5fb74efb3baa35b849088df03d0e11b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 08:25:08 +0000 Subject: [PATCH 042/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5631) * Update dependencies from https://github.com/dotnet/toolset build 20191111.27 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.27 * Update dependencies from https://github.com/dotnet/toolset build 20191111.28 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.28 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19561.5 (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 b64a3f922..2db4dbcfd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,13 +71,13 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 628e305187f8705aa420fca0d9671a9ef102722e + b74c4c8e3043352cb04d2c868f29cfcfc092519e - + https://github.com/dotnet/sdk - 3b26982a3da07bb863e6cd9827e59c057c6cbbb0 + f36a88342755978d934e02e6aa95b900d8b10961 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 1bc1f3ce7..5a461a3ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.26 + 3.1.100-preview3.19561.28 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19561.4 + 3.1.100-preview3.19561.5 $(MicrosoftNETSdkPackageVersion) From 17293ba4bc1afab5b6585d92f8a3e937b69e77b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 00:33:09 -0800 Subject: [PATCH 043/114] Update dependencies from https://github.com/dotnet/core-setup build 20191111.7 (#5630) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.7 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19561.7 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19561.7 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19561.7 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19561.7 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.7 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.7 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview3.19561.8 (parent: Microsoft.NetCore.App.Internal) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2db4dbcfd..93e86b392 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 686da8f7f583c49fe820a8f694f0b968323d575b + e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5a461a3ba..cd4f0eee6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,17 +57,17 @@ - 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.8 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 2.1.0 From 8a6f1989ccc70b68fb4ec4d9610c6168e628a176 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 01:05:09 -0800 Subject: [PATCH 044/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.15 (#5632) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19561.15 - dotnet-user-secrets - 3.1.0-preview3.19561.15 - dotnet-watch - 3.1.0-preview3.19561.15 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19561.15 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.15 - dotnet-dev-certs - 3.1.0-preview3.19561.15 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93e86b392..4805e13ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 - + https://github.com/aspnet/AspNetCore - 2548e40f65ae5941fec3c99294604eba92f7ff80 + f75439c628c88373409c9d8c9e5832fc66a4e895 - + https://github.com/aspnet/AspNetCore - 2548e40f65ae5941fec3c99294604eba92f7ff80 + f75439c628c88373409c9d8c9e5832fc66a4e895 - + https://github.com/aspnet/AspNetCore - 2548e40f65ae5941fec3c99294604eba92f7ff80 + f75439c628c88373409c9d8c9e5832fc66a4e895 - + https://github.com/aspnet/AspNetCore - 2548e40f65ae5941fec3c99294604eba92f7ff80 + f75439c628c88373409c9d8c9e5832fc66a4e895 - + https://github.com/aspnet/AspNetCore - 2548e40f65ae5941fec3c99294604eba92f7ff80 + f75439c628c88373409c9d8c9e5832fc66a4e895 - + https://github.com/aspnet/AspNetCore - 2548e40f65ae5941fec3c99294604eba92f7ff80 + f75439c628c88373409c9d8c9e5832fc66a4e895 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index cd4f0eee6..8743469ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19561.14 - 3.1.0-preview3.19561.14 - 3.1.0-preview3.19561.14 - 3.1.0-preview3.19561.14 - 3.1.0-preview3.19561.14 - 3.1.0-preview3.19561.14 + 3.1.0-preview3.19561.15 + 3.1.0-preview3.19561.15 + 3.1.0-preview3.19561.15 + 3.1.0-preview3.19561.15 + 3.1.0-preview3.19561.15 + 3.1.0-preview3.19561.15 From 9bb6cea81809776aeeaf35a68a0e4a541da74088 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 10:51:43 +0000 Subject: [PATCH 045/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5633) * Update dependencies from https://github.com/dotnet/toolset build 20191111.29 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19561.29 * Update dependencies from https://github.com/dotnet/toolset build 20191112.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19561.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191112.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191112.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.3 * Update dependencies from https://github.com/dotnet/toolset build 20191112.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.4 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.3 (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 4805e13ef..deb9cace5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - b74c4c8e3043352cb04d2c868f29cfcfc092519e + 6352e8faa6ec729dfb9f879955452ca33fa96a95 https://github.com/dotnet/sdk f36a88342755978d934e02e6aa95b900d8b10961 - + https://github.com/dotnet/cli - 805ed54b5cd558c9a4431015850f4459facf52fb + 0248d3c997bc5dd3ec72368af8bb1067ef423b12 diff --git a/eng/Versions.props b/eng/Versions.props index 8743469ae..ea1fe7745 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19561.28 + 3.1.100-preview3.19562.4 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19561.10 + 3.1.100-preview3.19562.3 0.2.0 From fcd764070c04154c7011a3f3b0b210379cba899a Mon Sep 17 00:00:00 2001 From: akharlov Date: Tue, 12 Nov 2019 17:10:24 +0500 Subject: [PATCH 046/114] update dependencies versions, fixed condition to use latest Microsoft.NET.Test.Sdk on netcorepp2+ --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ea1fe7745..7b5aeab05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 1.7.0 + 1.7.1 @@ -93,7 +93,7 @@ 4.8.0-rc2.19462.10 3.0.0 - 1.6.4 + 1.6.5 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 From e068755c20708d942c39812a0a77009a606aa337 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 16:10:43 +0000 Subject: [PATCH 047/114] Update dependencies from https://github.com/dotnet/toolset build 20191112.8 (#5638) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.4 (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 deb9cace5..cc0a5de29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 6352e8faa6ec729dfb9f879955452ca33fa96a95 + 469885860673ea057f8eddc7e0ecfde61f0a718a https://github.com/dotnet/sdk f36a88342755978d934e02e6aa95b900d8b10961 - + https://github.com/dotnet/cli - 0248d3c997bc5dd3ec72368af8bb1067ef423b12 + 5c88a2fa67aa90794ecefd22614bef1884618068 diff --git a/eng/Versions.props b/eng/Versions.props index ea1fe7745..4349d358c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.4 + 3.1.100-preview3.19562.8 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19562.3 + 3.1.100-preview3.19562.4 0.2.0 From 65aabed2995331d7a46164587eb6a0aab1ede615 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:35:41 +0000 Subject: [PATCH 048/114] Update dependencies from https://github.com/dotnet/toolset build 20191112.10 (#5641) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.10 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19562.1 (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 cc0a5de29..1e18b80fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,13 +71,13 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 469885860673ea057f8eddc7e0ecfde61f0a718a + 07da7760bc60d7be390114034be38169b1083fca - + https://github.com/dotnet/sdk - f36a88342755978d934e02e6aa95b900d8b10961 + 8fc395319d7c5ed51ae8ab9bbeec2585d4a6c50e https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 4349d358c..ccdd41f31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.8 + 3.1.100-preview3.19562.10 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19561.5 + 3.1.100-preview3.19562.1 $(MicrosoftNETSdkPackageVersion) From 8e26975337b8c13f59aabc6cf41b22062523c66e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 20:01:58 +0000 Subject: [PATCH 049/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.2 (#5640) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19562.2 - dotnet-user-secrets - 3.1.0-preview3.19562.2 - dotnet-watch - 3.1.0-preview3.19562.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19562.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19562.2 - dotnet-dev-certs - 3.1.0-preview3.19562.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e18b80fb..84cb01fb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 - + https://github.com/aspnet/AspNetCore - f75439c628c88373409c9d8c9e5832fc66a4e895 + bdf9005be5815d883f2168836be826b86512bf72 - + https://github.com/aspnet/AspNetCore - f75439c628c88373409c9d8c9e5832fc66a4e895 + bdf9005be5815d883f2168836be826b86512bf72 - + https://github.com/aspnet/AspNetCore - f75439c628c88373409c9d8c9e5832fc66a4e895 + bdf9005be5815d883f2168836be826b86512bf72 - + https://github.com/aspnet/AspNetCore - f75439c628c88373409c9d8c9e5832fc66a4e895 + bdf9005be5815d883f2168836be826b86512bf72 - + https://github.com/aspnet/AspNetCore - f75439c628c88373409c9d8c9e5832fc66a4e895 + bdf9005be5815d883f2168836be826b86512bf72 - + https://github.com/aspnet/AspNetCore - f75439c628c88373409c9d8c9e5832fc66a4e895 + bdf9005be5815d883f2168836be826b86512bf72 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ccdd41f31..c8a2fd9ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19561.15 - 3.1.0-preview3.19561.15 - 3.1.0-preview3.19561.15 - 3.1.0-preview3.19561.15 - 3.1.0-preview3.19561.15 - 3.1.0-preview3.19561.15 + 3.1.0-preview3.19562.2 + 3.1.0-preview3.19562.2 + 3.1.0-preview3.19562.2 + 3.1.0-preview3.19562.2 + 3.1.0-preview3.19562.2 + 3.1.0-preview3.19562.2 From 0074ee667af53d16fe995ef0b06c4ed9569220e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 12:14:18 -0800 Subject: [PATCH 050/114] Update dependencies from https://github.com/dotnet/toolset build 20191112.11 (#5642) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.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 84cb01fb0..03b65d0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 07da7760bc60d7be390114034be38169b1083fca + c8d525289eb4c9f7a08858e002524e2f22913a9c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c8a2fd9ee..c602b6a4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.10 + 3.1.100-preview3.19562.11 From a6e50e69f4f2ec38e93de6c0383c97b6aa59024c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:15:48 +0000 Subject: [PATCH 051/114] Update dependencies from https://github.com/dotnet/core-setup build 20191112.4 (#5643) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19562.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0 (parent: Microsoft.NetCore.App.Internal) --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 301efba9e..438de1d42 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,9 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03b65d0bd..1490dbf94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 + 4703e4aefb6650500d00a2a529c7ad474ca89859 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index c602b6a4b..611e3f2cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,17 +57,17 @@ - 3.1.0-preview3.19561.8 + 3.1.0 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 + 3.1.0-preview3.19562.4 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 2.1.0 From 505175361a0154c3e2fb0899b73e81fba89e07fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 13:30:15 -0800 Subject: [PATCH 052/114] Update dependencies from https://github.com/dotnet/toolset build 20191112.12 (#5644) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.5 (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 1490dbf94..6742602dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - c8d525289eb4c9f7a08858e002524e2f22913a9c + 955933f6ec947edd611913301b58dfeb695bf6ee https://github.com/dotnet/sdk 8fc395319d7c5ed51ae8ab9bbeec2585d4a6c50e - + https://github.com/dotnet/cli - 5c88a2fa67aa90794ecefd22614bef1884618068 + 891c5e80f85d194c9011f0801a547d21706db389 diff --git a/eng/Versions.props b/eng/Versions.props index 611e3f2cc..8fd24a0b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.11 + 3.1.100-preview3.19562.12 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19562.4 + 3.1.100-preview3.19562.5 0.2.0 From 21b68d82bc1ed52332444043d260832a9d2dad71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 22:50:55 +0000 Subject: [PATCH 053/114] Update dependencies from https://github.com/dotnet/toolset build 20191112.13 (#5645) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.13 --- 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 6742602dc..c4e577b50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 955933f6ec947edd611913301b58dfeb695bf6ee + 660d4c86113cf7e6767841eba0e17bf2d72e6343 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8fd24a0b2..4b39de24a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.12 + 3.1.100-preview3.19562.13 From f67d1081eeedf4beebe65e51e7f4574af9a89ad9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:09:16 -0800 Subject: [PATCH 054/114] Update dependencies from https://github.com/dotnet/toolset build 20191112.15 (#5647) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.15 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19562.7 (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 c4e577b50..9fc23ad39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,13 +71,13 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 660d4c86113cf7e6767841eba0e17bf2d72e6343 + 5429d99eb9a9dbb3da03eb8e400487815cc67b08 - + https://github.com/dotnet/sdk - 8fc395319d7c5ed51ae8ab9bbeec2585d4a6c50e + 33442c014e5406bf0546a898b47f3c136fc5b4a5 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 4b39de24a..02c2d4efc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.13 + 3.1.100-preview3.19562.15 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19562.1 + 3.1.100-preview3.19562.7 $(MicrosoftNETSdkPackageVersion) From 7751913b0370087155ebaff78521d12d75572f06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:49:34 -0800 Subject: [PATCH 055/114] Update dependencies from https://github.com/dotnet/toolset build 20191112.16 (#5650) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.8 (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 9fc23ad39..c88d103d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 5429d99eb9a9dbb3da03eb8e400487815cc67b08 + 9eef9bafeb1d593ef939fd7331b705d53ee8ac65 https://github.com/dotnet/sdk 33442c014e5406bf0546a898b47f3c136fc5b4a5 - + https://github.com/dotnet/cli - 891c5e80f85d194c9011f0801a547d21706db389 + 8bd2a846d98f5867f9dd0350715266953f1313e3 diff --git a/eng/Versions.props b/eng/Versions.props index 02c2d4efc..f946f75c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.15 + 3.1.100-preview3.19562.16 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19562.5 + 3.1.100-preview3.19562.8 0.2.0 From e1ddaad395ab97b53b531b425b818a3e2722d8d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 04:11:06 +0000 Subject: [PATCH 056/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.6 (#5649) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19562.6 - dotnet-user-secrets - 3.1.0-preview3.19562.6 - dotnet-watch - 3.1.0-preview3.19562.6 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19562.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19562.6 - dotnet-dev-certs - 3.1.0-preview3.19562.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c88d103d2..b8f59f2e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 4703e4aefb6650500d00a2a529c7ad474ca89859 - + https://github.com/aspnet/AspNetCore - bdf9005be5815d883f2168836be826b86512bf72 + 47ba4b07fb7425d7902437c6efba8be3a41475a9 - + https://github.com/aspnet/AspNetCore - bdf9005be5815d883f2168836be826b86512bf72 + 47ba4b07fb7425d7902437c6efba8be3a41475a9 - + https://github.com/aspnet/AspNetCore - bdf9005be5815d883f2168836be826b86512bf72 + 47ba4b07fb7425d7902437c6efba8be3a41475a9 - + https://github.com/aspnet/AspNetCore - bdf9005be5815d883f2168836be826b86512bf72 + 47ba4b07fb7425d7902437c6efba8be3a41475a9 - + https://github.com/aspnet/AspNetCore - bdf9005be5815d883f2168836be826b86512bf72 + 47ba4b07fb7425d7902437c6efba8be3a41475a9 - + https://github.com/aspnet/AspNetCore - bdf9005be5815d883f2168836be826b86512bf72 + 47ba4b07fb7425d7902437c6efba8be3a41475a9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f946f75c6..7aef78cd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19562.2 - 3.1.0-preview3.19562.2 - 3.1.0-preview3.19562.2 - 3.1.0-preview3.19562.2 - 3.1.0-preview3.19562.2 - 3.1.0-preview3.19562.2 + 3.1.0-preview3.19562.6 + 3.1.0-preview3.19562.6 + 3.1.0-preview3.19562.6 + 3.1.0-preview3.19562.6 + 3.1.0-preview3.19562.6 + 3.1.0-preview3.19562.6 From 782374165f99a0a1569c6d097cd3c3d402d4f567 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:24:58 -0800 Subject: [PATCH 057/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5651) * Update dependencies from https://github.com/dotnet/toolset build 20191112.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.17 * Update dependencies from https://github.com/dotnet/toolset build 20191112.18 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.18 * Update dependencies from https://github.com/dotnet/toolset build 20191112.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.19 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19562.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191112.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.20 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19562.8 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8f59f2e4..34926d7d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 9eef9bafeb1d593ef939fd7331b705d53ee8ac65 + a813d2c72fb0fb08dbe5cde5102586ec103cea08 - + https://github.com/dotnet/sdk - 33442c014e5406bf0546a898b47f3c136fc5b4a5 + 14721ab65e7903c55c8ea1bdf9b9a2d9c686856b - + https://github.com/dotnet/cli - 8bd2a846d98f5867f9dd0350715266953f1313e3 + 930ffec0a75978c21661adfcf75aab3b65c501e4 diff --git a/eng/Versions.props b/eng/Versions.props index 7aef78cd8..f144f6d3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.16 + 3.1.100-preview3.19562.20 @@ -45,14 +45,14 @@ - 3.1.100-preview3.19562.8 + 3.1.100-preview3.19562.9 0.2.0 - 3.1.100-preview3.19562.7 + 3.1.100-preview3.19562.8 $(MicrosoftNETSdkPackageVersion) From fb76b9a7d1d1d3f54de56b1bfd02f404d1d9a421 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 10:01:54 +0000 Subject: [PATCH 058/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5652) * Update dependencies from https://github.com/dotnet/toolset build 20191112.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19562.21 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191113.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19563.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19562.10 (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 34926d7d2..82017a29e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - a813d2c72fb0fb08dbe5cde5102586ec103cea08 + ffe6d24be9d4070361494f0fe103f7b250fc0af8 https://github.com/dotnet/sdk 14721ab65e7903c55c8ea1bdf9b9a2d9c686856b - + https://github.com/dotnet/cli - 930ffec0a75978c21661adfcf75aab3b65c501e4 + 994a231ec9ddc328552bf00a90da3956254eb8a3 diff --git a/eng/Versions.props b/eng/Versions.props index f144f6d3e..85f6cb31d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19562.20 + 3.1.100-preview3.19563.1 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19562.9 + 3.1.100-preview3.19562.10 0.2.0 From a0c1b21f77c66ea2675d457bda0e4d4f2b95f121 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 08:38:15 -0800 Subject: [PATCH 059/114] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5654) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.9 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19562.9 - dotnet-user-secrets - 3.1.0-preview3.19562.9 - dotnet-watch - 3.1.0-preview3.19562.9 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-preview3.19562.9 * Fix typo --- NuGet.config | 1 + eng/Version.Details.xml | 24 ++++++++++----------- eng/Versions.props | 12 +++++------ src/redist/targets/BundledTemplates.targets | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 438de1d42..946d96283 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82017a29e..d4456e7d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 4703e4aefb6650500d00a2a529c7ad474ca89859 - + https://github.com/aspnet/AspNetCore - 47ba4b07fb7425d7902437c6efba8be3a41475a9 + d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 - + https://github.com/aspnet/AspNetCore - 47ba4b07fb7425d7902437c6efba8be3a41475a9 + d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 - + https://github.com/aspnet/AspNetCore - 47ba4b07fb7425d7902437c6efba8be3a41475a9 + d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 - + https://github.com/aspnet/AspNetCore - 47ba4b07fb7425d7902437c6efba8be3a41475a9 + d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 - + https://github.com/aspnet/AspNetCore - 47ba4b07fb7425d7902437c6efba8be3a41475a9 + d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 - + https://github.com/aspnet/AspNetCore - 47ba4b07fb7425d7902437c6efba8be3a41475a9 + d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 85f6cb31d..74b3ee10d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19562.6 - 3.1.0-preview3.19562.6 - 3.1.0-preview3.19562.6 - 3.1.0-preview3.19562.6 - 3.1.0-preview3.19562.6 - 3.1.0-preview3.19562.6 + 3.1.0 + 3.1.0 + 3.1.0-preview3.19562.9 + 3.1.0-preview3.19562.9 + 3.1.0-preview3.19562.9 + 3.1.0-preview3.19562.9 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 3755bdefd..c24479389 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -4,7 +4,7 @@ $(AspNetCorePackageVersionFor31Templates.IndexOf('-')) $(AspNetCorePackageVersionFor31Templates) - $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator))) + $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator))) $(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount) $(AspNetCore31VersionMajorMinorPatchVersion) $(BundledTemplates31InstallPath)-$(VersionSuffix) From 6d8facc27062ad50a87796e842e1680617a453f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 11:49:35 -0800 Subject: [PATCH 060/114] Update dependencies from https://github.com/dotnet/toolset build 20191113.3 (#5657) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19563.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19563.1 (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 d4456e7d1..e5f80d9d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - ffe6d24be9d4070361494f0fe103f7b250fc0af8 + 52122eee9451c139ae581e5436e749f3c91a245a https://github.com/dotnet/sdk 14721ab65e7903c55c8ea1bdf9b9a2d9c686856b - + https://github.com/dotnet/cli - 994a231ec9ddc328552bf00a90da3956254eb8a3 + 5974711ae5c2a1b24ae23199fd29e7756e592ef3 diff --git a/eng/Versions.props b/eng/Versions.props index 74b3ee10d..ae367cbcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19563.1 + 3.1.100-preview3.19563.3 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19562.10 + 3.1.100-preview3.19563.1 0.2.0 From 46cb5e7523d49118dfcf1baae395995442d06682 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 13 Nov 2019 11:49:49 -0800 Subject: [PATCH 061/114] Stabilize package versions (#5587) --- 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 0476de00b..6c32de5d6 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -8,7 +8,7 @@ - false + true From fb9d6e244b460ada56e6b06fd6a9a849ec51a3f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 14:03:07 -0800 Subject: [PATCH 062/114] Update dependencies from https://github.com/dotnet/toolset build 20191113.5 (#5660) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19563.5 --- 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 e5f80d9d0..0dff7606b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 52122eee9451c139ae581e5436e749f3c91a245a + dd725e2f353816e544dfb21dee437d08869fa584 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ae367cbcc..e88a4f96a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19563.3 + 3.1.100-preview3.19563.5 From 2d39e06607cce2751ebc2a593f7d9845dafd40fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 04:36:57 +0000 Subject: [PATCH 063/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5673) * Update dependencies from https://github.com/dotnet/toolset build 20191114.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19564.6 * Update dependencies from https://github.com/dotnet/toolset build 20191114.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19564.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 0dff7606b..99d1a24b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,13 +71,13 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - dd725e2f353816e544dfb21dee437d08869fa584 + 9ec611600c09773b8aa604d6885c9830ecd72a61 - + https://github.com/dotnet/sdk - 14721ab65e7903c55c8ea1bdf9b9a2d9c686856b + 6042ba82a6a63804a30f048045bb80697c2a4706 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index e88a4f96a..051fe64b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19563.5 + 3.1.100-rtm.19564.7 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19562.8 + 3.1.100-preview3.19564.2 $(MicrosoftNETSdkPackageVersion) From 3a5cf460de14ff63e3b2a69f589c9a9e112e6880 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 05:50:27 +0000 Subject: [PATCH 064/114] Update dependencies from https://github.com/dotnet/wcf build 20191114.3 (#5674) - System.ServiceModel.Primitives - 4.7.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 946d96283..aa8537fdb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99d1a24b7..d9a6abc18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -96,7 +96,7 @@ https://github.com/dotnet/wcf - df0f9f36689252fa72c902d19c5197c0723983e0 + 626ccab2236c7d14a1a16aa8ff453fbc03fb2370 From 5cd6d37a218a59f29cbe2b241cfbe240fdc2a7e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 05:56:25 +0000 Subject: [PATCH 065/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5675) * Update dependencies from https://github.com/dotnet/toolset build 20191114.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.8 * Update dependencies from https://github.com/dotnet/toolset build 20191114.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.9 --- 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 d9a6abc18..6dea71e93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 9ec611600c09773b8aa604d6885c9830ecd72a61 + d8153810653fdf99056cad7a93299804a3b17f09 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 051fe64b8..7e599958b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19564.7 + 3.1.100-rtm.19564.9 From 06165478e69e826fe36ea203ffb34c68a65fda76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 08:31:24 +0000 Subject: [PATCH 066/114] Update dependencies from https://github.com/dotnet/core-setup build 20191114.3 (#5678) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-rtm.19564.3 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index aa8537fdb..bfdb3ad55 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,8 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dea71e93..d19a1c3d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,31 +3,31 @@ https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c - + https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c diff --git a/eng/Versions.props b/eng/Versions.props index 7e599958b..c079f2876 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,7 +61,7 @@ - 3.1.0-preview3.19562.4 + 3.1.0-rtm.19564.3 3.1.0 3.1.0 3.1.0 From c74251f1c8ce72619c759506844d9e0b37e0c815 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 09:26:49 +0000 Subject: [PATCH 067/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5677) * Update dependencies from https://github.com/dotnet/toolset build 20191114.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.10 * Update dependencies from https://github.com/dotnet/toolset build 20191114.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19564.1 (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 d19a1c3d6..9a47bc0b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - d8153810653fdf99056cad7a93299804a3b17f09 + 8bb330276fcd04192a16620d638cf50a8661a09b https://github.com/dotnet/sdk 6042ba82a6a63804a30f048045bb80697c2a4706 - + https://github.com/dotnet/cli - 5974711ae5c2a1b24ae23199fd29e7756e592ef3 + fc88db0063d2c27c6ad74300c8f4ae2e041b2ab7 diff --git a/eng/Versions.props b/eng/Versions.props index c079f2876..6223d3766 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19564.9 + 3.1.100-rtm.19564.11 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19563.1 + 3.1.100-rtm.19564.1 0.2.0 From 0a24043d699912b4498eb8ba4ae1d1eb01ea5716 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 10:01:57 +0000 Subject: [PATCH 068/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191114.3 (#5679) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19564.3 - dotnet-user-secrets - 3.1.0-preview3.19564.3 - dotnet-watch - 3.1.0-preview3.19564.3 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-preview3.19564.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index bfdb3ad55..bfbe416c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a47bc0b1..dc3b3d8aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 + 2139578cfdd746bb0035b8c77603102c4a56668e https://github.com/aspnet/AspNetCore - d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 + 2139578cfdd746bb0035b8c77603102c4a56668e - + https://github.com/aspnet/AspNetCore - d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 + 2139578cfdd746bb0035b8c77603102c4a56668e - + https://github.com/aspnet/AspNetCore - d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 + 2139578cfdd746bb0035b8c77603102c4a56668e - + https://github.com/aspnet/AspNetCore - d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 + 2139578cfdd746bb0035b8c77603102c4a56668e - + https://github.com/aspnet/AspNetCore - d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 + 2139578cfdd746bb0035b8c77603102c4a56668e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6223d3766..35937eeb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-preview3.19562.9 - 3.1.0-preview3.19562.9 - 3.1.0-preview3.19562.9 - 3.1.0-preview3.19562.9 + 3.1.0-preview3.19564.3 + 3.1.0-preview3.19564.3 + 3.1.0-preview3.19564.3 + 3.1.0-preview3.19564.3 From e4f7cc5207c7dbe0d3ffb3c7ab93610253410ab3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 11:05:21 +0000 Subject: [PATCH 069/114] Update dependencies from https://github.com/dotnet/toolset build 20191115.1 (#5680) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-rtm.19564.5 (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 dc3b3d8aa..51b8ee500 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,13 +71,13 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/toolset - 8bb330276fcd04192a16620d638cf50a8661a09b + 328b5c7bd668dd21c1c455155da5b8463fe29b93 - + https://github.com/dotnet/sdk - 6042ba82a6a63804a30f048045bb80697c2a4706 + 03fffbe484fed2bea52f00fb96cc8f714f272d4a https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 35937eeb9..941e6f29d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19564.11 + 3.1.100-rtm.19565.1 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19564.2 + 3.1.100-rtm.19564.5 $(MicrosoftNETSdkPackageVersion) From 4ca0ea8e2813b7cf1e6cdcacf57654dcd77a9662 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 17:07:55 +0000 Subject: [PATCH 070/114] Update dependencies from https://github.com/dotnet/core-setup build 20191114.4 (#5683) - Microsoft.NETCore.App.Ref - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-rtm.19564.4 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index bfbe416c8..2dfc92e6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,8 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51b8ee500..836f21ccd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,31 +3,31 @@ https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a - + https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a diff --git a/eng/Versions.props b/eng/Versions.props index 941e6f29d..1faeb9540 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,7 +61,7 @@ - 3.1.0-rtm.19564.3 + 3.1.0-rtm.19564.4 3.1.0 3.1.0 3.1.0 From a87477f135eaaa557083e8813cbc3efb5c316036 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 15 Nov 2019 12:22:37 -0800 Subject: [PATCH 071/114] Updating the 3.0 templates from "3.0.0" to "3.0.1" (#5686) * Updating the 3.0 template installation diretory from "3.0.0" to "3.0.1" * Adding a NuGet feed to locate the 3.0.1 Asp.Net templates --- NuGet.config | 1 + eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 2dfc92e6c..565d68248 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 1faeb9540..d355d0f8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,7 +97,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - 3.0.0 + 3.0.1 1.6.0 1.0.2-beta4 From 9f6349b659f78b7cef698973916c68b7ab5bd86f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 15 Nov 2019 12:50:53 -0800 Subject: [PATCH 072/114] Update PreReleaseVersionLabel to RTM (#5671) --- 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 6c32de5d6..459284ab9 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 1 1 00 - preview3 + rtm From d75e6108ebfe4cef6c0722bd39deb1c6a3103db8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 20:56:35 +0000 Subject: [PATCH 073/114] Update dependencies from https://github.com/dotnet/wcf build 20191115.2 (#5689) - System.ServiceModel.Primitives - 4.7.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 565d68248..0f2e9f47d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 836f21ccd..8b4e99477 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -96,7 +96,7 @@ https://github.com/dotnet/wcf - 626ccab2236c7d14a1a16aa8ff453fbc03fb2370 + eb417fdeb06faeada140a92e26e86c266574476a From 8dbe4651fe21166221fccc92f1b36c3792e8de34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 21:01:13 +0000 Subject: [PATCH 074/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191115.5 (#5688) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19565.5 - dotnet-user-secrets - 3.1.0-rtm.19565.5 - dotnet-watch - 3.1.0-rtm.19565.5 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19565.5 --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f2e9f47d..040cecf52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b4e99477..aad22bc3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - 2139578cfdd746bb0035b8c77603102c4a56668e + 1f9b6e2183cf20722fc52d17f35a40f30b218e5b https://github.com/aspnet/AspNetCore - 2139578cfdd746bb0035b8c77603102c4a56668e + 1f9b6e2183cf20722fc52d17f35a40f30b218e5b - + https://github.com/aspnet/AspNetCore - 2139578cfdd746bb0035b8c77603102c4a56668e + 1f9b6e2183cf20722fc52d17f35a40f30b218e5b - + https://github.com/aspnet/AspNetCore - 2139578cfdd746bb0035b8c77603102c4a56668e + 1f9b6e2183cf20722fc52d17f35a40f30b218e5b - + https://github.com/aspnet/AspNetCore - 2139578cfdd746bb0035b8c77603102c4a56668e + 1f9b6e2183cf20722fc52d17f35a40f30b218e5b - + https://github.com/aspnet/AspNetCore - 2139578cfdd746bb0035b8c77603102c4a56668e + 1f9b6e2183cf20722fc52d17f35a40f30b218e5b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d355d0f8c..1616b0247 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-preview3.19564.3 - 3.1.0-preview3.19564.3 - 3.1.0-preview3.19564.3 - 3.1.0-preview3.19564.3 + 3.1.0-rtm.19565.5 + 3.1.0-rtm.19565.5 + 3.1.0-rtm.19565.5 + 3.1.0-rtm.19565.5 From 445dd2214bafa94460dbd96b0cffd47e596cfa88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 09:01:54 +0000 Subject: [PATCH 075/114] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5690) * Update dependencies from https://github.com/dotnet/core-setup build 20191115.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-rtm.19565.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0 (parent: Microsoft.NetCore.App.Internal) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-rtm.19564.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19565.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Add back feed --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 040cecf52..8a1b96c7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,9 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aad22bc3d..10bc499c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,31 +3,31 @@ https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 @@ -37,7 +37,7 @@ https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/aspnet/AspNetCore @@ -84,13 +84,13 @@ fc88db0063d2c27c6ad74300c8f4ae2e041b2ab7 - + https://github.com/dotnet/winforms - 922e41002e66fb10d703705d9be700c8b30cd63d + 4bcd68c8b29476fc3c5ca1b496214584aadfdc84 - + https://github.com/dotnet/wpf - af68b9cea7d449b1b95ba3899abe629f5d15b167 + 427fa56aed34cbbc5096aa6137e748054905507d diff --git a/eng/Versions.props b/eng/Versions.props index 1616b0247..5a851cc86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19557.8 + 4.8.1-rtm.19564.4 - 3.1.0-preview2.19558.3 + 3.1.0-rtm.19565.1 @@ -61,7 +61,7 @@ - 3.1.0-rtm.19564.4 + 3.1.0-rtm.19565.2 3.1.0 3.1.0 3.1.0 From 00f233f50b8dc6108b2cfbd988eef05d0e9625f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 09:46:30 +0000 Subject: [PATCH 076/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5682) * Update dependencies from https://github.com/dotnet/toolset build 20191115.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.2 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19564.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.4 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.3 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.5 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.6 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.7 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.9 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.10 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.14 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.15 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.16 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191115.18 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.18 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.7 (parent: Microsoft.Dotnet.Toolset.Internal) * templating nuget * Update dependencies from https://github.com/dotnet/toolset build 20191115.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.19 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.7 (parent: Microsoft.Dotnet.Toolset.Internal) * 65f --- NuGet.config | 3 +-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a1b96c7a..367ead6b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,8 +8,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10bc499c4..aa27a5bc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,19 +69,19 @@ https://github.com/dotnet/templating - 0e0e29c869d62d794ad74d75274ddf0ea542ac2b + 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 328b5c7bd668dd21c1c455155da5b8463fe29b93 + a10e7ab6cb1a5560188d1c0fa26b1b60b68b838b - + https://github.com/dotnet/sdk - 03fffbe484fed2bea52f00fb96cc8f714f272d4a + fc412c7e032c25a17da0e8ca4556b34897313d7c - + https://github.com/dotnet/cli - fc88db0063d2c27c6ad74300c8f4ae2e041b2ab7 + 896091f8b6d9eaab6a88bea9dc26caae8dca9147 diff --git a/eng/Versions.props b/eng/Versions.props index 5a851cc86..0b9fda2ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19565.1 + 3.1.100-rtm.19565.19 @@ -45,14 +45,14 @@ - 3.1.100-rtm.19564.1 + 3.1.100-rtm.19565.7 0.2.0 - 3.1.100-rtm.19564.5 + 3.1.100-rtm.19565.4 $(MicrosoftNETSdkPackageVersion) From c35fbe2050fd1e890ba8cd10ec45153e946d0e68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 16:06:21 +0000 Subject: [PATCH 077/114] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5694) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191116.1 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19566.1 - dotnet-user-secrets - 3.1.0-rtm.19566.1 - dotnet-watch - 3.1.0-rtm.19566.1 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19566.1 * fixup --- NuGet.config | 5 +++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 367ead6b8..601374c09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,14 @@ + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa27a5bc2..e472870f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - 1f9b6e2183cf20722fc52d17f35a40f30b218e5b + 2b7e994b8a304700a09617ffc5052f0d943bbcba https://github.com/aspnet/AspNetCore - 1f9b6e2183cf20722fc52d17f35a40f30b218e5b + 2b7e994b8a304700a09617ffc5052f0d943bbcba - + https://github.com/aspnet/AspNetCore - 1f9b6e2183cf20722fc52d17f35a40f30b218e5b + 2b7e994b8a304700a09617ffc5052f0d943bbcba - + https://github.com/aspnet/AspNetCore - 1f9b6e2183cf20722fc52d17f35a40f30b218e5b + 2b7e994b8a304700a09617ffc5052f0d943bbcba - + https://github.com/aspnet/AspNetCore - 1f9b6e2183cf20722fc52d17f35a40f30b218e5b + 2b7e994b8a304700a09617ffc5052f0d943bbcba - + https://github.com/aspnet/AspNetCore - 1f9b6e2183cf20722fc52d17f35a40f30b218e5b + 2b7e994b8a304700a09617ffc5052f0d943bbcba https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0b9fda2ce..114e47d52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-rtm.19565.5 - 3.1.0-rtm.19565.5 - 3.1.0-rtm.19565.5 - 3.1.0-rtm.19565.5 + 3.1.0-rtm.19566.1 + 3.1.0-rtm.19566.1 + 3.1.0-rtm.19566.1 + 3.1.0-rtm.19566.1 From 7feecb270755ff07808fd7302848c59df1c4d01d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 09:51:42 -0800 Subject: [PATCH 078/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5696) * Update dependencies from https://github.com/dotnet/toolset build 20191116.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19566.3 * fixup --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 601374c09..ca89bc0e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,9 +14,9 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e472870f1..745d17bb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - a10e7ab6cb1a5560188d1c0fa26b1b60b68b838b + 883f0f3ab716a5d129f188816a6b3801ac16f91d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 114e47d52..22b3c0165 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19565.19 + 3.1.100-rtm.19566.3 From 4b50b4ac408749eeafcdfea91ed683a1c3274437 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Sat, 16 Nov 2019 15:38:55 -0800 Subject: [PATCH 079/114] Bump 3.0 packs to 3.0.1 as appropriate (#5698) --- NuGet.config | 7 ++++++- src/redist/targets/GenerateBundledVersions.targets | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca89bc0e2..a6e207c59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,9 @@ - + + + @@ -27,5 +29,8 @@ + + + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 01d699be7..56984cdcd 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -14,12 +14,12 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NETCoreApp30PRuntimePackVersion>3.0.0 + <_NETCoreApp30RuntimePackVersion>3.0.1 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_WindowsDesktop30RuntimePackVersion>$(_NETCoreApp30PRuntimePackVersion) - <_WindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) - <_AspNet30RuntimePackVersion>3.0.0 - <_AspNet30TargetingPackVersion>3.0.0 + <_WindowsDesktop30RuntimePackVersion>3.0.1 + <_WindowsDesktop30TargetingPackVersion>3.0.0 + <_AspNet30RuntimePackVersion>3.0.1 + <_AspNet30TargetingPackVersion>3.0.1 <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) @@ -226,7 +226,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetFramework="netcoreapp3.0" RuntimeFrameworkName="Microsoft.NETCore.App" DefaultRuntimeFrameworkVersion="3.0.0" - LatestRuntimeFrameworkVersion="$(_NETCoreApp30PRuntimePackVersion)" + LatestRuntimeFrameworkVersion="$(_NETCoreApp30RuntimePackVersion)" TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackVersion="$(_NETCoreApp30TargetingPackVersion)" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" @@ -237,7 +237,7 @@ Copyright (c) .NET Foundation. All rights reserved. From cd82f021f4c2c8901bd7975fcaefc34fdeec3ded Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 20:40:40 -0800 Subject: [PATCH 080/114] Update dependencies from https://github.com/dotnet/toolset build 20191116.4 (#5697) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19566.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19566.1 (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 745d17bb8..9aa273eb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 883f0f3ab716a5d129f188816a6b3801ac16f91d + 575b1c9f9636e57881fc41817d3f049dff6ff470 https://github.com/dotnet/sdk fc412c7e032c25a17da0e8ca4556b34897313d7c - + https://github.com/dotnet/cli - 896091f8b6d9eaab6a88bea9dc26caae8dca9147 + 56fe2cca1ad3b1e450ece97a226ce8a655d31271 diff --git a/eng/Versions.props b/eng/Versions.props index 22b3c0165..422a9b23c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19566.3 + 3.1.100-rtm.19566.4 @@ -45,7 +45,7 @@ - 3.1.100-rtm.19565.7 + 3.1.100-rtm.19566.1 0.2.0 From b144db6e43638cc14fe9c127fe4c12b943805d6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 02:10:41 +0000 Subject: [PATCH 081/114] Update dependencies from https://github.com/dotnet/toolset build 20191118.1 (#5706) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.1 --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6e207c59..cf5dd30be 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,8 +15,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9aa273eb8..2837481d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 575b1c9f9636e57881fc41817d3f049dff6ff470 + 0065e779a913c72162737715e543617da9b243db https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 422a9b23c..b1625dcdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19566.4 + 3.1.100-rtm.19568.1 From c7efbaf4a709b2dea88f13b1d3c05df46872277c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 03:35:49 +0000 Subject: [PATCH 082/114] Update dependencies from https://github.com/dotnet/core-setup build 20191118.1 (#5707) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-rtm.19568.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19568.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index cf5dd30be..bb990c2ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2837481d4..9042ab2a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,31 +3,31 @@ https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b - + https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 4bcd68c8b29476fc3c5ca1b496214584aadfdc84 - + https://github.com/dotnet/wpf - 427fa56aed34cbbc5096aa6137e748054905507d + 8bd2a19f55f6965bf6ee0f264b5987a8d4a486c7 diff --git a/eng/Versions.props b/eng/Versions.props index b1625dcdc..806795dd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-rtm.19565.1 + 3.1.0-rtm.19568.1 @@ -61,7 +61,7 @@ - 3.1.0-rtm.19565.2 + 3.1.0-rtm.19568.1 3.1.0 3.1.0 3.1.0 From 915d59d14ce3999e5f38d8db4dfd9a79f98f6894 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 04:00:06 +0000 Subject: [PATCH 083/114] Update dependencies from https://github.com/dotnet/toolset build 20191118.2 (#5708) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.2 --- 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 9042ab2a6..e94ae9b39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 0065e779a913c72162737715e543617da9b243db + 2ceaf2027ebc2bbd50ea34d206c0f67b5f5e897b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 806795dd2..493219f57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19568.1 + 3.1.100-rtm.19568.2 From 6264078ed1374c3bddd6426e1e528864548fbfb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 07:01:53 +0000 Subject: [PATCH 084/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5711) * Update dependencies from https://github.com/dotnet/toolset build 20191118.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.3 * Update dependencies from https://github.com/dotnet/toolset build 20191118.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19568.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191118.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-rtm.19568.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19568.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e94ae9b39..8610c6f88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 2ceaf2027ebc2bbd50ea34d206c0f67b5f5e897b + acb6df24937ad190153de23a0292c5c3c319c718 - + https://github.com/dotnet/sdk - fc412c7e032c25a17da0e8ca4556b34897313d7c + 49bbede419cf63e15c70f4b463f80e4811fe3f34 - + https://github.com/dotnet/cli - 56fe2cca1ad3b1e450ece97a226ce8a655d31271 + f8b051906d69d8b1bde4e46e4d5b1f0c81b7f983 diff --git a/eng/Versions.props b/eng/Versions.props index 493219f57..067aa107e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19568.2 + 3.1.100-rtm.19568.5 @@ -45,14 +45,14 @@ - 3.1.100-rtm.19566.1 + 3.1.100-rtm.19568.1 0.2.0 - 3.1.100-rtm.19565.4 + 3.1.100-rtm.19568.4 $(MicrosoftNETSdkPackageVersion) From d9d82feb4e39dac07a67a05fea4383fb709c6551 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 08:05:48 +0000 Subject: [PATCH 085/114] Update dependencies from https://github.com/dotnet/core-setup build 20191118.2 (#5712) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-rtm.19568.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-rtm.19568.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19568.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb990c2ee..fb9340613 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,8 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8610c6f88..6b66df769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,31 +3,31 @@ https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 - + https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 @@ -84,13 +84,13 @@ f8b051906d69d8b1bde4e46e4d5b1f0c81b7f983 - + https://github.com/dotnet/winforms - 4bcd68c8b29476fc3c5ca1b496214584aadfdc84 + 24b0195c1f4c4a707ca6c3a3bd4715a65fcd8bfe - + https://github.com/dotnet/wpf - 8bd2a19f55f6965bf6ee0f264b5987a8d4a486c7 + 7aac1f7396bfc03177b1fc85b7d4e49b5222b102 diff --git a/eng/Versions.props b/eng/Versions.props index 067aa107e..b11da4b0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-rtm.19564.4 + 4.8.1-rtm.19568.1 - 3.1.0-rtm.19568.1 + 3.1.0-rtm.19568.6 @@ -61,7 +61,7 @@ - 3.1.0-rtm.19568.1 + 3.1.0-rtm.19568.2 3.1.0 3.1.0 3.1.0 From 0996eec117410551122055cb45ce751599cd2d55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 08:20:19 +0000 Subject: [PATCH 086/114] Update dependencies from https://github.com/dotnet/toolset build 20191118.6 (#5713) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19568.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 6b66df769..d916e9e2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - acb6df24937ad190153de23a0292c5c3c319c718 + 42b5b76ab570666badeab062852a9bc184dddcca https://github.com/dotnet/sdk 49bbede419cf63e15c70f4b463f80e4811fe3f34 - + https://github.com/dotnet/cli - f8b051906d69d8b1bde4e46e4d5b1f0c81b7f983 + 846cbf8b4ff94d584e880454dd37ac2f496c1033 diff --git a/eng/Versions.props b/eng/Versions.props index b11da4b0a..6000994a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19568.5 + 3.1.100-rtm.19568.6 @@ -45,7 +45,7 @@ - 3.1.100-rtm.19568.1 + 3.1.100-rtm.19568.2 0.2.0 From bb14bbcb76dbc779d9c77ed18ca5f1bd1bc45959 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 09:05:03 +0000 Subject: [PATCH 087/114] Update dependencies from https://github.com/dotnet/toolset build 20191118.7 (#5714) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.7 --- 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 d916e9e2e..f4302b715 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 42b5b76ab570666badeab062852a9bc184dddcca + bbd0834c1973c9b52af01551d035dbb5e8e6d33d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6000994a5..82d96b548 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19568.6 + 3.1.100-rtm.19568.7 From 196657464d793610fbce3b841e8ad768db4bec0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 09:50:54 +0000 Subject: [PATCH 088/114] Update dependencies from https://github.com/dotnet/toolset build 20191119.1 (#5716) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19569.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19568.3 (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 f4302b715..683914419 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - bbd0834c1973c9b52af01551d035dbb5e8e6d33d + 430dcf7a0ee89efa39f1283ed942c4dc4a89ff65 https://github.com/dotnet/sdk 49bbede419cf63e15c70f4b463f80e4811fe3f34 - + https://github.com/dotnet/cli - 846cbf8b4ff94d584e880454dd37ac2f496c1033 + cc6bdda9777fff833fe170e3006470e9409521cf diff --git a/eng/Versions.props b/eng/Versions.props index 82d96b548..07ef33224 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19568.7 + 3.1.100-rtm.19569.1 @@ -45,7 +45,7 @@ - 3.1.100-rtm.19568.2 + 3.1.100-rtm.19568.3 0.2.0 From 3b48f0ada32b9f4acf0ca93180e6aadfe09186b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 15:05:46 +0000 Subject: [PATCH 089/114] Update dependencies from https://github.com/dotnet/toolset build 20191119.3 (#5720) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19569.3 --- 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 683914419..3ab03d770 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 430dcf7a0ee89efa39f1283ed942c4dc4a89ff65 + 4e83fe248c14813a28569d4f4c153609650aa2a7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 07ef33224..c2630590e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19569.1 + 3.1.100-rtm.19569.3 From 7d6fe0f7e0f7f59712eb1357e1c323af9ed69fd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 21:35:33 +0000 Subject: [PATCH 090/114] Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#5729) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 --- eng/Version.Details.xml | 4 +- eng/common/templates/job/execute-sdl.yml | 28 ++- ...al-30.yml => generic-internal-channel.yml} | 25 ++- ...ease-31.yml => generic-public-channel.yml} | 40 ++-- .../channels/netcore-3-tools-validation.yml | 95 ---------- .../post-build/channels/netcore-3-tools.yml | 130 ------------- .../post-build/channels/netcore-dev-31.yml | 130 ------------- .../post-build/channels/netcore-dev-5.yml | 130 ------------- .../channels/netcore-release-30.yml | 130 ------------- .../channels/netcore-tools-latest.yml | 130 ------------- .../channels/netcore-tools-validation.yml | 95 ---------- .../templates/post-build/common-variables.yml | 12 +- .../templates/post-build/post-build.yml | 173 +++++++++++++++--- global.json | 2 +- 14 files changed, 226 insertions(+), 898 deletions(-) rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ab03d770..40cae3e78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f996419..52e2ff021 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df3..68fdec029 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c..c4bc1897d 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031f..000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e..000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db2125418..000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16ac..000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db2..000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b9..000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49a..000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f18..0a2c40c10 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff..ec80c65a9 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,172 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + stageName: 'NetCore_Tools_Latest_Publish' + channelName: '.NET Tools - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'PVR_Publish' + channelName: '.NET Tools - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index b9160312f..d58469718 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" } } From 7112d62479fd188e60aeb811c34eaa8bd8137775 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:15:11 +0000 Subject: [PATCH 091/114] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5723) * Update dependencies from https://github.com/dotnet/toolset build 20191119.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19569.4 * Update dependencies from https://github.com/dotnet/toolset build 20191120.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19570.6 --- 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 40cae3e78..a449704cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 4e83fe248c14813a28569d4f4c153609650aa2a7 + 651f2eb74856e1305508781420725ae5decfad70 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c2630590e..7649f14bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19569.3 + 3.1.100-rtm.19570.6 From b9945282f129081e972de1a2ce34bfca81061c4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:50:53 +0000 Subject: [PATCH 092/114] Update dependencies from https://github.com/dotnet/toolset build 20191120.7 (#5730) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19570.7 --- 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 a449704cc..a2c7a49c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 - + https://github.com/dotnet/toolset - 651f2eb74856e1305508781420725ae5decfad70 + 3adc2b99c60be57c5f85121986f2cb31aa09d8c7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7649f14bd..44dcbf420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-rtm.19570.6 + 3.1.100-rtm.19570.7 From f6f640183ee39f5646e84ff1ea7b6e8d5717c209 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 01:01:04 +0000 Subject: [PATCH 093/114] Update dependencies from https://github.com/dotnet/core-setup build 20191120.3 (#5733) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-rtm.19570.3 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb9340613..1b3fb9586 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2c7a49c6..72ececf07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,31 +3,31 @@ https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 - + https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 diff --git a/eng/Versions.props b/eng/Versions.props index 44dcbf420..5e74c3acc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,7 +61,7 @@ - 3.1.0-rtm.19568.2 + 3.1.0-rtm.19570.3 3.1.0 3.1.0 3.1.0 From fc3c44a49c044eaf111ab2df5c54215bb1232b30 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 21 Nov 2019 10:23:59 -0800 Subject: [PATCH 094/114] Update branding to 3.1.200 preview1 --- src/CopyToLatest/targets/BranchInfo.props | 2 +- src/redist/targets/Versions.targets | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index 7a1921c15..e67ccd9d2 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.1.1xx + release/3.1.2xx diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 459284ab9..8f83d1cfb 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -2,9 +2,9 @@ 3 1 - 1 + 2 00 - rtm + preview1 From 9018671d62ac3b05763b75412adf0df7dbd6112f Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 21 Nov 2019 11:22:15 -0800 Subject: [PATCH 095/114] Set DropSuffix=false (#5737) --- 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 8f83d1cfb..3118748cf 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -8,7 +8,7 @@ - true + false From af3e3b8f8321edd950c3fe186b891a0c6ce30edb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 02:30:46 +0000 Subject: [PATCH 096/114] Update dependencies from https://github.com/dotnet/core-setup build 20191121.5 (#5747) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0 - Microsoft.WindowsDesktop.App.Ref - 3.1.0 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0 - Microsoft.NETCore.App.Internal - 3.1.0-rtm.19571.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19570.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b3fb9586..916ad5262 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,8 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72ececf07..d22b4c27f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,31 +3,31 @@ https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 - + https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 24b0195c1f4c4a707ca6c3a3bd4715a65fcd8bfe - + https://github.com/dotnet/wpf - 7aac1f7396bfc03177b1fc85b7d4e49b5222b102 + 67636428e8671ea15833016b462691530225035c diff --git a/eng/Versions.props b/eng/Versions.props index 5e74c3acc..7d308f1b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-rtm.19568.6 + 3.1.0-rtm.19570.2 @@ -61,7 +61,7 @@ - 3.1.0-rtm.19570.3 + 3.1.0-rtm.19571.5 3.1.0 3.1.0 3.1.0 From f4638c0515a90a6e1367e804935d708a85bca3c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 09:31:46 +0000 Subject: [PATCH 097/114] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5718) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191119.2 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19569.2 - dotnet-user-secrets - 3.1.0-rtm.19569.2 - dotnet-watch - 3.1.0-rtm.19569.2 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19569.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191121.5 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19571.5 - dotnet-user-secrets - 3.1.0-rtm.19571.5 - dotnet-watch - 3.1.0-rtm.19571.5 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19571.5 --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 916ad5262..ade4f8f5c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d22b4c27f..d393c08c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + 13ce5134d2d7875237bbc5bc0280175de58eb33b https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + 13ce5134d2d7875237bbc5bc0280175de58eb33b - + https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + 13ce5134d2d7875237bbc5bc0280175de58eb33b - + https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + 13ce5134d2d7875237bbc5bc0280175de58eb33b - + https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + 13ce5134d2d7875237bbc5bc0280175de58eb33b - + https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + 13ce5134d2d7875237bbc5bc0280175de58eb33b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7d308f1b8..b3aec7426 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-rtm.19566.1 - 3.1.0-rtm.19566.1 - 3.1.0-rtm.19566.1 - 3.1.0-rtm.19566.1 + 3.1.0-rtm.19571.5 + 3.1.0-rtm.19571.5 + 3.1.0-rtm.19571.5 + 3.1.0-rtm.19571.5 From 036e7afaffe866ef79601a4deec3936031d9ad4e Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 22 Nov 2019 13:29:45 -0800 Subject: [PATCH 098/114] update branding 3.1.101 servicing --- src/redist/targets/Versions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 459284ab9..a83319ba0 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -3,12 +3,12 @@ 3 1 1 - 00 - rtm + 01 + servicing - true + false From bd9d341985dd66f52f6680b17c29a84cca307e91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 05:51:48 +0000 Subject: [PATCH 099/114] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5769) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.12 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.12 - dotnet-user-secrets - 3.1.0-rtm.19572.12 - dotnet-watch - 3.1.0-rtm.19572.12 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19572.12 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.16 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.16 - dotnet-user-secrets - 3.1.0-rtm.19572.16 - dotnet-watch - 3.1.0-rtm.19572.16 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19572.16 --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index ade4f8f5c..d14611912 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d393c08c2..8d1109d1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - 13ce5134d2d7875237bbc5bc0280175de58eb33b + 9fded4c4aad794c7bb1152375a2eff092bb52a86 https://github.com/aspnet/AspNetCore - 13ce5134d2d7875237bbc5bc0280175de58eb33b + 9fded4c4aad794c7bb1152375a2eff092bb52a86 - + https://github.com/aspnet/AspNetCore - 13ce5134d2d7875237bbc5bc0280175de58eb33b + 9fded4c4aad794c7bb1152375a2eff092bb52a86 - + https://github.com/aspnet/AspNetCore - 13ce5134d2d7875237bbc5bc0280175de58eb33b + 9fded4c4aad794c7bb1152375a2eff092bb52a86 - + https://github.com/aspnet/AspNetCore - 13ce5134d2d7875237bbc5bc0280175de58eb33b + 9fded4c4aad794c7bb1152375a2eff092bb52a86 - + https://github.com/aspnet/AspNetCore - 13ce5134d2d7875237bbc5bc0280175de58eb33b + 9fded4c4aad794c7bb1152375a2eff092bb52a86 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b3aec7426..b28baf3d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-rtm.19571.5 - 3.1.0-rtm.19571.5 - 3.1.0-rtm.19571.5 - 3.1.0-rtm.19571.5 + 3.1.0-rtm.19572.16 + 3.1.0-rtm.19572.16 + 3.1.0-rtm.19572.16 + 3.1.0-rtm.19572.16 From 33541a04e6aac987a34d11b78f9fb0cd9d6d0e88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 07:26:51 +0000 Subject: [PATCH 100/114] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5772) * Update dependencies from https://github.com/dotnet/core-setup build 20191122.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.6 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.6 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.6 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.6 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.6 * Update dependencies from https://github.com/dotnet/core-setup build 20191122.8 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.8 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.8 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.8 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.8 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.8 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.8 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.8 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19572.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 1 - eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index d14611912..7ca807ade 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d1109d1b..450351609 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 24b0195c1f4c4a707ca6c3a3bd4715a65fcd8bfe - + https://github.com/dotnet/wpf - 67636428e8671ea15833016b462691530225035c + e85bb34bcb91bf7b8859d6fd84fd440508498aea diff --git a/eng/Versions.props b/eng/Versions.props index b28baf3d4..ff82c8a67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-rtm.19570.2 + 3.1.0-rtm.19572.4 @@ -61,13 +61,13 @@ - 3.1.0-rtm.19571.5 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 2.1.0 From a8858b765a1ae903f3267eece3cb8a39114ea537 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 08:25:41 +0000 Subject: [PATCH 101/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.19 (#5778) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.19 - dotnet-user-secrets - 3.1.0-rtm.19572.19 - dotnet-watch - 3.1.0-rtm.19572.19 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19572.19 --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7ca807ade..09de77791 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 450351609..13f42b227 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - 9fded4c4aad794c7bb1152375a2eff092bb52a86 + 814f3bd24b68db6881273d1639673842d697486e https://github.com/aspnet/AspNetCore - 9fded4c4aad794c7bb1152375a2eff092bb52a86 + 814f3bd24b68db6881273d1639673842d697486e - + https://github.com/aspnet/AspNetCore - 9fded4c4aad794c7bb1152375a2eff092bb52a86 + 814f3bd24b68db6881273d1639673842d697486e - + https://github.com/aspnet/AspNetCore - 9fded4c4aad794c7bb1152375a2eff092bb52a86 + 814f3bd24b68db6881273d1639673842d697486e - + https://github.com/aspnet/AspNetCore - 9fded4c4aad794c7bb1152375a2eff092bb52a86 + 814f3bd24b68db6881273d1639673842d697486e - + https://github.com/aspnet/AspNetCore - 9fded4c4aad794c7bb1152375a2eff092bb52a86 + 814f3bd24b68db6881273d1639673842d697486e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ff82c8a67..8f47615e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-rtm.19572.16 - 3.1.0-rtm.19572.16 - 3.1.0-rtm.19572.16 - 3.1.0-rtm.19572.16 + 3.1.0-rtm.19572.19 + 3.1.0-rtm.19572.19 + 3.1.0-rtm.19572.19 + 3.1.0-rtm.19572.19 From 78f2d34f5c2f9946dfd9967e7cc46090c5f0e6f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 22:20:41 +0000 Subject: [PATCH 102/114] Update dependencies from https://github.com/aspnet/AspNetCore build 20191123.3 (#5781) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19573.3 - dotnet-user-secrets - 3.1.0-rtm.19573.3 - dotnet-watch - 3.1.0-rtm.19573.3 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19573.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 09de77791..dd15a818e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13f42b227..5297aa208 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - 814f3bd24b68db6881273d1639673842d697486e + c31f51e5c778dc817862d0c932e7cfe9223d4899 https://github.com/aspnet/AspNetCore - 814f3bd24b68db6881273d1639673842d697486e + c31f51e5c778dc817862d0c932e7cfe9223d4899 - + https://github.com/aspnet/AspNetCore - 814f3bd24b68db6881273d1639673842d697486e + c31f51e5c778dc817862d0c932e7cfe9223d4899 - + https://github.com/aspnet/AspNetCore - 814f3bd24b68db6881273d1639673842d697486e + c31f51e5c778dc817862d0c932e7cfe9223d4899 - + https://github.com/aspnet/AspNetCore - 814f3bd24b68db6881273d1639673842d697486e + c31f51e5c778dc817862d0c932e7cfe9223d4899 - + https://github.com/aspnet/AspNetCore - 814f3bd24b68db6881273d1639673842d697486e + c31f51e5c778dc817862d0c932e7cfe9223d4899 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8f47615e6..58ba28005 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-rtm.19572.19 - 3.1.0-rtm.19572.19 - 3.1.0-rtm.19572.19 - 3.1.0-rtm.19572.19 + 3.1.0-rtm.19573.3 + 3.1.0-rtm.19573.3 + 3.1.0-rtm.19573.3 + 3.1.0-rtm.19573.3 From d32a342ff379b0a47f41fde7a8da90b2b796111b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 19:50:44 +0000 Subject: [PATCH 103/114] Update dependencies from https://github.com/dotnet/core-setup build 20191125.1 (#5783) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19575.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19575.1 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19575.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19575.1 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19575.1 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19575.1 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19575.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5297aa208..a8ee733b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 diff --git a/eng/Versions.props b/eng/Versions.props index 58ba28005..6c0329b54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,13 +61,13 @@ - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 + 3.1.1-servicing.19575.1 + 3.1.1-servicing.19575.1 + 3.1.1-servicing.19575.1 + 3.1.1-servicing.19575.1 + 3.1.1-servicing.19575.1 + 3.1.1-servicing.19575.1 + 3.1.1-servicing.19575.1 2.1.0 From 458eb288fa7860d332abbee349a2147faa7bd896 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 25 Nov 2019 17:28:25 -0800 Subject: [PATCH 104/114] Add trigger for internal builds (#5784) --- .vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 094e31178..2a47781bc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -4,6 +4,7 @@ trigger: include: - master - release/* + - internal/release/3.* variables: - name: _PublishBlobFeedUrl From 1e2e7f4fa1c88dbd48a9cdb7bccc2b3fdf427aa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 16:43:04 +0000 Subject: [PATCH 105/114] Update dependencies from https://github.com/dotnet/arcade build 20191122.3 (#5766) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 --- eng/Version.Details.xml | 4 +- .../templates/post-build/common-variables.yml | 14 ++-- .../templates/post-build/post-build.yml | 80 ++++++++++++++++++- global.json | 2 +- 4 files changed, 86 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8ee733b1..93527d41c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c10..216d043e4 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a9..9921743bc 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index d58469718..73d07d6d9 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" } } From 655bd1a02edb2a7c00c9564a06561c9714282a64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 23:35:44 +0000 Subject: [PATCH 106/114] Update dependencies from https://github.com/dotnet/core-setup build 20191126.4 (#5791) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.4 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.4 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.4 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.4 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.4 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93527d41c..96e473086 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c diff --git a/eng/Versions.props b/eng/Versions.props index 17c411961..df8272acf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,13 +61,13 @@ - 3.1.1-servicing.19575.1 - 3.1.1-servicing.19575.1 - 3.1.1-servicing.19575.1 - 3.1.1-servicing.19575.1 - 3.1.1-servicing.19575.1 - 3.1.1-servicing.19575.1 - 3.1.1-servicing.19575.1 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 2.1.0 From 85a5ef8eef3e3207eb0e74e2469b201b40751dfe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2019 01:33:16 +0000 Subject: [PATCH 107/114] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#5799) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 +++++++++++++++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++++++++++++++ global.json | 2 +- 4 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96e473086..714dbd126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000..2cb40c294 --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000..126452131 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/global.json b/global.json index 73d07d6d9..d68bbee67 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From 41d2445a6b2c412b2ebe78ad2fc7131988babd91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 18:48:28 +0000 Subject: [PATCH 108/114] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#5811) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 ++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++ .../templates/post-build/common-variables.yml | 14 +- .../templates/post-build/post-build.yml | 80 ++++++++++- global.json | 2 +- 6 files changed, 330 insertions(+), 14 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72ececf07..30cc298f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000..2cb40c294 --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000..126452131 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c10..216d043e4 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a9..9921743bc 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index d58469718..d68bbee67 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From 326f8a5f48a1d6067898cc5bc085f8eac4b7281c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:40:39 +0000 Subject: [PATCH 109/114] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#5823) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 24 ++++++++-- eng/common/SetupNugetSources.sh | 80 ++++++++++++++++++++++---------- global.json | 2 +- 4 files changed, 78 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 714dbd126..d83bfc195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 99c6b59a8afff97fe891341b39abe985f1d3c565 + 8e47254f93b276c974968aff83222f89ec3931ed diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2cb40c294..f7867a56b 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -16,7 +16,7 @@ # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { } if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 } +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -121,7 +126,16 @@ if ($creds -eq $null) { # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} -$doc.Save($filename) +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} + +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 126452131..4ebb1e5a4 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -17,7 +17,7 @@ # displayName: Setup Private Feeds Credentials # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -42,7 +42,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then - echo "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" ExitWithExitCode 1 fi @@ -52,7 +57,7 @@ if [[ `uname -s` == "Darwin" ]]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." ConfigNodeHeader="" @@ -62,7 +67,7 @@ if [ "$?" != "0" ]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -72,37 +77,64 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." +PackageSources=() - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi # I want things split line by line PrevIFS=$IFS IFS=$'\n' -PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -PackageSources+=('dotnet3-internal') -PackageSources+=('dotnet3-internal-transport') - for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile @@ -112,6 +144,6 @@ for FeedName in ${PackageSources[@]} ; do PackageSourceCredentialsNodeFooter="" NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi -done +done \ No newline at end of file diff --git a/global.json b/global.json index d68bbee67..ca9fbac4b 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From 51e15d2e9b7b8dc94bc18b01d1e364ce4a6fb722 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 22:55:13 +0000 Subject: [PATCH 110/114] Update dependencies from https://github.com/dotnet/test-templates build 20191120.1 (#5832) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.19570.1 --- 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 d83bfc195..fa519258b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ https://github.com/aspnet/AspNetCore c31f51e5c778dc817862d0c932e7cfe9223d4899 - + https://github.com/dotnet/test-templates - 6ae8a6e7dd862c9447771c108d43fb9028f22c22 + 5117d3d9d7dfd3583f0c42a639efaf092f957b7b https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index df8272acf..bebe77169 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 1.0.2-beta4.19511.1 + 1.0.2-beta4.19570.1 From 0e2f5458a0d1d426cefebe0948b5c42144149b3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 23:04:22 +0000 Subject: [PATCH 111/114] Update dependencies from https://github.com/dotnet/arcade build 20191205.2 (#5835) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19605.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa519258b..b3c9970ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 194fdce1e0692b4f43afacb1d386fbfe664d95cf diff --git a/global.json b/global.json index ca9fbac4b..747512f32 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19605.2" } } From a7599e4f056fe1a04270b5e3482831f232862ccc Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 5 Dec 2019 15:18:42 -0800 Subject: [PATCH 112/114] Update to 3.1.100 rtm sdk (#5829) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 747512f32..fb762da6e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.100-preview1-014459" + "dotnet": "3.1.100" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19605.2" From c70a1f79eb973d018ff3bca6f62eb900d55e50bc Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 5 Dec 2019 16:03:19 -0800 Subject: [PATCH 113/114] Fix merge error in SDK version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9dc538b6d..a6be3d1d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,7 +53,7 @@ - 3.1.100-rtm.19568.4 + 5.0.100-alpha1.19501.2 $(MicrosoftNETSdkPackageVersion) From aece614333648810fa7022948d7b1e2e7342c42e Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 5 Dec 2019 16:03:56 -0800 Subject: [PATCH 114/114] Fix merge error in arcade version --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 675e42cb6..7df2fb299 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,9 +104,9 @@ - + https://github.com/dotnet/arcade - 194fdce1e0692b4f43afacb1d386fbfe664d95cf + f2999360b70f05d7738cbfa2b61d1fdaff4ee77d