From 890dc4ba418c2ca731cdf1828590bf037d976c32 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 28 Oct 2019 10:59:40 -0700 Subject: [PATCH 01/71] Update template versions for 2.1/2.2 to 2.1.14 and 2.2.8 (#5340) * Update template versions for 2.1/2.2 to 2.1.14 and 2.2.8 * Update IDs of Microsoft.DotNet.Web.Spa.ProjectTemplates packages --- eng/Versions.props | 4 ++-- src/redist/targets/BundledTemplates.targets | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b840bf48..8e3b904fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,13 +84,13 @@ 1.0.2-beta4 $(MicrosoftDotNetCommonItemTemplates22PackageVersion) 1.0.2-beta4.19155.2 - 2.2.6 + 2.2.8 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4-20181009-2100240 - 2.1.12 + 2.1.14 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 0bc21a0b1..7f858b80a 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -51,7 +51,7 @@ - + @@ -60,7 +60,7 @@ - + From 26b8d71573671a2cf61b84c558cdb0d95a6d2357 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 18:00:12 -0700 Subject: [PATCH 02/71] Update dependencies from https://github.com/dotnet/toolset build 20191025.9 (#5348) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19525.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19525.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 ebe7e84e9..0c9114a07 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 - ba532c8cca4a59b01e0829bb2650fa69fb1cc9a3 + b01c47d2008864d965c95fa5022049e46bd6abb9 https://github.com/dotnet/sdk dc6f52268517e279bc001aec4520585d9b040e41 - + https://github.com/dotnet/cli - 973a51de880fe7a0fa170c551e60a1042bee2a3b + c3cce065adb627a490f54af09bccb290f9dce852 diff --git a/eng/Versions.props b/eng/Versions.props index 8e3b904fc..680f4a64c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19521.3 + 3.0.101-servicing.19525.9 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19517.5 + 3.0.101-servicing.19525.3 0.2.0 From 4380c2af959ae4bf716452b9a4b562a2ce6a161e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 02:40:31 +0000 Subject: [PATCH 03/71] Update dependencies from https://github.com/dotnet/toolset build 20191028.5 (#5380) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19528.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19528.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 3dd75827c..9d474bc86 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 - 86c9e404628dd209963f3bbd9a46e4938b0b2ab2 + e127fe54497d3ee56dee2334d93aa6c9d257ac46 - + https://github.com/dotnet/sdk - 34097cd518efe783071279653b9aa9a32e14d24f + 334812443d8bb11afa51a7efd2f8de83e321e6e1 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 8a641d680..a6ab7c971 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19527.2 + 3.1.100-preview2.19528.5 @@ -52,7 +52,7 @@ - 3.1.100-preview2.19527.1 + 3.1.100-preview2.19528.2 $(MicrosoftNETSdkPackageVersion) From 9ca817cc8585938251997f17552e1688ebb3006f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:16:44 +0000 Subject: [PATCH 04/71] Update dependencies from https://github.com/dotnet/toolset build 20191028.9 (#5383) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19528.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19528.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 9d474bc86..2216949c8 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 - e127fe54497d3ee56dee2334d93aa6c9d257ac46 + 303435a8feca626edc4cf615f6b3a07ee59fb9e0 https://github.com/dotnet/sdk 334812443d8bb11afa51a7efd2f8de83e321e6e1 - + https://github.com/dotnet/cli - 55fc1ed9117b267b9f027c1fd92bbb2137cedd91 + 4610f90b6a01dbccca1218b6280251f9e0547384 diff --git a/eng/Versions.props b/eng/Versions.props index a6ab7c971..d0cf95523 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19528.5 + 3.1.100-preview2.19528.9 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19526.1 + 3.1.100-preview2.19528.1 0.2.0 From c7d9188c6daf7c78382318de084519a8c418b403 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 23:02:03 -0700 Subject: [PATCH 05/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5385) * Update dependencies from https://github.com/dotnet/toolset build 20191028.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19528.7 * Update dependencies from https://github.com/dotnet/toolset build 20191028.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19528.8 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19526.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 2216949c8..c7e3b0897 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 - 303435a8feca626edc4cf615f6b3a07ee59fb9e0 + 81596d86cedb11c7e82ad510bcc872c621e85558 https://github.com/dotnet/sdk 334812443d8bb11afa51a7efd2f8de83e321e6e1 - + https://github.com/dotnet/cli - 4610f90b6a01dbccca1218b6280251f9e0547384 + 55fc1ed9117b267b9f027c1fd92bbb2137cedd91 diff --git a/eng/Versions.props b/eng/Versions.props index d0cf95523..94d7f4e7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19528.9 + 3.1.100-preview2.19528.8 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19528.1 + 3.1.100-preview2.19526.1 0.2.0 From 47efaff9933d20621b3e7246372a67c11e9e18a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 07:45:39 +0000 Subject: [PATCH 06/71] Update dependencies from https://github.com/aspnet/AspNetCore build 20191028.8 (#5387) - dotnet-user-secrets - 3.1.0-preview2.19528.8 - dotnet-watch - 3.1.0-preview2.19528.8 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview2.19528.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview2.19528.8 - dotnet-dev-certs - 3.1.0-preview2.19528.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19528.8 --- 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 c7e3b0897..5ea7992c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 + 471e4710a818849eaf22c5977281d10fd6758616 - + https://github.com/aspnet/AspNetCore - 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 + 471e4710a818849eaf22c5977281d10fd6758616 - + https://github.com/aspnet/AspNetCore - 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 + 471e4710a818849eaf22c5977281d10fd6758616 - + https://github.com/aspnet/AspNetCore - 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 + 471e4710a818849eaf22c5977281d10fd6758616 - + https://github.com/aspnet/AspNetCore - 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 + 471e4710a818849eaf22c5977281d10fd6758616 - + https://github.com/aspnet/AspNetCore - 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 + 471e4710a818849eaf22c5977281d10fd6758616 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 94d7f4e7f..df4eb2b4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview2.19525.8 - 3.1.0-preview2.19525.8 - 3.1.0-preview2.19525.8 - 3.1.0-preview2.19525.8 - 3.1.0-preview2.19525.8 - 3.1.0-preview2.19525.8 + 3.1.0-preview2.19528.8 + 3.1.0-preview2.19528.8 + 3.1.0-preview2.19528.8 + 3.1.0-preview2.19528.8 + 3.1.0-preview2.19528.8 + 3.1.0-preview2.19528.8 From 276b75acb44c87ad6f1b1d148739d07b05025271 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 08:45:40 +0000 Subject: [PATCH 07/71] Update dependencies from https://github.com/dotnet/toolset build 20191029.1 (#5388) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19528.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 5ea7992c4..83eb519e0 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 - 81596d86cedb11c7e82ad510bcc872c621e85558 + 46cc60fbd9994e53933cf68a884e1cf091700eb6 https://github.com/dotnet/sdk 334812443d8bb11afa51a7efd2f8de83e321e6e1 - + https://github.com/dotnet/cli - 55fc1ed9117b267b9f027c1fd92bbb2137cedd91 + 4610f90b6a01dbccca1218b6280251f9e0547384 diff --git a/eng/Versions.props b/eng/Versions.props index df4eb2b4d..12d661b68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19528.8 + 3.1.100-preview2.19529.1 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19526.1 + 3.1.100-preview2.19528.1 0.2.0 From 5a2c4c9504d34fd8b8603b46dce8160ac890a1cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 12:51:58 +0000 Subject: [PATCH 08/71] Update dependencies from https://github.com/dotnet/toolset build 20191029.3 (#5390) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19529.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 83eb519e0..4c3f5c7a1 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 - 46cc60fbd9994e53933cf68a884e1cf091700eb6 + aee5cd6a24bb9f4dc87fed3b796c7e59848dea5e https://github.com/dotnet/sdk 334812443d8bb11afa51a7efd2f8de83e321e6e1 - + https://github.com/dotnet/cli - 4610f90b6a01dbccca1218b6280251f9e0547384 + 23212e12c98ce4af8f07922c9ef6a20b23f236ea diff --git a/eng/Versions.props b/eng/Versions.props index 12d661b68..6bf5c3f20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19529.1 + 3.1.100-preview2.19529.3 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19528.1 + 3.1.100-preview2.19529.1 0.2.0 From ee22b96eafe4366a124512a8ed862ff58fea9811 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 19:36:10 +0000 Subject: [PATCH 09/71] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#5250) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191016.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19516.9 - dotnet-watch - 3.0.1-servicing.19516.9 - dotnet-user-secrets - 3.0.1-servicing.19516.9 - dotnet-dev-certs - 3.0.1-servicing.19516.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19516.9 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191028.7 - dotnet-user-secrets - 3.0.1-servicing.19528.7 - dotnet-watch - 3.0.1-servicing.19528.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19528.7 - dotnet-dev-certs - 3.0.1-servicing.19528.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19528.7 --- 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 0c9114a07..0dcfefc39 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 - 4d30facbaf0054b97310facded459157cb617955 + 2c6456d4634df947e3cafd5e7dee02289dc12697 - + https://github.com/aspnet/AspNetCore - 4d30facbaf0054b97310facded459157cb617955 + 2c6456d4634df947e3cafd5e7dee02289dc12697 - + https://github.com/aspnet/AspNetCore - 4d30facbaf0054b97310facded459157cb617955 + 2c6456d4634df947e3cafd5e7dee02289dc12697 - + https://github.com/aspnet/AspNetCore - 4d30facbaf0054b97310facded459157cb617955 + 2c6456d4634df947e3cafd5e7dee02289dc12697 - + https://github.com/aspnet/AspNetCore - 4d30facbaf0054b97310facded459157cb617955 + 2c6456d4634df947e3cafd5e7dee02289dc12697 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 680f4a64c..601a937db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.1-servicing.19510.13 + 3.0.1-servicing.19528.7 3.0.0 - 3.0.1-servicing.19510.13 - 3.0.1-servicing.19510.13 - 3.0.1-servicing.19510.13 - 3.0.1-servicing.19510.13 + 3.0.1-servicing.19528.7 + 3.0.1-servicing.19528.7 + 3.0.1-servicing.19528.7 + 3.0.1-servicing.19528.7 From 4bd5d24d87ef7a8465e3bb6fd923325245162628 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 19:46:13 +0000 Subject: [PATCH 10/71] Update dependencies from https://github.com/dotnet/toolset build 20191029.8 (#5394) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.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 4c3f5c7a1..d418e25b3 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 - aee5cd6a24bb9f4dc87fed3b796c7e59848dea5e + 3c91bfb6816d8129014a03866deb4c353f26a4b6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6bf5c3f20..b5c635e38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19529.3 + 3.1.100-preview2.19529.8 From 754b385754cf547a78998b2a8d7f04daa8e11874 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 23:51:11 +0000 Subject: [PATCH 11/71] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5384) * Update dependencies from https://github.com/dotnet/toolset build 20191028.11 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19528.11 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19528.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191029.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19529.4 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19529.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191029.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19529.10 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19529.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191029.11 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19529.11 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19529.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19529.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191029.15 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19529.15 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19529.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19529.3 (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 0dcfefc39..91946aa45 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 - b01c47d2008864d965c95fa5022049e46bd6abb9 + 2662a12facb706ecc1155643b2e0e37c5479d71f - + https://github.com/dotnet/sdk - dc6f52268517e279bc001aec4520585d9b040e41 + 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - c3cce065adb627a490f54af09bccb290f9dce852 + abc73b807191ff9c7d1b503aec70f6eb0e64f1fa diff --git a/eng/Versions.props b/eng/Versions.props index 601a937db..87bb5eb33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19525.9 + 3.0.101-servicing.19529.15 @@ -33,14 +33,14 @@ - 3.0.101-servicing.19525.3 + 3.0.101-servicing.19529.3 0.2.0 - 3.0.101-servicing.19510.7 + 3.0.101-servicing.19529.1 $(MicrosoftNETSdkPackageVersion) From 498222adb12c0cd8ed2a57a979fe056755c19ed6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 02:27:51 +0000 Subject: [PATCH 12/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5400) * Update dependencies from https://github.com/dotnet/toolset build 20191029.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.12 * Update dependencies from https://github.com/dotnet/toolset build 20191029.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.13 * Update dependencies from https://github.com/dotnet/toolset build 20191029.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.16 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19529.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 d418e25b3..a6c411c67 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 - 3c91bfb6816d8129014a03866deb4c353f26a4b6 + 75ca880e8021453caa7f93d2b1ec8eb08cffdb74 - + https://github.com/dotnet/sdk - 334812443d8bb11afa51a7efd2f8de83e321e6e1 + c0f6cf7488d21f13d9e96b0e87e77851be0e350d https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 88c47cb3c..0d905a5a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19529.8 + 3.1.100-preview2.19529.16 @@ -52,7 +52,7 @@ - 3.1.100-preview2.19528.2 + 3.1.100-preview2.19529.4 $(MicrosoftNETSdkPackageVersion) From 66249a55871e675d37d17b5d33f9b5a374367f11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 03:30:47 +0000 Subject: [PATCH 13/71] Update dependencies from https://github.com/dotnet/toolset build 20191029.17 (#5403) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.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 a6c411c67..6350c1e8f 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 - 75ca880e8021453caa7f93d2b1ec8eb08cffdb74 + 410b8d3fd85345ede7ffee4177e9027cb9444770 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0d905a5a5..b18715392 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19529.16 + 3.1.100-preview2.19529.17 From ae544b5037dab4d07d09731f6151e82e989b92b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 06:31:27 +0000 Subject: [PATCH 14/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5405) * Update dependencies from https://github.com/dotnet/toolset build 20191029.18 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19529.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191029.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.19 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19529.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19529.4 (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 6350c1e8f..31dde2e7b 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 - 410b8d3fd85345ede7ffee4177e9027cb9444770 + 333fa1d20d32d0f7a91f0079ed589ee770566834 - + https://github.com/dotnet/sdk - c0f6cf7488d21f13d9e96b0e87e77851be0e350d + 2aa52a135c1a1fc0d6cebbc333af20571f5057e9 - + https://github.com/dotnet/cli - 23212e12c98ce4af8f07922c9ef6a20b23f236ea + 3ebe0fd6ac4cb911dedb4d986a462ee163840288 diff --git a/eng/Versions.props b/eng/Versions.props index b18715392..9bc0a5d57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19529.17 + 3.1.100-preview2.19529.19 @@ -45,14 +45,14 @@ - 3.1.100-preview2.19529.1 + 3.1.100-preview2.19529.4 0.2.0 - 3.1.100-preview2.19529.4 + 3.1.100-preview2.19529.5 $(MicrosoftNETSdkPackageVersion) From 451acef88bce17e560785377515cba450be13d02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 08:51:12 +0000 Subject: [PATCH 15/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5406) * Update dependencies from https://github.com/dotnet/toolset build 20191029.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19529.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19529.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191030.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19529.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 31dde2e7b..0ee31c69d 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 - 333fa1d20d32d0f7a91f0079ed589ee770566834 + 37d00ca974e2b1e79bafee96d0d1f8cdcf1c2e19 https://github.com/dotnet/sdk 2aa52a135c1a1fc0d6cebbc333af20571f5057e9 - + https://github.com/dotnet/cli - 3ebe0fd6ac4cb911dedb4d986a462ee163840288 + a1e97a10ada1bfe947632426d2f68bcad152c096 diff --git a/eng/Versions.props b/eng/Versions.props index 9bc0a5d57..95890e118 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19529.19 + 3.1.100-preview2.19530.1 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19529.4 + 3.1.100-preview2.19529.5 0.2.0 From 8d0ccbbdaa71e395e02c83c1475f5b63157ea68d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 14:01:38 +0000 Subject: [PATCH 16/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5408) * Update dependencies from https://github.com/dotnet/toolset build 20191030.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.2 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19530.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191030.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.4 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19530.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.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 0ee31c69d..356fe68c5 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 - 37d00ca974e2b1e79bafee96d0d1f8cdcf1c2e19 + 9f936f78c556507cc970c6b04af9fc4136e01ac0 - + https://github.com/dotnet/sdk - 2aa52a135c1a1fc0d6cebbc333af20571f5057e9 + 6a09111e0fc54a895f6975af796c8133fdd47fd6 - + https://github.com/dotnet/cli - a1e97a10ada1bfe947632426d2f68bcad152c096 + 35a2db8a4ebccd6598ba873511c3c989456a4fa5 diff --git a/eng/Versions.props b/eng/Versions.props index 95890e118..cf6ee83aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19530.1 + 3.1.100-preview2.19530.4 @@ -45,14 +45,14 @@ - 3.1.100-preview2.19529.5 + 3.1.100-preview2.19530.1 0.2.0 - 3.1.100-preview2.19529.5 + 3.1.100-preview2.19530.1 $(MicrosoftNETSdkPackageVersion) From 491a32e976442f157037e08ef892bb1ce0c19db2 Mon Sep 17 00:00:00 2001 From: Sarabjot Singh Date: Wed, 30 Oct 2019 23:31:22 +0530 Subject: [PATCH 17/71] Updating to the latest version of the test templates which has the precedence fix (#5332) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cf6ee83aa..2a1204248 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 1.0.2-beta4.19465.1 + 1.0.2-beta4.19511.1 From 026695bb0c0a66d35beeda6cf19d0746961054ba Mon Sep 17 00:00:00 2001 From: halex2005 Date: Wed, 30 Oct 2019 23:03:30 +0500 Subject: [PATCH 18/71] update nunit3 templates versions: (#5335) - issued new v1.6.4 for .NET Core 3 with updated dependencies versions - issued new v1.7.0 wih support for .NET Core 3.1 targeting, netcoreapp3.1 is the default targeting since that version --- eng/Versions.props | 4 ++-- src/redist/targets/BundledTemplates.targets | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2a1204248..73110b579 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 1.6.3 + 1.7.0 @@ -93,7 +93,7 @@ 4.8.0-rc2.19462.10 3.0.0 - 1.6.3 + 1.6.4 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index c3770d204..3755bdefd 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -124,7 +124,7 @@ @@ -145,14 +145,15 @@ Version="[$(NUnit3Templates21PackageVersion)]; [$(NUnit3Templates22PackageVersion)]; [$(NUnit3Templates30PackageVersion)]; + [$(NUnit3Templates31PackageVersion)]; " /> - - @@ -160,7 +161,7 @@ - + From d660497f891e93529775790a47f6785ca358f7b3 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 30 Oct 2019 11:44:13 -0700 Subject: [PATCH 19/71] Update dockers (#5186) - Remove ubuntu 14.04 and groovey file - Remove all old fedora - Update to Debian Stretch - Remove rhel.6 - No debian 9 1.x runtime support --- .vsts-ci.yml | 37 +---- eng/docker/debian/Dockerfile | 18 ++- eng/docker/fedora.23/Dockerfile | 31 ---- eng/docker/fedora.24/Dockerfile | 29 ---- eng/docker/fedora.27/Dockerfile | 33 ---- eng/docker/fedora.28/Dockerfile | 30 ---- eng/docker/rhel.6/Dockerfile | 34 ---- eng/docker/ubuntu.14.04/Dockerfile | 64 -------- netci.groovy | 145 ------------------ src/redist/targets/Badge.targets | 1 - src/redist/targets/GenerateLayout.targets | 1 - .../targets/GetRuntimeInformation.targets | 4 - src/redist/targets/SetBuildDefaults.targets | 3 - test/SdkTests/SdkTests.csproj | 4 + 14 files changed, 22 insertions(+), 412 deletions(-) delete mode 100644 eng/docker/fedora.23/Dockerfile delete mode 100644 eng/docker/fedora.24/Dockerfile delete mode 100644 eng/docker/fedora.27/Dockerfile delete mode 100644 eng/docker/fedora.28/Dockerfile delete mode 100644 eng/docker/rhel.6/Dockerfile delete mode 100644 eng/docker/ubuntu.14.04/Dockerfile delete mode 100644 netci.groovy diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2c754dfa2..4d67be1b5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -88,13 +88,6 @@ stages: strategy: matrix: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_14_04_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.14.04' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Ubuntu_16_04_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker ubuntu.16.04' @@ -109,20 +102,6 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_Fedora_27_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.27' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Fedora_28_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.28' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Fedora_29_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker fedora.29' @@ -137,7 +116,7 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_Debian_Jessie_Debug_x64: + Build_Debian_Stretch_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' _LinuxPortable: '' @@ -151,13 +130,6 @@ 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: '' @@ -208,13 +180,6 @@ 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/debian/Dockerfile b/eng/docker/debian/Dockerfile index 6511762c8..891658239 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,21 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-jessie-debpkg-58e4974-20190328133153 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-d61254f-20190807161114 + +# Install the deb packaging toolchain we need to build debs +RUN apt-get update \ + && apt-get -y install \ + debhelper \ + build-essential \ + devscripts \ + locales \ + && rm -rf /var/lib/apt/lists/* + +# liblldb is needed so deb package build does not throw missing library info errors +RUN apt-get update \ + && apt-get -y install liblldb-3.9 \ + && rm -rf /var/lib/apt/lists/* # Misc Dependencies for build RUN rm -rf /var/lib/apt/lists/* && \ @@ -13,6 +27,8 @@ RUN rm -rf /var/lib/apt/lists/* && \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + +RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0 diff --git a/eng/docker/fedora.23/Dockerfile b/eng/docker/fedora.23/Dockerfile deleted file mode 100644 index 0d156e137..000000000 --- a/eng/docker/fedora.23/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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:fedora23_prereqs - -# Install tools used by the VSO build automation. -RUN dnf install -y findutils && \ - dnf clean all - -# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts. -RUN dnf upgrade -y nss -RUN dnf clean all - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.24/Dockerfile b/eng/docker/fedora.24/Dockerfile deleted file mode 100644 index ff1edb0a0..000000000 --- a/eng/docker/fedora.24/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM fedora:24 - -RUN dnf install -y bash git cmake wget which python clang-3.8.0-1.fc24.x86_64 llvm-devel-3.8.0-1.fc24.x86_64 make libicu-devel lldb-devel.x86_64 \ - libunwind-devel.x86_64 lttng-ust-devel.x86_64 uuid-devel libuuid-devel tar glibc-locale-source zlib-devel libcurl-devel \ - krb5-devel openssl-devel autoconf libtool hostname - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Set a different rid to publish buildtools for, until we update to a version which -# natively supports fedora.24-x64 -ENV __PUBLISH_RID=fedora.23-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.27/Dockerfile b/eng/docker/fedora.27/Dockerfile deleted file mode 100644 index f6eaa8fbd..000000000 --- a/eng/docker/fedora.27/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# -# 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:fedora-27-82a3800-20180326211504 - -RUN dnf install -y findutils - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Set a different rid to publish buildtools for, until we update to a version which -# natively supports fedora.24-x64 -ENV __PUBLISH_RID=fedora.23-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/fedora.28/Dockerfile b/eng/docker/fedora.28/Dockerfile deleted file mode 100644 index 5e08f7a19..000000000 --- a/eng/docker/fedora.28/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# -# 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:fedora-28-c103199-20180628122443 - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Override RID set by the dotnet-buildtools-prereqs docker image -ENV __PUBLISH_RID=fedora.28-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile deleted file mode 100644 index 9e2e572d0..000000000 --- a/eng/docker/rhel.6/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# -# 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/eng/docker/ubuntu.14.04/Dockerfile b/eng/docker/ubuntu.14.04/Dockerfile deleted file mode 100644 index 7e7cb6bdb..000000000 --- a/eng/docker/ubuntu.14.04/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# -# 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 ubuntu:14.04 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update && \ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu52 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 \ - lldb-3.6 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/netci.groovy b/netci.groovy deleted file mode 100644 index e964e99bb..000000000 --- a/netci.groovy +++ /dev/null @@ -1,145 +0,0 @@ -// 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. - -// Import the utility functionality. - -import jobs.generation.ArchivalSettings; -import jobs.generation.Utilities; - -def project = GithubProject -def branch = GithubBranchName -def isPR = true - -def platformList = [ - 'AllLinux:x64:Release', - 'CentOS7.1:x64:Debug', - 'Debian8.2:x64:Debug', - 'fedora.27:x64:Debug', - 'Linux:arm:Debug', - 'Linux:arm64:Debug', - 'Linux-musl:x64:Debug', - 'Linux:x64:Release', - 'Linux_NoSuffix:arm:Release', - 'Linux_NoSuffix:x64:Release', - 'OSX10.12:x64:Release', - 'RHEL6:x64:Debug', - 'RHEL7.2:x64:Release', - 'Ubuntu:x64:Release', - 'Ubuntu16.04:x64:Debug', - 'ubuntu.18.04:x64:Debug', - 'Windows_NT:x64:Release', - 'Windows_NT:x86:Debug', - 'Windows_NT_ES:x64:Debug', - 'Windows_NT_NoSuffix:x64:Release' -] - -def static getBuildJobName(def configuration, def os, def architecture) { - return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() -} - -platformList.each { platform -> - // Calculate names - def (os, architecture, configuration) = platform.tokenize(':') - def osUsedForMachineAffinity = os; - def osVersionUsedForMachineAffinity = 'latest-or-auto'; - - // Calculate job name - def jobName = getBuildJobName(configuration, os, architecture) - def baseBatchBuildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default"; - def baseShellBuildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"; - - // Calculate the build command - if (os.startsWith("Windows_NT")) { - osUsedForMachineAffinity = 'Windows_NT' - buildCommand = "${baseBatchBuildCommand}" - if (os == 'Windows_NT_ES') { - buildCommand = """ -set DOTNET_CLI_UI_LANGUAGE=es -${buildCommand} -""" - } - else if (os == 'Windows_NT_NoSuffix') { - buildCommand = """ -set DropSuffix=true -${buildCommand} -""" - } - } - else if (os == 'Windows_2016') { - buildCommand = "${baseBatchBuildCommand} -RunInstallerTestsInDocker" - } - else if (os.startsWith("Linux")) { - osUsedForMachineAffinity = 'Ubuntu16.04'; - if (os == 'Linux-musl') { - buildCommand = "${baseShellBuildCommand} --runtime-id linux-musl-x64 --docker alpine.3.6" - } - else - { - buildCommand = "${baseShellBuildCommand} --linux-portable" - if ((architecture == 'arm') || (architecture == 'arm64')) { - buildCommand = "${buildCommand} --architecture ${architecture} /p:CLIBUILD_SKIP_TESTS=true" - } - if (os == 'Linux_NoSuffix') { - buildCommand = """ -export DropSuffix=true -${buildCommand} -""" - } - } - } - else if (os == 'Ubuntu') { - buildCommand = "${baseShellBuildCommand} --docker ubuntu.14.04" - } - else if (os == 'RHEL6') { - osUsedForMachineAffinity = 'Ubuntu16.04'; - buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" - } - else if (os == 'ubuntu.18.04' || os == 'fedora.27') { - osUsedForMachineAffinity = 'Ubuntu16.04' - osVersionUsedForMachineAffinity = 'latest-docker' - buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" - } - else if (os == 'AllLinux') { - osUsedForMachineAffinity = 'Ubuntu16.04' - buildCommand = "${baseShellBuildCommand} --skip-prereqs --configuration ${configuration} --targets Default /t:BuildAndPublishAllLinuxDistrosNativeInstallers" - } - else { - buildCommand = "${baseShellBuildCommand}" - } - - def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { - // Set the label. - steps { - if (osUsedForMachineAffinity == 'Windows_NT' || osUsedForMachineAffinity == 'Windows_2016') { - // Batch - batchFile(buildCommand) - } - else { - // Shell - shell(buildCommand) - } - } - } - - Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity) - Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - // ARM and AllLinux CI runs are build only. - if ((architecture != 'arm') && (architecture != 'arm64') && (os != 'AllLinux')) { - Utilities.addMSTestResults(newJob, '**/*.trx') - } - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") - - def archiveSettings = new ArchivalSettings() - archiveSettings.addFiles("test/**/*.trx") - archiveSettings.addFiles("*.binlog") - archiveSettings.setFailIfNothingArchived() - archiveSettings.setArchiveOnFailure() - Utilities.addArchival(newJob, archiveSettings) -} - -// Make the call to generate the help job -Utilities.createHelperJob(this, project, branch, - "Welcome to the ${project} Repository", // This is prepended to the help message - "Have a nice day!") // This is appended to the help message. You might put known issues here. - -Utilities.addCROSSCheck(this, project, branch) diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets index 8e9ccc4ac..f7416fef7 100644 --- a/src/redist/targets/Badge.targets +++ b/src/redist/targets/Badge.targets @@ -19,7 +19,6 @@ $(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 5248ebeda..e46c59629 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -77,7 +77,6 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) - linux-x64 $(AspNetCoreSharedFxInstallerRid) x64 diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 9248c46c8..695a56908 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -26,14 +26,10 @@ $(Rid) $(OSName)-$(Architecture) $(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index b31e5350d..268100720 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -9,16 +9,13 @@ ($(Rid.StartsWith('rhel.6')) OR $(Rid.StartsWith('freebsd')) OR $(Rid.StartsWith('linux-musl')) - OR $(Rid.StartsWith('fedora.27')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false true true diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index d33fe2504..71fccbc63 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,6 +63,10 @@ false + + false + + false From b9ad93b21b60dfb308f6b2289680c75852be59e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 21:56:25 +0000 Subject: [PATCH 20/71] Update dependencies from https://github.com/dotnet/toolset build 20191030.10 (#5415) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.10 --- 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 356fe68c5..694e018c3 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 - 9f936f78c556507cc970c6b04af9fc4136e01ac0 + b1581ddf269c7f6236b96cc309f430b37668f7d2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 73110b579..33d9d33c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19530.4 + 3.1.100-preview2.19530.10 From 4028926dd552ba9bd8df4f37c036c90dc28329ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 22:40:06 +0000 Subject: [PATCH 21/71] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5402) * Update dependencies from https://github.com/dotnet/core-setup build 20191029.2 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19529.2 - Microsoft.NETCore.App.Internal - 3.1.0-preview2.19529.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview2.19529.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19529.2 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview2.19529.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19529.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19529.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19529.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20191029.3 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19529.3 - Microsoft.NETCore.App.Internal - 3.1.0-preview2.19529.3 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview2.19529.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19529.3 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview2.19529.3 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19529.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19529.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19529.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19529.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20191030.4 - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19530.4 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19530.4 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19530.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19530.4 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19530.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19530.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19529.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19529.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 694e018c3..db23ccaf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 @@ -84,13 +84,13 @@ 35a2db8a4ebccd6598ba873511c3c989456a4fa5 - + https://github.com/dotnet/winforms - d890296011263c2fd459a2c4ae63d522d1f651ba + 4378c8fec85e3ad09065870d387a48d11320e95c - + https://github.com/dotnet/wpf - 94ba9d2ba78eda787981ce11fd5a55b4788254bb + e1d8b881759b1d1ed5db5e9f455dd76daf937875 diff --git a/eng/Versions.props b/eng/Versions.props index 33d9d33c2..bdd6b1da2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19523.5 + 4.8.1-preview1.19529.13 - 3.1.0-preview2.19525.4 + 3.1.0-preview2.19529.8 @@ -61,13 +61,13 @@ - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 2.1.0 From 54f993c6cacb83abb65c494fc5a852a65a112d21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 22:43:07 +0000 Subject: [PATCH 22/71] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5413) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.3 - dotnet-user-secrets - 3.1.0-preview3.19530.3 - dotnet-watch - 3.1.0-preview3.19530.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19530.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.3 - dotnet-dev-certs - 3.1.0-preview3.19530.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.5 - dotnet-user-secrets - 3.1.0-preview3.19530.5 - dotnet-watch - 3.1.0-preview3.19530.5 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19530.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.5 - dotnet-dev-certs - 3.1.0-preview3.19530.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.5 --- 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 db23ccaf6..56bf39e7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 471e4710a818849eaf22c5977281d10fd6758616 + 0540ec259dec586472853fc66ca90b349693aeef - + https://github.com/aspnet/AspNetCore - 471e4710a818849eaf22c5977281d10fd6758616 + 0540ec259dec586472853fc66ca90b349693aeef - + https://github.com/aspnet/AspNetCore - 471e4710a818849eaf22c5977281d10fd6758616 + 0540ec259dec586472853fc66ca90b349693aeef - + https://github.com/aspnet/AspNetCore - 471e4710a818849eaf22c5977281d10fd6758616 + 0540ec259dec586472853fc66ca90b349693aeef - + https://github.com/aspnet/AspNetCore - 471e4710a818849eaf22c5977281d10fd6758616 + 0540ec259dec586472853fc66ca90b349693aeef - + https://github.com/aspnet/AspNetCore - 471e4710a818849eaf22c5977281d10fd6758616 + 0540ec259dec586472853fc66ca90b349693aeef https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index bdd6b1da2..bc017dc18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview2.19528.8 - 3.1.0-preview2.19528.8 - 3.1.0-preview2.19528.8 - 3.1.0-preview2.19528.8 - 3.1.0-preview2.19528.8 - 3.1.0-preview2.19528.8 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 From 51c1cc9c4dadc77b43e1b68415f167c5b20e8949 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 00:56:44 +0000 Subject: [PATCH 23/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5418) * Update dependencies from https://github.com/dotnet/toolset build 20191030.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.11 * Update dependencies from https://github.com/dotnet/toolset build 20191030.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.12 * Update dependencies from https://github.com/dotnet/toolset build 20191030.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.13 * Update dependencies from https://github.com/dotnet/toolset build 20191030.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.14 * Update dependencies from https://github.com/dotnet/toolset build 20191030.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.15 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.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 56bf39e7c..8a6af1bc8 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 - b1581ddf269c7f6236b96cc309f430b37668f7d2 + 0935ca0dabaddb07d2ffb3f70a9976fc986b4526 https://github.com/dotnet/sdk 6a09111e0fc54a895f6975af796c8133fdd47fd6 - + https://github.com/dotnet/cli - 35a2db8a4ebccd6598ba873511c3c989456a4fa5 + 33cc830ee4867b2cc6be513fe1c0669a8eb40ec3 diff --git a/eng/Versions.props b/eng/Versions.props index bc017dc18..14ba777a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19530.10 + 3.1.100-preview2.19530.15 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19530.1 + 3.1.100-preview2.19530.2 0.2.0 From 922e26063980bf90d1768e26c42ff4351b92978f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 01:16:39 +0000 Subject: [PATCH 24/71] Update dependencies from https://github.com/dotnet/core-setup build 20191030.5 (#5420) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19530.5 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19530.5 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19530.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19530.5 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19530.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19530.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.5 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview3.19530.2 (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 8a6af1bc8..ea38b51e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + 4950751278293d59898be799c0115e0ad895747e - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + 4950751278293d59898be799c0115e0ad895747e - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + 4950751278293d59898be799c0115e0ad895747e - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + 4950751278293d59898be799c0115e0ad895747e - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + 4950751278293d59898be799c0115e0ad895747e - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + 4950751278293d59898be799c0115e0ad895747e - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + 4950751278293d59898be799c0115e0ad895747e @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 + d29d1bf34dea385124d076405ccb66ccfd173a86 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 14ba777a4..a50959c24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,17 +57,17 @@ - 3.1.0-preview2.19523.17 + 3.1.0-preview3.19530.2 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.5 2.1.0 From 81ac3324d57665b78cda53a9eb19e95d9acfd693 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 03:18:48 +0000 Subject: [PATCH 25/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5422) * Update dependencies from https://github.com/dotnet/toolset build 20191030.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.19 * Update dependencies from https://github.com/dotnet/toolset build 20191030.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.20 * Update dependencies from https://github.com/dotnet/toolset build 20191030.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.21 * Update dependencies from https://github.com/dotnet/toolset build 20191030.23 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.23 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19530.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191030.27 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.27 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19530.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191030.26 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.26 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19530.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191030.28 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.28 * Update dependencies from https://github.com/dotnet/toolset build 20191030.29 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.29 * Update dependencies from https://github.com/dotnet/toolset build 20191030.30 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.30 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19530.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.5 (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 ea38b51e8..67d1d7b7f 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 - 0935ca0dabaddb07d2ffb3f70a9976fc986b4526 + 2b00e1cef4c01e5899ce291fd834667094beb256 - + https://github.com/dotnet/sdk - 6a09111e0fc54a895f6975af796c8133fdd47fd6 + fb710543566de826da30550e45bdbc60deb2cee0 - + https://github.com/dotnet/cli - 33cc830ee4867b2cc6be513fe1c0669a8eb40ec3 + 6971b59c98a4333f55c664a7718370b6d1e0c180 diff --git a/eng/Versions.props b/eng/Versions.props index a50959c24..e16d952c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19530.15 + 3.1.100-preview2.19530.30 @@ -45,14 +45,14 @@ - 3.1.100-preview2.19530.2 + 3.1.100-preview2.19530.5 0.2.0 - 3.1.100-preview2.19530.1 + 3.1.100-preview2.19530.7 $(MicrosoftNETSdkPackageVersion) From 1746e58ea04b732f63775e6dd78945884aef5f36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 04:46:17 +0000 Subject: [PATCH 26/71] Update dependencies from https://github.com/dotnet/toolset build 20191030.31 (#5423) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.31 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.6 (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 67d1d7b7f..dad77de42 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 - 2b00e1cef4c01e5899ce291fd834667094beb256 + 0b76648f504ea05696a38be81c987b3d8c824922 https://github.com/dotnet/sdk fb710543566de826da30550e45bdbc60deb2cee0 - + https://github.com/dotnet/cli - 6971b59c98a4333f55c664a7718370b6d1e0c180 + 0a6e328d60f3699e205b1fa7e00e2de38436a37b diff --git a/eng/Versions.props b/eng/Versions.props index e16d952c6..89fa87395 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19530.30 + 3.1.100-preview2.19530.31 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19530.5 + 3.1.100-preview2.19530.6 0.2.0 From 05f7a2e6f1990b2929142d9f4b3882719050f388 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 04:57:39 +0000 Subject: [PATCH 27/71] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5421) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.8 - dotnet-user-secrets - 3.1.0-preview3.19530.8 - dotnet-watch - 3.1.0-preview3.19530.8 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19530.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.8 - dotnet-dev-certs - 3.1.0-preview3.19530.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.8 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.9 - dotnet-user-secrets - 3.1.0-preview3.19530.9 - dotnet-watch - 3.1.0-preview3.19530.9 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19530.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.9 - dotnet-dev-certs - 3.1.0-preview3.19530.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.9 --- 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 dad77de42..8c2188052 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx d29d1bf34dea385124d076405ccb66ccfd173a86 - + https://github.com/aspnet/AspNetCore - 0540ec259dec586472853fc66ca90b349693aeef + 11a84e25b49677b52b06768a7cba3619eb7e8cf1 - + https://github.com/aspnet/AspNetCore - 0540ec259dec586472853fc66ca90b349693aeef + 11a84e25b49677b52b06768a7cba3619eb7e8cf1 - + https://github.com/aspnet/AspNetCore - 0540ec259dec586472853fc66ca90b349693aeef + 11a84e25b49677b52b06768a7cba3619eb7e8cf1 - + https://github.com/aspnet/AspNetCore - 0540ec259dec586472853fc66ca90b349693aeef + 11a84e25b49677b52b06768a7cba3619eb7e8cf1 - + https://github.com/aspnet/AspNetCore - 0540ec259dec586472853fc66ca90b349693aeef + 11a84e25b49677b52b06768a7cba3619eb7e8cf1 - + https://github.com/aspnet/AspNetCore - 0540ec259dec586472853fc66ca90b349693aeef + 11a84e25b49677b52b06768a7cba3619eb7e8cf1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 89fa87395..080453efb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 + 3.1.0-preview3.19530.9 + 3.1.0-preview3.19530.9 + 3.1.0-preview3.19530.9 + 3.1.0-preview3.19530.9 + 3.1.0-preview3.19530.9 + 3.1.0-preview3.19530.9 From ba6c74782f1680e3e73ba7b62ae3e41e380d3f45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 06:36:07 +0000 Subject: [PATCH 28/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5425) * Update dependencies from https://github.com/dotnet/toolset build 20191030.32 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.32 * Update dependencies from https://github.com/dotnet/toolset build 20191030.38 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19530.38 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19530.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 8c2188052..6eb90fe4d 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 - 0b76648f504ea05696a38be81c987b3d8c824922 + 4dd4fb698b584f9456afee8889ddf4b199964573 https://github.com/dotnet/sdk fb710543566de826da30550e45bdbc60deb2cee0 - + https://github.com/dotnet/cli - 0a6e328d60f3699e205b1fa7e00e2de38436a37b + fdad61606cd2fcaedb1acf4fa149430ea4bb1d90 diff --git a/eng/Versions.props b/eng/Versions.props index 080453efb..a6287bf46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19530.31 + 3.1.100-preview2.19530.38 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19530.6 + 3.1.100-preview2.19530.7 0.2.0 From db67d19b70b461850976aa0087589ee8fefe1d1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 10:21:33 +0000 Subject: [PATCH 29/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5428) * Update dependencies from https://github.com/dotnet/toolset build 20191031.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.1 * Update dependencies from https://github.com/dotnet/toolset build 20191031.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19531.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 6eb90fe4d..965220fc9 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 - 4dd4fb698b584f9456afee8889ddf4b199964573 + 19c967770fba2ed4c68e67998545a74c4f5f50cd https://github.com/dotnet/sdk fb710543566de826da30550e45bdbc60deb2cee0 - + https://github.com/dotnet/cli - fdad61606cd2fcaedb1acf4fa149430ea4bb1d90 + 9b71cd890cfa29423ba9737f971d3282a5c2d598 diff --git a/eng/Versions.props b/eng/Versions.props index a6287bf46..3f356a7a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19530.38 + 3.1.100-preview2.19531.2 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19530.7 + 3.1.100-preview2.19531.1 0.2.0 From 59bb953147d00f46811113d89add85d60b100edc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 14:49:19 +0000 Subject: [PATCH 30/71] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5426) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.11 - dotnet-user-secrets - 3.1.0-preview3.19530.11 - dotnet-watch - 3.1.0-preview3.19530.11 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19530.11 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.11 - dotnet-dev-certs - 3.1.0-preview3.19530.11 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.11 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.1 - dotnet-user-secrets - 3.1.0-preview3.19531.1 - dotnet-watch - 3.1.0-preview3.19531.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19531.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.1 - dotnet-dev-certs - 3.1.0-preview3.19531.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.1 --- 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 965220fc9..26b542fea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx d29d1bf34dea385124d076405ccb66ccfd173a86 - + https://github.com/aspnet/AspNetCore - 11a84e25b49677b52b06768a7cba3619eb7e8cf1 + 0faf33914345956525640464c854cf85da5a6573 - + https://github.com/aspnet/AspNetCore - 11a84e25b49677b52b06768a7cba3619eb7e8cf1 + 0faf33914345956525640464c854cf85da5a6573 - + https://github.com/aspnet/AspNetCore - 11a84e25b49677b52b06768a7cba3619eb7e8cf1 + 0faf33914345956525640464c854cf85da5a6573 - + https://github.com/aspnet/AspNetCore - 11a84e25b49677b52b06768a7cba3619eb7e8cf1 + 0faf33914345956525640464c854cf85da5a6573 - + https://github.com/aspnet/AspNetCore - 11a84e25b49677b52b06768a7cba3619eb7e8cf1 + 0faf33914345956525640464c854cf85da5a6573 - + https://github.com/aspnet/AspNetCore - 11a84e25b49677b52b06768a7cba3619eb7e8cf1 + 0faf33914345956525640464c854cf85da5a6573 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3f356a7a0..17a18d75d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19530.9 - 3.1.0-preview3.19530.9 - 3.1.0-preview3.19530.9 - 3.1.0-preview3.19530.9 - 3.1.0-preview3.19530.9 - 3.1.0-preview3.19530.9 + 3.1.0-preview3.19531.1 + 3.1.0-preview3.19531.1 + 3.1.0-preview3.19531.1 + 3.1.0-preview3.19531.1 + 3.1.0-preview3.19531.1 + 3.1.0-preview3.19531.1 From c91d25dcebbe2b623cbd696c2370517b4bead3a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 16:21:44 +0000 Subject: [PATCH 31/71] Update dependencies from https://github.com/dotnet/toolset build 20191031.6 (#5434) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.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 26b542fea..b3176be9c 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 - 19c967770fba2ed4c68e67998545a74c4f5f50cd + f2bb36d1c907816b6d97271b0fc1e21f358f241c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 17a18d75d..bbe1aeed4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19531.2 + 3.1.100-preview2.19531.6 From 5d94311e295c0e9ca1463a47c97ecbd24d0971ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 18:55:43 +0000 Subject: [PATCH 32/71] Update dependencies from https://github.com/dotnet/core-setup build 20191031.6 (#5438) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19531.6 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19531.6 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19531.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19531.6 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19531.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19531.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.6 --- 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 b3176be9c..b555a5861 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 4950751278293d59898be799c0115e0ad895747e + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - 4950751278293d59898be799c0115e0ad895747e + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - 4950751278293d59898be799c0115e0ad895747e + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - 4950751278293d59898be799c0115e0ad895747e + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - 4950751278293d59898be799c0115e0ad895747e + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - 4950751278293d59898be799c0115e0ad895747e + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - 4950751278293d59898be799c0115e0ad895747e + d992cb6bb8368a7f3161fbf1a863b073ec28c956 diff --git a/eng/Versions.props b/eng/Versions.props index bbe1aeed4..93680baa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,13 +61,13 @@ - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 - 3.1.0-preview3.19530.5 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 2.1.0 From e344eb073ab1ce274908b4034491f2e81af015e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 21:22:54 +0000 Subject: [PATCH 33/71] Update dependencies from https://github.com/dotnet/toolset build 20191031.7 (#5439) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.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 b555a5861..bf7c4eb46 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 - f2bb36d1c907816b6d97271b0fc1e21f358f241c + 9dc036479b28b44721d0e45e8624d2840a5c7ba1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 93680baa6..28601f6f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19531.6 + 3.1.100-preview2.19531.7 From 44a1686a40874502c9aad6232ea8796ef1cf2113 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 31 Oct 2019 17:11:55 -0700 Subject: [PATCH 34/71] Update branding for preview3 (#5443) --- 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 e1d48c098..0476de00b 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 1 1 00 - preview2 + preview3 From d8bfd3065f80fe4e03db11054bd0643aabcd40fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 00:12:29 +0000 Subject: [PATCH 35/71] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5441) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.3 - dotnet-user-secrets - 3.1.0-preview3.19531.3 - dotnet-watch - 3.1.0-preview3.19531.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19531.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.3 - dotnet-dev-certs - 3.1.0-preview3.19531.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.4 - dotnet-user-secrets - 3.1.0-preview3.19531.4 - dotnet-watch - 3.1.0-preview3.19531.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19531.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.4 - dotnet-dev-certs - 3.1.0-preview3.19531.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.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 bf7c4eb46..c2f645554 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx d29d1bf34dea385124d076405ccb66ccfd173a86 - + https://github.com/aspnet/AspNetCore - 0faf33914345956525640464c854cf85da5a6573 + 8acff52cf0e7e06c122bb9d115e2697c1117694f - + https://github.com/aspnet/AspNetCore - 0faf33914345956525640464c854cf85da5a6573 + 8acff52cf0e7e06c122bb9d115e2697c1117694f - + https://github.com/aspnet/AspNetCore - 0faf33914345956525640464c854cf85da5a6573 + 8acff52cf0e7e06c122bb9d115e2697c1117694f - + https://github.com/aspnet/AspNetCore - 0faf33914345956525640464c854cf85da5a6573 + 8acff52cf0e7e06c122bb9d115e2697c1117694f - + https://github.com/aspnet/AspNetCore - 0faf33914345956525640464c854cf85da5a6573 + 8acff52cf0e7e06c122bb9d115e2697c1117694f - + https://github.com/aspnet/AspNetCore - 0faf33914345956525640464c854cf85da5a6573 + 8acff52cf0e7e06c122bb9d115e2697c1117694f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 28601f6f9..d04845a95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19531.1 - 3.1.0-preview3.19531.1 - 3.1.0-preview3.19531.1 - 3.1.0-preview3.19531.1 - 3.1.0-preview3.19531.1 - 3.1.0-preview3.19531.1 + 3.1.0-preview3.19531.4 + 3.1.0-preview3.19531.4 + 3.1.0-preview3.19531.4 + 3.1.0-preview3.19531.4 + 3.1.0-preview3.19531.4 + 3.1.0-preview3.19531.4 From 88626fe316195f13611a8534a479af4463d6ca1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 00:18:02 +0000 Subject: [PATCH 36/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5444) * Update dependencies from https://github.com/dotnet/toolset build 20191031.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.8 * Update dependencies from https://github.com/dotnet/toolset build 20191031.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.11 * Update dependencies from https://github.com/dotnet/toolset build 20191031.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.13 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19531.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191031.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.14 * Update dependencies from https://github.com/dotnet/toolset build 20191031.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19531.15 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19531.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19531.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191031.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19531.16 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19531.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19531.3 (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 c2f645554..efe1d3dbb 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 - 9dc036479b28b44721d0e45e8624d2840a5c7ba1 + f4b0e8e5bc95540a0a75bb4014e42bc121a08838 - + https://github.com/dotnet/sdk - fb710543566de826da30550e45bdbc60deb2cee0 + 9e9f93d44c3a1b911df3e338aa4fb163c87212a8 - + https://github.com/dotnet/cli - 9b71cd890cfa29423ba9737f971d3282a5c2d598 + 656490c52bd21882acd9167c734040dbf0698382 diff --git a/eng/Versions.props b/eng/Versions.props index d04845a95..547eae199 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19531.7 + 3.1.100-preview3.19531.16 @@ -45,14 +45,14 @@ - 3.1.100-preview2.19531.1 + 3.1.100-preview2.19531.3 0.2.0 - 3.1.100-preview2.19530.7 + 3.1.100-preview2.19531.2 $(MicrosoftNETSdkPackageVersion) From 97b68b55e4cc5cdfd335a4da46d4c0469bbd2c02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 02:01:39 +0000 Subject: [PATCH 37/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5446) * Update dependencies from https://github.com/dotnet/toolset build 20191031.18 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19531.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19531.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191031.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19531.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19531.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 efe1d3dbb..2c53f93a5 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 - f4b0e8e5bc95540a0a75bb4014e42bc121a08838 + c1eb090f5cb7e99ff4f5702fc66a08085d09b722 https://github.com/dotnet/sdk 9e9f93d44c3a1b911df3e338aa4fb163c87212a8 - + https://github.com/dotnet/cli - 656490c52bd21882acd9167c734040dbf0698382 + c7aa67cebafb228617d1b6b2c96e52780bbc4c0f diff --git a/eng/Versions.props b/eng/Versions.props index 547eae199..686350898 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19531.16 + 3.1.100-preview3.19531.19 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19531.3 + 3.1.100-preview3.19531.4 0.2.0 From 3fa2a4930fd79a17123e48eaf1fbef9ba0042b25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 05:55:55 +0000 Subject: [PATCH 38/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5451) * Update dependencies from https://github.com/dotnet/toolset build 20191031.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19531.21 * Update dependencies from https://github.com/dotnet/toolset build 20191031.22 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19531.22 --- 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 2c53f93a5..bdbe3b2fd 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 - c1eb090f5cb7e99ff4f5702fc66a08085d09b722 + 65e308d1750156f2d5512b0fef0eed804bb2d304 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 686350898..e91c696a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19531.19 + 3.1.100-preview3.19531.22 From 1d99b6e791ca126d6e75d6ffb0b6617092cdf376 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 06:06:31 +0000 Subject: [PATCH 39/71] Update dependencies from https://github.com/dotnet/core-setup build 20191031.15 (#5452) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19531.15 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19531.15 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19531.15 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19531.15 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19531.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19531.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.15 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview3.19531.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 bdbe3b2fd..0e09cb68b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 62ec98d1d1938dd0286d2a211d6856ee053aab9b - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 62ec98d1d1938dd0286d2a211d6856ee053aab9b - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 62ec98d1d1938dd0286d2a211d6856ee053aab9b - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 62ec98d1d1938dd0286d2a211d6856ee053aab9b - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 62ec98d1d1938dd0286d2a211d6856ee053aab9b - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 62ec98d1d1938dd0286d2a211d6856ee053aab9b - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 62ec98d1d1938dd0286d2a211d6856ee053aab9b @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - d29d1bf34dea385124d076405ccb66ccfd173a86 + 94e453f73a5ff9d5bdd952fbcdbf66db4c178ac3 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index e91c696a1..1a93966df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,17 +57,17 @@ - 3.1.0-preview3.19530.2 + 3.1.0-preview3.19531.8 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.15 + 3.1.0-preview3.19531.15 + 3.1.0-preview3.19531.15 + 3.1.0-preview3.19531.15 + 3.1.0-preview3.19531.15 + 3.1.0-preview3.19531.15 + 3.1.0-preview3.19531.15 2.1.0 From a2b722704e877c33081168a6606cdfe182818d25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 08:42:47 +0000 Subject: [PATCH 40/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5454) * Update dependencies from https://github.com/dotnet/toolset build 20191031.24 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19531.24 * Update dependencies from https://github.com/dotnet/toolset build 20191031.25 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19531.25 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19531.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191101.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview2.19531.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19531.5 (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 0e09cb68b..7c73b54e2 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 - 65e308d1750156f2d5512b0fef0eed804bb2d304 + 300610407bc96a944c7d1c5316063496bdf15756 - + https://github.com/dotnet/sdk - 9e9f93d44c3a1b911df3e338aa4fb163c87212a8 + 61f8ebe1b773d85117bcb64f48abcc8377c830c2 - + https://github.com/dotnet/cli - c7aa67cebafb228617d1b6b2c96e52780bbc4c0f + 0ae7613529d36300fce752f657737f10495bd702 diff --git a/eng/Versions.props b/eng/Versions.props index 1a93966df..c4ef94f8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19531.22 + 3.1.100-preview3.19551.1 @@ -45,14 +45,14 @@ - 3.1.100-preview3.19531.4 + 3.1.100-preview3.19531.5 0.2.0 - 3.1.100-preview2.19531.2 + 3.1.100-preview2.19531.5 $(MicrosoftNETSdkPackageVersion) From 7cd09d917856aa3a3add4be5576a4005e830514a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 10:21:11 +0000 Subject: [PATCH 41/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.2 (#5457) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19551.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 7c73b54e2..4408c746c 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 - 300610407bc96a944c7d1c5316063496bdf15756 + 021fb8cb93fa6fa1ab1264fa33f3ee6ef84a4c35 https://github.com/dotnet/sdk 61f8ebe1b773d85117bcb64f48abcc8377c830c2 - + https://github.com/dotnet/cli - 0ae7613529d36300fce752f657737f10495bd702 + c710920a5ffa5ebf9f19a80a5ab26180132399a3 diff --git a/eng/Versions.props b/eng/Versions.props index c4ef94f8b..55a80af0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.1 + 3.1.100-preview3.19551.2 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19531.5 + 3.1.100-preview3.19551.1 0.2.0 From 5586014dfa016e30481b8b80259ee50736e8d5f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 13:25:41 +0000 Subject: [PATCH 42/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.4 (#5459) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.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 4408c746c..d5f9df1ef 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 - 021fb8cb93fa6fa1ab1264fa33f3ee6ef84a4c35 + 66aff770086b033978f736e49b35cc7c072c7563 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 55a80af0b..8ff4de423 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.2 + 3.1.100-preview3.19551.4 From 07e446259e7cf96d7aede8a7c9fab32d38f35f93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 16:36:57 +0000 Subject: [PATCH 43/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.6 (#5461) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.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 d5f9df1ef..01d3c4181 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 - 66aff770086b033978f736e49b35cc7c072c7563 + 954811f24fffd07574b319de47ca3f29c5b112c9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8ff4de423..41aa84dd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.4 + 3.1.100-preview3.19551.6 From ced31b69bf7c0cd2c6e325cde4f59f70c07189dc Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 1 Nov 2019 09:46:28 -0700 Subject: [PATCH 44/71] Update dockers (#5186) (#5416) - Remove ubuntu 14.04 and groovey file - Remove all old fedora - Update to Debian Stretch - Remove rhel.6 - No debian 9 1.x runtime support --- .vsts-ci.yml | 37 +---- eng/docker/debian/Dockerfile | 18 ++- eng/docker/fedora.23/Dockerfile | 31 ---- eng/docker/fedora.24/Dockerfile | 29 ---- eng/docker/fedora.27/Dockerfile | 33 ---- eng/docker/fedora.28/Dockerfile | 30 ---- eng/docker/rhel.6/Dockerfile | 34 ---- eng/docker/ubuntu.14.04/Dockerfile | 64 -------- netci.groovy | 145 ------------------ src/redist/targets/Badge.targets | 1 - src/redist/targets/GenerateLayout.targets | 1 - .../targets/GetRuntimeInformation.targets | 4 - src/redist/targets/SetBuildDefaults.targets | 3 - test/SdkTests/SdkTests.csproj | 4 + 14 files changed, 22 insertions(+), 412 deletions(-) delete mode 100644 eng/docker/fedora.23/Dockerfile delete mode 100644 eng/docker/fedora.24/Dockerfile delete mode 100644 eng/docker/fedora.27/Dockerfile delete mode 100644 eng/docker/fedora.28/Dockerfile delete mode 100644 eng/docker/rhel.6/Dockerfile delete mode 100644 eng/docker/ubuntu.14.04/Dockerfile delete mode 100644 netci.groovy diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2c754dfa2..4d67be1b5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -88,13 +88,6 @@ stages: strategy: matrix: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_14_04_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.14.04' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Ubuntu_16_04_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker ubuntu.16.04' @@ -109,20 +102,6 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_Fedora_27_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.27' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Fedora_28_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.28' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Fedora_29_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker fedora.29' @@ -137,7 +116,7 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_Debian_Jessie_Debug_x64: + Build_Debian_Stretch_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' _LinuxPortable: '' @@ -151,13 +130,6 @@ 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: '' @@ -208,13 +180,6 @@ 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/debian/Dockerfile b/eng/docker/debian/Dockerfile index 6511762c8..891658239 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,21 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-jessie-debpkg-58e4974-20190328133153 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-d61254f-20190807161114 + +# Install the deb packaging toolchain we need to build debs +RUN apt-get update \ + && apt-get -y install \ + debhelper \ + build-essential \ + devscripts \ + locales \ + && rm -rf /var/lib/apt/lists/* + +# liblldb is needed so deb package build does not throw missing library info errors +RUN apt-get update \ + && apt-get -y install liblldb-3.9 \ + && rm -rf /var/lib/apt/lists/* # Misc Dependencies for build RUN rm -rf /var/lib/apt/lists/* && \ @@ -13,6 +27,8 @@ RUN rm -rf /var/lib/apt/lists/* && \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + +RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0 diff --git a/eng/docker/fedora.23/Dockerfile b/eng/docker/fedora.23/Dockerfile deleted file mode 100644 index 0d156e137..000000000 --- a/eng/docker/fedora.23/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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:fedora23_prereqs - -# Install tools used by the VSO build automation. -RUN dnf install -y findutils && \ - dnf clean all - -# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts. -RUN dnf upgrade -y nss -RUN dnf clean all - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.24/Dockerfile b/eng/docker/fedora.24/Dockerfile deleted file mode 100644 index ff1edb0a0..000000000 --- a/eng/docker/fedora.24/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM fedora:24 - -RUN dnf install -y bash git cmake wget which python clang-3.8.0-1.fc24.x86_64 llvm-devel-3.8.0-1.fc24.x86_64 make libicu-devel lldb-devel.x86_64 \ - libunwind-devel.x86_64 lttng-ust-devel.x86_64 uuid-devel libuuid-devel tar glibc-locale-source zlib-devel libcurl-devel \ - krb5-devel openssl-devel autoconf libtool hostname - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Set a different rid to publish buildtools for, until we update to a version which -# natively supports fedora.24-x64 -ENV __PUBLISH_RID=fedora.23-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.27/Dockerfile b/eng/docker/fedora.27/Dockerfile deleted file mode 100644 index f6eaa8fbd..000000000 --- a/eng/docker/fedora.27/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# -# 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:fedora-27-82a3800-20180326211504 - -RUN dnf install -y findutils - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Set a different rid to publish buildtools for, until we update to a version which -# natively supports fedora.24-x64 -ENV __PUBLISH_RID=fedora.23-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/fedora.28/Dockerfile b/eng/docker/fedora.28/Dockerfile deleted file mode 100644 index 5e08f7a19..000000000 --- a/eng/docker/fedora.28/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# -# 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:fedora-28-c103199-20180628122443 - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Override RID set by the dotnet-buildtools-prereqs docker image -ENV __PUBLISH_RID=fedora.28-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile deleted file mode 100644 index 9e2e572d0..000000000 --- a/eng/docker/rhel.6/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# -# 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/eng/docker/ubuntu.14.04/Dockerfile b/eng/docker/ubuntu.14.04/Dockerfile deleted file mode 100644 index 7e7cb6bdb..000000000 --- a/eng/docker/ubuntu.14.04/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# -# 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 ubuntu:14.04 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update && \ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu52 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 \ - lldb-3.6 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/netci.groovy b/netci.groovy deleted file mode 100644 index e964e99bb..000000000 --- a/netci.groovy +++ /dev/null @@ -1,145 +0,0 @@ -// 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. - -// Import the utility functionality. - -import jobs.generation.ArchivalSettings; -import jobs.generation.Utilities; - -def project = GithubProject -def branch = GithubBranchName -def isPR = true - -def platformList = [ - 'AllLinux:x64:Release', - 'CentOS7.1:x64:Debug', - 'Debian8.2:x64:Debug', - 'fedora.27:x64:Debug', - 'Linux:arm:Debug', - 'Linux:arm64:Debug', - 'Linux-musl:x64:Debug', - 'Linux:x64:Release', - 'Linux_NoSuffix:arm:Release', - 'Linux_NoSuffix:x64:Release', - 'OSX10.12:x64:Release', - 'RHEL6:x64:Debug', - 'RHEL7.2:x64:Release', - 'Ubuntu:x64:Release', - 'Ubuntu16.04:x64:Debug', - 'ubuntu.18.04:x64:Debug', - 'Windows_NT:x64:Release', - 'Windows_NT:x86:Debug', - 'Windows_NT_ES:x64:Debug', - 'Windows_NT_NoSuffix:x64:Release' -] - -def static getBuildJobName(def configuration, def os, def architecture) { - return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() -} - -platformList.each { platform -> - // Calculate names - def (os, architecture, configuration) = platform.tokenize(':') - def osUsedForMachineAffinity = os; - def osVersionUsedForMachineAffinity = 'latest-or-auto'; - - // Calculate job name - def jobName = getBuildJobName(configuration, os, architecture) - def baseBatchBuildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default"; - def baseShellBuildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"; - - // Calculate the build command - if (os.startsWith("Windows_NT")) { - osUsedForMachineAffinity = 'Windows_NT' - buildCommand = "${baseBatchBuildCommand}" - if (os == 'Windows_NT_ES') { - buildCommand = """ -set DOTNET_CLI_UI_LANGUAGE=es -${buildCommand} -""" - } - else if (os == 'Windows_NT_NoSuffix') { - buildCommand = """ -set DropSuffix=true -${buildCommand} -""" - } - } - else if (os == 'Windows_2016') { - buildCommand = "${baseBatchBuildCommand} -RunInstallerTestsInDocker" - } - else if (os.startsWith("Linux")) { - osUsedForMachineAffinity = 'Ubuntu16.04'; - if (os == 'Linux-musl') { - buildCommand = "${baseShellBuildCommand} --runtime-id linux-musl-x64 --docker alpine.3.6" - } - else - { - buildCommand = "${baseShellBuildCommand} --linux-portable" - if ((architecture == 'arm') || (architecture == 'arm64')) { - buildCommand = "${buildCommand} --architecture ${architecture} /p:CLIBUILD_SKIP_TESTS=true" - } - if (os == 'Linux_NoSuffix') { - buildCommand = """ -export DropSuffix=true -${buildCommand} -""" - } - } - } - else if (os == 'Ubuntu') { - buildCommand = "${baseShellBuildCommand} --docker ubuntu.14.04" - } - else if (os == 'RHEL6') { - osUsedForMachineAffinity = 'Ubuntu16.04'; - buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" - } - else if (os == 'ubuntu.18.04' || os == 'fedora.27') { - osUsedForMachineAffinity = 'Ubuntu16.04' - osVersionUsedForMachineAffinity = 'latest-docker' - buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" - } - else if (os == 'AllLinux') { - osUsedForMachineAffinity = 'Ubuntu16.04' - buildCommand = "${baseShellBuildCommand} --skip-prereqs --configuration ${configuration} --targets Default /t:BuildAndPublishAllLinuxDistrosNativeInstallers" - } - else { - buildCommand = "${baseShellBuildCommand}" - } - - def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { - // Set the label. - steps { - if (osUsedForMachineAffinity == 'Windows_NT' || osUsedForMachineAffinity == 'Windows_2016') { - // Batch - batchFile(buildCommand) - } - else { - // Shell - shell(buildCommand) - } - } - } - - Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity) - Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - // ARM and AllLinux CI runs are build only. - if ((architecture != 'arm') && (architecture != 'arm64') && (os != 'AllLinux')) { - Utilities.addMSTestResults(newJob, '**/*.trx') - } - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") - - def archiveSettings = new ArchivalSettings() - archiveSettings.addFiles("test/**/*.trx") - archiveSettings.addFiles("*.binlog") - archiveSettings.setFailIfNothingArchived() - archiveSettings.setArchiveOnFailure() - Utilities.addArchival(newJob, archiveSettings) -} - -// Make the call to generate the help job -Utilities.createHelperJob(this, project, branch, - "Welcome to the ${project} Repository", // This is prepended to the help message - "Have a nice day!") // This is appended to the help message. You might put known issues here. - -Utilities.addCROSSCheck(this, project, branch) diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets index 8e9ccc4ac..f7416fef7 100644 --- a/src/redist/targets/Badge.targets +++ b/src/redist/targets/Badge.targets @@ -19,7 +19,6 @@ $(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 1221f47f2..25713d97e 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -70,7 +70,6 @@ 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 9248c46c8..695a56908 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -26,14 +26,10 @@ $(Rid) $(OSName)-$(Architecture) $(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index b31e5350d..268100720 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -9,16 +9,13 @@ ($(Rid.StartsWith('rhel.6')) OR $(Rid.StartsWith('freebsd')) OR $(Rid.StartsWith('linux-musl')) - OR $(Rid.StartsWith('fedora.27')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false true true diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index d33fe2504..71fccbc63 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,6 +63,10 @@ false + + false + + false From 55549d48ca1b4890f3e6ae15936d37fdf7ffd628 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 1 Nov 2019 09:52:22 -0700 Subject: [PATCH 45/71] Restore comment lost in merge --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index 99ee1ead2..41aa84dd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,6 +35,7 @@ 1.7.0 + 3.1.0-preview3.19531.4 3.1.0-preview3.19531.4 3.1.0-preview3.19531.4 From ae9f3a24b3705a7456d99fb240b9c336dd342c21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 10:15:50 -0700 Subject: [PATCH 46/71] Update dependencies from https://github.com/dotnet/toolset build 20191031.27 (#5453) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19531.27 --- 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 91946aa45..cbfa085b0 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 - 2662a12facb706ecc1155643b2e0e37c5479d71f + c3fb2eec9067143c7b175bbf5d30e60858b22547 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 87bb5eb33..0e9c8b7ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19529.15 + 3.0.101-servicing.19531.27 From 06ec5523957d97e815245521985fce050b78e949 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Nov 2019 11:00:45 -0700 Subject: [PATCH 47/71] Switch to hosted pool to reduce restore difficulties (#5465) The hosted pools have better restore performance owing to the fact that they do not have throttling issues with AzDO. Switch to these temporarily while we resolve the issues --- .vsts-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4d67be1b5..6748aa26d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -32,8 +32,7 @@ stages: agentOs: Windows_NT pool: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2017.open + vmImage: vs2017-win2016 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: name: NetCoreInternal-Pool queue: buildpool.windows.10.amd64.vs2017 From 95fc8b0f02a4092e78acb155f2e434b6ebf6f8ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 18:12:42 +0000 Subject: [PATCH 48/71] Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.7 (#5450) - dotnet-user-secrets - 3.1.0-preview3.19531.7 - dotnet-watch - 3.1.0-preview3.19531.7 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19531.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.7 - dotnet-dev-certs - 3.1.0-preview3.19531.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.7 --- 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 01d3c4181..bda7aaa07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 94e453f73a5ff9d5bdd952fbcdbf66db4c178ac3 - + https://github.com/aspnet/AspNetCore - 8acff52cf0e7e06c122bb9d115e2697c1117694f + e89f2f450263f865f20c2c7b77f4e30daedc7c47 - + https://github.com/aspnet/AspNetCore - 8acff52cf0e7e06c122bb9d115e2697c1117694f + e89f2f450263f865f20c2c7b77f4e30daedc7c47 - + https://github.com/aspnet/AspNetCore - 8acff52cf0e7e06c122bb9d115e2697c1117694f + e89f2f450263f865f20c2c7b77f4e30daedc7c47 - + https://github.com/aspnet/AspNetCore - 8acff52cf0e7e06c122bb9d115e2697c1117694f + e89f2f450263f865f20c2c7b77f4e30daedc7c47 - + https://github.com/aspnet/AspNetCore - 8acff52cf0e7e06c122bb9d115e2697c1117694f + e89f2f450263f865f20c2c7b77f4e30daedc7c47 - + https://github.com/aspnet/AspNetCore - 8acff52cf0e7e06c122bb9d115e2697c1117694f + e89f2f450263f865f20c2c7b77f4e30daedc7c47 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 41aa84dd6..bf19c0e1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19531.4 - 3.1.0-preview3.19531.4 - 3.1.0-preview3.19531.4 - 3.1.0-preview3.19531.4 - 3.1.0-preview3.19531.4 - 3.1.0-preview3.19531.4 + 3.1.0-preview3.19531.7 + 3.1.0-preview3.19531.7 + 3.1.0-preview3.19531.7 + 3.1.0-preview3.19531.7 + 3.1.0-preview3.19531.7 + 3.1.0-preview3.19531.7 From 7dc2470573217df06feff4071db62bf65d16daec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 18:35:13 +0000 Subject: [PATCH 49/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.9 (#5466) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.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 bda7aaa07..95f5aac37 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 - 954811f24fffd07574b319de47ca3f29c5b112c9 + 3ac32cec5d1cc725c05db6c27c42b72ad5f9b658 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index bf19c0e1c..0c9adb74e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.6 + 3.1.100-preview3.19551.9 From ee3fde9db4e050d57144d1051392bb89ece575af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 19:41:10 +0000 Subject: [PATCH 50/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.10 (#5467) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.10 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19551.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 95f5aac37..044975ec4 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 - 3ac32cec5d1cc725c05db6c27c42b72ad5f9b658 + 29b0241ab570e3f85e6add838fc3b42f9ae435c2 - + https://github.com/dotnet/sdk - 61f8ebe1b773d85117bcb64f48abcc8377c830c2 + 0f41b3f4909ea5a1955fccf5a2125ca1a76b69c7 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 0c9adb74e..e20c8a7cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.9 + 3.1.100-preview3.19551.10 @@ -52,7 +52,7 @@ - 3.1.100-preview2.19531.5 + 3.1.100-preview3.19551.2 $(MicrosoftNETSdkPackageVersion) From 517ab3d3322b4a3e162646926bd2c78f8e8ed6d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 22:15:37 +0000 Subject: [PATCH 51/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.13 (#5469) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19551.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 044975ec4..95968e850 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 - 29b0241ab570e3f85e6add838fc3b42f9ae435c2 + cea6d12c2cc413ca2eb615ecb9a400229f82cd2d https://github.com/dotnet/sdk 0f41b3f4909ea5a1955fccf5a2125ca1a76b69c7 - + https://github.com/dotnet/cli - c710920a5ffa5ebf9f19a80a5ab26180132399a3 + cb0c7cb0fd756b4fba19d42aad2f60e8654b09ed diff --git a/eng/Versions.props b/eng/Versions.props index e20c8a7cc..3d28d8047 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.10 + 3.1.100-preview3.19551.13 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19551.1 + 3.1.100-preview3.19551.2 0.2.0 From 99a2235bf21e945687106b26e4c3aaee9815e057 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 23:21:29 +0000 Subject: [PATCH 52/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.14 (#5472) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.14 --- 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 95968e850..0a956e255 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 - cea6d12c2cc413ca2eb615ecb9a400229f82cd2d + 1dde2b9be1d36d52f7ca9a1adacabfafddb051d0 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3d28d8047..0a4ce85f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.13 + 3.1.100-preview3.19551.14 From 1d1def927b65874e0de5e4fa40678211d963ddc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 00:41:08 +0000 Subject: [PATCH 53/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.16 (#5475) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.16 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19551.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 0a956e255..251906ea2 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 - 1dde2b9be1d36d52f7ca9a1adacabfafddb051d0 + 9d29a2de7255954a0ce307afdcbf0ec5f37aa430 - + https://github.com/dotnet/sdk - 0f41b3f4909ea5a1955fccf5a2125ca1a76b69c7 + 6048f06be9dc82e688644debd2bdd66b88473429 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 0a4ce85f5..0b1971935 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.14 + 3.1.100-preview3.19551.16 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19551.2 + 3.1.100-preview3.19551.3 $(MicrosoftNETSdkPackageVersion) From 9bf17bda0de8b7b3104232a91f368be1338e3e92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 03:21:12 +0000 Subject: [PATCH 54/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.18 (#5477) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19551.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 251906ea2..441995200 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 - 9d29a2de7255954a0ce307afdcbf0ec5f37aa430 + d96f954bb590462e91cb793b051d7822a6062e5b https://github.com/dotnet/sdk 6048f06be9dc82e688644debd2bdd66b88473429 - + https://github.com/dotnet/cli - cb0c7cb0fd756b4fba19d42aad2f60e8654b09ed + 8e5841760159acfe4dc527621da3ee178e99a3e8 diff --git a/eng/Versions.props b/eng/Versions.props index 0b1971935..9edbd28b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.16 + 3.1.100-preview3.19551.18 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19551.2 + 3.1.100-preview3.19551.3 0.2.0 From 4a2fc734fbb1c9ee0b99714c256922ae4a1fdc76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 04:20:18 +0000 Subject: [PATCH 55/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.19 (#5479) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.19 --- 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 441995200..3612dc6ac 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 - d96f954bb590462e91cb793b051d7822a6062e5b + f562235997e2a3a324701525deea897172bcacfd https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9edbd28b0..c89d49ac6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.18 + 3.1.100-preview3.19551.19 From e0b361ceaddf8c120bc217ca02ecb717e76d78f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 05:00:58 +0000 Subject: [PATCH 56/71] Update dependencies from https://github.com/dotnet/toolset build 20191101.20 (#5480) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19551.20 --- 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 3612dc6ac..b843fcce9 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 - f562235997e2a3a324701525deea897172bcacfd + 897c9d4a8774beea3ae219043a0763f0ad40b529 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c89d49ac6..b8613cd28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.19 + 3.1.100-preview3.19551.20 From 3c6fd4083e2e6f2ddc88ec376e69bf6d2588ab37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 10:03:29 +0000 Subject: [PATCH 57/71] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5478) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191101.11 - dotnet-user-secrets - 3.1.0-preview3.19551.11 - dotnet-watch - 3.1.0-preview3.19551.11 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19551.11 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19551.11 - dotnet-dev-certs - 3.1.0-preview3.19551.11 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19551.11 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191101.16 - dotnet-user-secrets - 3.1.0-preview3.19551.16 - dotnet-watch - 3.1.0-preview3.19551.16 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19551.16 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19551.16 - dotnet-dev-certs - 3.1.0-preview3.19551.16 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19551.16 --- 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 b843fcce9..b73824be9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 94e453f73a5ff9d5bdd952fbcdbf66db4c178ac3 - + https://github.com/aspnet/AspNetCore - e89f2f450263f865f20c2c7b77f4e30daedc7c47 + 5709cd95b2db28ee2546be7797b913b129d97655 - + https://github.com/aspnet/AspNetCore - e89f2f450263f865f20c2c7b77f4e30daedc7c47 + 5709cd95b2db28ee2546be7797b913b129d97655 - + https://github.com/aspnet/AspNetCore - e89f2f450263f865f20c2c7b77f4e30daedc7c47 + 5709cd95b2db28ee2546be7797b913b129d97655 - + https://github.com/aspnet/AspNetCore - e89f2f450263f865f20c2c7b77f4e30daedc7c47 + 5709cd95b2db28ee2546be7797b913b129d97655 - + https://github.com/aspnet/AspNetCore - e89f2f450263f865f20c2c7b77f4e30daedc7c47 + 5709cd95b2db28ee2546be7797b913b129d97655 - + https://github.com/aspnet/AspNetCore - e89f2f450263f865f20c2c7b77f4e30daedc7c47 + 5709cd95b2db28ee2546be7797b913b129d97655 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b8613cd28..0ef713b58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19531.7 - 3.1.0-preview3.19531.7 - 3.1.0-preview3.19531.7 - 3.1.0-preview3.19531.7 - 3.1.0-preview3.19531.7 - 3.1.0-preview3.19531.7 + 3.1.0-preview3.19551.16 + 3.1.0-preview3.19551.16 + 3.1.0-preview3.19551.16 + 3.1.0-preview3.19551.16 + 3.1.0-preview3.19551.16 + 3.1.0-preview3.19551.16 From 89d8b38f6083aef3b9d0d883f25eab43e2882509 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 10:45:35 +0000 Subject: [PATCH 58/71] Update dependencies from https://github.com/dotnet/toolset build 20191102.1 (#5482) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19552.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 b73824be9..5d3c3992c 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 - 897c9d4a8774beea3ae219043a0763f0ad40b529 + 54d4116cad193e8c3cdc72ce8b845cca3bb59ec8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0ef713b58..42168a029 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19551.20 + 3.1.100-preview3.19552.1 From bb6427c990762f1e6ac668260efe74f3ce7c9b89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 12:50:03 +0000 Subject: [PATCH 59/71] Update dependencies from https://github.com/dotnet/toolset build 20191102.2 (#5483) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19552.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19552.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 5d3c3992c..314d3bcc3 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 - 54d4116cad193e8c3cdc72ce8b845cca3bb59ec8 + 306361b0618f0efa86657270c757b2aadc6511b2 https://github.com/dotnet/sdk 6048f06be9dc82e688644debd2bdd66b88473429 - + https://github.com/dotnet/cli - 8e5841760159acfe4dc527621da3ee178e99a3e8 + d7a85c972b60559ace43c1abaa16fea5cd972df4 diff --git a/eng/Versions.props b/eng/Versions.props index 42168a029..afcfc3894 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19552.1 + 3.1.100-preview3.19552.2 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19551.3 + 3.1.100-preview3.19552.1 0.2.0 From 4d3f3c23fe9882eea6263d7080c1d9cdcbd8562f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 14:25:38 +0000 Subject: [PATCH 60/71] Update dependencies from https://github.com/dotnet/toolset build 20191102.3 (#5485) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19552.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 314d3bcc3..eae61ad53 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 - 306361b0618f0efa86657270c757b2aadc6511b2 + 22b8cb1b95dc0d9afe2beb8589bbc30a4e10e422 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index afcfc3894..075b14326 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19552.2 + 3.1.100-preview3.19552.3 From ac748df415b878058c3787eccae4b996d6ed9d3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 15:41:34 +0000 Subject: [PATCH 61/71] Update dependencies from https://github.com/dotnet/toolset build 20191102.8 (#5487) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19552.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 eae61ad53..f1ac4dd28 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 - 22b8cb1b95dc0d9afe2beb8589bbc30a4e10e422 + a01b89138fe4c61c0c3313fc99ab8110ae2abe69 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 075b14326..b7c04facc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19552.3 + 3.1.100-preview3.19552.8 From baa0d6980881f1151e2b4ead50af45f36048a98e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 18:15:48 -0700 Subject: [PATCH 62/71] Update dependencies from https://github.com/dotnet/core-setup build 20191101.4 (#5471) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19551.4 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19551.4 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19551.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19551.4 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19551.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19551.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19551.4 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview3.19551.2 (parent: Microsoft.NetCore.App.Internal) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19531.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19531.4 (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 f1ac4dd28..c3f8b63e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 62ec98d1d1938dd0286d2a211d6856ee053aab9b + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - 62ec98d1d1938dd0286d2a211d6856ee053aab9b + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - 62ec98d1d1938dd0286d2a211d6856ee053aab9b + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - 62ec98d1d1938dd0286d2a211d6856ee053aab9b + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - 62ec98d1d1938dd0286d2a211d6856ee053aab9b + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - 62ec98d1d1938dd0286d2a211d6856ee053aab9b + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - 62ec98d1d1938dd0286d2a211d6856ee053aab9b + 00491cd463dc0a17996b8ddb24cf9faf390f04fb @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 94e453f73a5ff9d5bdd952fbcdbf66db4c178ac3 + 281e5dab8db6d7e30d1529039143aa4c463b1a65 https://github.com/aspnet/AspNetCore @@ -84,13 +84,13 @@ d7a85c972b60559ace43c1abaa16fea5cd972df4 - + https://github.com/dotnet/winforms - 4378c8fec85e3ad09065870d387a48d11320e95c + 87db52011e8fb53ab15d1a33f3f4e721552b1ef9 - + https://github.com/dotnet/wpf - e1d8b881759b1d1ed5db5e9f455dd76daf937875 + 06ff10a1f3264679371ec5113f8402a6cc4b37e3 diff --git a/eng/Versions.props b/eng/Versions.props index b7c04facc..6dcbbc33c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19529.13 + 4.8.1-preview1.19531.3 - 3.1.0-preview2.19529.8 + 3.1.0-preview2.19531.4 @@ -57,17 +57,17 @@ - 3.1.0-preview3.19531.8 + 3.1.0-preview3.19551.2 - 3.1.0-preview3.19531.15 - 3.1.0-preview3.19531.15 - 3.1.0-preview3.19531.15 - 3.1.0-preview3.19531.15 - 3.1.0-preview3.19531.15 - 3.1.0-preview3.19531.15 - 3.1.0-preview3.19531.15 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 2.1.0 From 8d86a92d03b4b6a2119793aef0fa3dc7020d3ac5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 03:21:07 +0000 Subject: [PATCH 63/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5493) * Update dependencies from https://github.com/dotnet/toolset build 20191102.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19552.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19552.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191102.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19552.11 * Update dependencies from https://github.com/dotnet/toolset build 20191102.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19552.12 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19552.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 c3f8b63e8..119c6bab6 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 - a01b89138fe4c61c0c3313fc99ab8110ae2abe69 + 5295b42b1d29e79b5dae7d8117e8742f9cd7bc76 https://github.com/dotnet/sdk 6048f06be9dc82e688644debd2bdd66b88473429 - + https://github.com/dotnet/cli - d7a85c972b60559ace43c1abaa16fea5cd972df4 + b4281dddd7f7153dda02bbc2a52d8ca970f68b0b diff --git a/eng/Versions.props b/eng/Versions.props index 6dcbbc33c..7a92649b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19552.8 + 3.1.100-preview3.19552.12 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19552.1 + 3.1.100-preview3.19552.3 0.2.0 From 3e9c43ebfa774930b26a7b78d39b4de802f9bfa4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 06:38:58 -0800 Subject: [PATCH 64/71] Update dependencies from https://github.com/dotnet/core-setup build 20191103.2 (#5498) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19553.2 - Microsoft.NETCore.App.Internal - 3.1.0-preview3.19553.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.0-preview3.19553.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview3.19553.2 - Microsoft.WindowsDesktop.App.Ref - 3.1.0-preview3.19553.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19553.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19553.2 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview3.19551.4 (parent: Microsoft.NetCore.App.Internal) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19552.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19553.1 (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 119c6bab6..12c62d959 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 @@ -35,9 +35,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 281e5dab8db6d7e30d1529039143aa4c463b1a65 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 https://github.com/aspnet/AspNetCore @@ -84,13 +84,13 @@ b4281dddd7f7153dda02bbc2a52d8ca970f68b0b - + https://github.com/dotnet/winforms - 87db52011e8fb53ab15d1a33f3f4e721552b1ef9 + 4475da4f210f28bff944084d5b3e96880f1c51f8 - + https://github.com/dotnet/wpf - 06ff10a1f3264679371ec5113f8402a6cc4b37e3 + 3dfee2019cb6e2294cdfed441f1ac0e6026ceff7 diff --git a/eng/Versions.props b/eng/Versions.props index 7a92649b0..d188e5a6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19531.3 + 4.8.1-preview1.19552.1 - 3.1.0-preview2.19531.4 + 3.1.0-preview2.19553.1 @@ -57,17 +57,17 @@ - 3.1.0-preview3.19551.2 + 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 + 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 2.1.0 From c9b79a897c6c93549e8721410dc65c53df0f808a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 15:45:52 +0000 Subject: [PATCH 65/71] Update dependencies from https://github.com/dotnet/toolset build 20191103.3 (#5500) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19553.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 12c62d959..71a3b0635 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 - 5295b42b1d29e79b5dae7d8117e8742f9cd7bc76 + c175912f44306feea826845b92289a90fe9ea8a8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d188e5a6f..d98f21021 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19552.12 + 3.1.100-preview3.19553.3 From 05ca520ac0f2bba603ce9fb13758b61ce738418c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 08:54:53 -0800 Subject: [PATCH 66/71] Update dependencies from https://github.com/dotnet/toolset build 20191103.4 (#5502) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19553.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19553.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 71a3b0635..b38e3d64a 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 - c175912f44306feea826845b92289a90fe9ea8a8 + 5ed515f7256387c9bf68b77b6b6d9b1799f55b86 https://github.com/dotnet/sdk 6048f06be9dc82e688644debd2bdd66b88473429 - + https://github.com/dotnet/cli - b4281dddd7f7153dda02bbc2a52d8ca970f68b0b + 9e189dbee36c823f324795c71a037a6c7363fc26 diff --git a/eng/Versions.props b/eng/Versions.props index d98f21021..75aea8cc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19553.3 + 3.1.100-preview3.19553.4 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19552.3 + 3.1.100-preview3.19553.1 0.2.0 From 4235d30743524dbe9f56526cbac714c1d8f4320f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 10:22:31 -0800 Subject: [PATCH 67/71] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5503) * Update dependencies from https://github.com/dotnet/toolset build 20191103.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19553.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19553.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191103.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19553.6 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview3.19553.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 b38e3d64a..3c633831d 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 - 5ed515f7256387c9bf68b77b6b6d9b1799f55b86 + d029a94939577855cf7612c775ec5159109ed435 - + https://github.com/dotnet/sdk - 6048f06be9dc82e688644debd2bdd66b88473429 + cecb7196560c8b8b732ef9c07494cac7e0745c76 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 75aea8cc4..dfebc9108 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19553.4 + 3.1.100-preview3.19553.6 @@ -52,7 +52,7 @@ - 3.1.100-preview3.19551.3 + 3.1.100-preview3.19553.1 $(MicrosoftNETSdkPackageVersion) From 13a8fb62944651e989cd8ada19cb18c143f44f4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:57:56 -0800 Subject: [PATCH 68/71] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5484) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191102.1 - dotnet-user-secrets - 3.1.0-preview3.19552.1 - dotnet-watch - 3.1.0-preview3.19552.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19552.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19552.1 - dotnet-dev-certs - 3.1.0-preview3.19552.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19552.1 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191102.5 - dotnet-user-secrets - 3.1.0-preview3.19552.5 - dotnet-watch - 3.1.0-preview3.19552.5 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19552.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19552.5 - dotnet-dev-certs - 3.1.0-preview3.19552.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19552.5 --- 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 3c633831d..f071d8070 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 - 5709cd95b2db28ee2546be7797b913b129d97655 + fe164cd7666a2398a7959d31b4c528f3e71c018a - + https://github.com/aspnet/AspNetCore - 5709cd95b2db28ee2546be7797b913b129d97655 + fe164cd7666a2398a7959d31b4c528f3e71c018a - + https://github.com/aspnet/AspNetCore - 5709cd95b2db28ee2546be7797b913b129d97655 + fe164cd7666a2398a7959d31b4c528f3e71c018a - + https://github.com/aspnet/AspNetCore - 5709cd95b2db28ee2546be7797b913b129d97655 + fe164cd7666a2398a7959d31b4c528f3e71c018a - + https://github.com/aspnet/AspNetCore - 5709cd95b2db28ee2546be7797b913b129d97655 + fe164cd7666a2398a7959d31b4c528f3e71c018a - + https://github.com/aspnet/AspNetCore - 5709cd95b2db28ee2546be7797b913b129d97655 + fe164cd7666a2398a7959d31b4c528f3e71c018a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index dfebc9108..ddb64bf40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19551.16 - 3.1.0-preview3.19551.16 - 3.1.0-preview3.19551.16 - 3.1.0-preview3.19551.16 - 3.1.0-preview3.19551.16 - 3.1.0-preview3.19551.16 + 3.1.0-preview3.19552.5 + 3.1.0-preview3.19552.5 + 3.1.0-preview3.19552.5 + 3.1.0-preview3.19552.5 + 3.1.0-preview3.19552.5 + 3.1.0-preview3.19552.5 From 6a44441fe7a2d0d269ec3df655aa641b950a3469 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 23:20:36 +0000 Subject: [PATCH 69/71] Update dependencies from https://github.com/aspnet/AspNetCore build 20191103.2 (#5508) - dotnet-user-secrets - 3.1.0-preview3.19553.2 - dotnet-watch - 3.1.0-preview3.19553.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19553.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19553.2 - dotnet-dev-certs - 3.1.0-preview3.19553.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19553.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 f071d8070..de4291edc 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 - fe164cd7666a2398a7959d31b4c528f3e71c018a + da20a1208694e8ed361a44d1225bd92d1ca1729a - + https://github.com/aspnet/AspNetCore - fe164cd7666a2398a7959d31b4c528f3e71c018a + da20a1208694e8ed361a44d1225bd92d1ca1729a - + https://github.com/aspnet/AspNetCore - fe164cd7666a2398a7959d31b4c528f3e71c018a + da20a1208694e8ed361a44d1225bd92d1ca1729a - + https://github.com/aspnet/AspNetCore - fe164cd7666a2398a7959d31b4c528f3e71c018a + da20a1208694e8ed361a44d1225bd92d1ca1729a - + https://github.com/aspnet/AspNetCore - fe164cd7666a2398a7959d31b4c528f3e71c018a + da20a1208694e8ed361a44d1225bd92d1ca1729a - + https://github.com/aspnet/AspNetCore - fe164cd7666a2398a7959d31b4c528f3e71c018a + da20a1208694e8ed361a44d1225bd92d1ca1729a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ddb64bf40..366975f92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview3.19552.5 - 3.1.0-preview3.19552.5 - 3.1.0-preview3.19552.5 - 3.1.0-preview3.19552.5 - 3.1.0-preview3.19552.5 - 3.1.0-preview3.19552.5 + 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 From e3e15fae8e406d1b13000072e330d4d0852accbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 00:50:37 +0000 Subject: [PATCH 70/71] Update dependencies from https://github.com/dotnet/toolset build 20191103.8 (#5511) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19553.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19553.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 de4291edc..1e4775809 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 - d029a94939577855cf7612c775ec5159109ed435 + 0c4e161dc59c98ea0cfbacac27f388c058ef1743 https://github.com/dotnet/sdk cecb7196560c8b8b732ef9c07494cac7e0745c76 - + https://github.com/dotnet/cli - 9e189dbee36c823f324795c71a037a6c7363fc26 + c143c98eeed7f532cfab1fb7e0104513b7c76743 diff --git a/eng/Versions.props b/eng/Versions.props index 366975f92..6b50ff15e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19553.6 + 3.1.100-preview3.19553.8 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19553.1 + 3.1.100-preview3.19553.2 0.2.0 From e159b98338d61282d21dabfe5e67788dae97b7a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 01:50:35 +0000 Subject: [PATCH 71/71] Update dependencies from https://github.com/dotnet/toolset build 20191103.9 (#5514) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19553.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19553.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 1e4775809..2f4d614d1 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 - 0c4e161dc59c98ea0cfbacac27f388c058ef1743 + 03f891808be9383ab5dc5bb7aee935c331649507 https://github.com/dotnet/sdk cecb7196560c8b8b732ef9c07494cac7e0745c76 - + https://github.com/dotnet/cli - c143c98eeed7f532cfab1fb7e0104513b7c76743 + cef679a0db78024555057298fbcf7ff356427ee0 diff --git a/eng/Versions.props b/eng/Versions.props index 6b50ff15e..faacec199 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview3.19553.8 + 3.1.100-preview3.19553.9 @@ -45,7 +45,7 @@ - 3.1.100-preview3.19553.2 + 3.1.100-preview3.19553.3 0.2.0