From 4671751a3c4219897b256665d44725c192d7c8da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 04:28:46 +0000 Subject: [PATCH 01/22] Update dependencies from https://github.com/dotnet/sdk build 20210209.9 (#9685) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210205-02 to 16.9.0-release-20210209-03 (parent: Microsoft.NET.Sdk) --- 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 0d0853880..12b85b4ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - fef5caa9a0edb1f49453fc59214375010f706e97 + fd407695d5bfd4386286a25130ce8bd2a84b4907 - + https://github.com/dotnet/sdk - fef5caa9a0edb1f49453fc59214375010f706e97 + fd407695d5bfd4386286a25130ce8bd2a84b4907 @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 5f09e3c10bd503134f277c257b635f37a6c0be64 + bae1c7e3de5a7eab8d9264189ec47cd4539866c5 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 4ecbab05b..9533e8796 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21109.7 - 5.0.200-preview.21109.7 + 5.0.200-preview.21109.9 + 5.0.200-preview.21109.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20210205-02 + 16.9.0-release-20210209-03 From 65bcdd5620f638c6cc892fbe06d76fcce2390dc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 11:01:58 +0000 Subject: [PATCH 02/22] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9689) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.200-preview.21062.2 to 5.0.200-preview.21109.7 (parent: Microsoft.NET.Sdk) --- 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 12b85b4ca..7087fc7ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 7a9de3bd9680522874b2081280df3f971673cd87 + ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - fd407695d5bfd4386286a25130ce8bd2a84b4907 + 0177b963bd9251a9ba036354c3180ab21582f73f - + https://github.com/dotnet/sdk - fd407695d5bfd4386286a25130ce8bd2a84b4907 + 0177b963bd9251a9ba036354c3180ab21582f73f diff --git a/eng/Versions.props b/eng/Versions.props index 9533e8796..ee3ef9d92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.200-preview.21062.2 + 5.0.200-preview.21109.7 @@ -55,8 +55,8 @@ - 5.0.200-preview.21109.9 - 5.0.200-preview.21109.9 + 5.0.200-preview.21110.2 + 5.0.200-preview.21110.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b1efb3cb2199f2e4824b031f6371b665a39520e Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 10 Feb 2021 09:10:53 -0800 Subject: [PATCH 03/22] Fixup feeds (#9670) Co-authored-by: Matt Mitchell --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 094adcd60..3abdc9e49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + From 9f55d21d451530d7dce86d255db5fa57f8260211 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 19:03:29 +0000 Subject: [PATCH 04/22] Update dependencies from https://github.com/dotnet/sdk build 20210210.9 (#9695) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 7087fc7ce..56c084ff1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 0177b963bd9251a9ba036354c3180ab21582f73f + e6501a4c0a510055c57877ce22a26f4b9603f606 - + https://github.com/dotnet/sdk - 0177b963bd9251a9ba036354c3180ab21582f73f + e6501a4c0a510055c57877ce22a26f4b9603f606 diff --git a/eng/Versions.props b/eng/Versions.props index ee3ef9d92..fc3b8ee94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21110.2 - 5.0.200-preview.21110.2 + 5.0.200-preview.21110.9 + 5.0.200-preview.21110.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 46fabb5da4e28689d11081591bcda991bcc3a759 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 10 Feb 2021 14:32:35 -0800 Subject: [PATCH 05/22] Update 2.1 & 3.1 aspnetcore template versions (#9679) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fc3b8ee94..7eaf259fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.10 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.10 + 3.1.12 3.2.1 4.8.0-rc2.19462.10 @@ -123,7 +123,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.23 + 2.1.25 From 6f7341bf207c336c771ae751c2b76ac92aca97a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Feb 2021 08:33:14 +0000 Subject: [PATCH 06/22] Update dependencies from https://github.com/dotnet/sdk build 20210210.34 (#9703) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.21104.8 to 3.9.0-5.21111.10 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56c084ff1..cd4e81384 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - e6501a4c0a510055c57877ce22a26f4b9603f606 + ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 - + https://github.com/dotnet/sdk - e6501a4c0a510055c57877ce22a26f4b9603f606 + ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 2fc92d84e746c3aab75f0930278ea6675cd5bb5c + 1c02b891f2693c33bc61ceea2319b52e13e6a521 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 7eaf259fd..be7c93cfe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21110.9 - 5.0.200-preview.21110.9 + 5.0.200-preview.21110.34 + 5.0.200-preview.21110.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48a68472d9ca2e569598d0dae309cdde79264c7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 17:42:31 +0000 Subject: [PATCH 07/22] Update dependencies from https://github.com/dotnet/sdk build 20210212.6 (#9714) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.2-servicing.20613.4 to 5.0.3-servicing.21073.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.2-servicing.20611.20 to 5.0.3-servicing.21072.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.2 to 5.0.3 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.2-servicing.20613.1 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd4e81384..7101d2a62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0f71846fb6ea631ffd2b4f6d3a9974c0897b901 + f8d26ae79a212ae4e64f2fac177a013f4e82307e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0f71846fb6ea631ffd2b4f6d3a9974c0897b901 + f8d26ae79a212ae4e64f2fac177a013f4e82307e https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb @@ -43,9 +43,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/aspnetcore @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 + 7cfa42cb906812d6e514ed96df5624ee18e24637 - + https://github.com/dotnet/sdk - ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 + 7cfa42cb906812d6e514ed96df5624ee18e24637 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1a7d925a270d4eaca6e801de8b88b34b535091de + ea25334307fb11be0b03c56ce767f25faf5259c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 89936f5f8d7ac99e04123f8f48754f252dfd9973 + 3a3d1e582344146190e9815e79cd5c8a29361b3d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index be7c93cfe..d3ec8d588 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.2-servicing.20613.1 + 5.0.3-servicing.21073.2 - 5.0.2-servicing.20613.2 + 5.0.3-servicing.21073.2 @@ -43,41 +43,41 @@ - 5.0.2 + 5.0.3 5.0.0 5.0.0-rtm.20526.5 - 5.0.2-servicing.20613.2 - 5.0.2-servicing.20613.2 - 5.0.2-servicing.20613.2 + 5.0.3-servicing.21073.3 + 5.0.3-servicing.21073.3 + 5.0.3-servicing.21073.3 0.2.0 - 5.0.200-preview.21110.34 - 5.0.200-preview.21110.34 + 5.0.200-preview.21112.6 + 5.0.200-preview.21112.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0 + 5.0.1 - 5.0.2-servicing.20611.20 - 5.0.2 - 5.0.2 + 5.0.3-servicing.21072.12 + 5.0.3 + 5.0.3 5.0.0 - 5.0.2 + 5.0.3 2.1.0 - 5.0.2-servicing.20613.4 - 5.0.2 + 5.0.3-servicing.21073.2 + 5.0.3 5.0.0 5.0.0-rtm.20520.1 From c9ef6841c94016e0694cd215479cac81766b1839 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 21:08:37 +0000 Subject: [PATCH 08/22] Update dependencies from https://github.com/dotnet/sdk build 20210212.11 (#9717) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21111.10 to 3.9.0-5.21112.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7101d2a62..fc91ae857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 7cfa42cb906812d6e514ed96df5624ee18e24637 + 5a4f6d2c97e683b5c51418166e8537e7d781c43b - + https://github.com/dotnet/sdk - 7cfa42cb906812d6e514ed96df5624ee18e24637 + 5a4f6d2c97e683b5c51418166e8537e7d781c43b @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 1c02b891f2693c33bc61ceea2319b52e13e6a521 + f3ff04378c972d435826e6181de364b3c0db8d14 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index d3ec8d588..17d9a49e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.6 - 5.0.200-preview.21112.6 + 5.0.200-preview.21112.11 + 5.0.200-preview.21112.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d190d386bb2541ed51c864ea0080fb8ee3e73f4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 21:50:03 +0000 Subject: [PATCH 09/22] Update dependencies from https://github.com/dotnet/arcade build 20210212.3 (#9720) [release/5.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++-- eng/Versions.props | 2 +- eng/common/internal-feed-operations.ps1 | 2 - eng/common/internal-feed-operations.sh | 2 - eng/common/sdl/init-sdl.ps1 | 13 +------ eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- .../templates/post-build/post-build.yml | 37 +++++++++++++++++-- global.json | 2 +- 9 files changed, 43 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc91ae857..9814bd652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - f73f462f75b5fa21805f0b3c477b11277c5da556 + d8c68c834bcca3f721ad1550404807e301ba7afe - + https://github.com/dotnet/arcade - f73f462f75b5fa21805f0b3c477b11277c5da556 + d8c68c834bcca3f721ad1550404807e301ba7afe https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 17d9a49e2..16fcfef37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21063.3 + 5.0.0-beta.21112.3 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index b8f6529fd..418c09930 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -63,8 +63,6 @@ function SetupCredProvider { } if (($endpoints | Measure-Object).Count -gt 0) { - # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")] - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress # Create the environment variables the AzDo way diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index 9ed225e7e..343054b3a 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -62,8 +62,6 @@ function SetupCredProvider { endpoints+=']' if [ ${#endpoints} -gt 2 ]; then - # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")] - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index a68bf0b88..bb6a42971 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -29,18 +29,7 @@ $zipFile = "$WorkingDirectory/gdn.zip" Add-Type -AssemblyName System.IO.Compression.FileSystem $gdnFolder = (Join-Path $WorkingDirectory '.gdn') -try { - # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead - Write-Host 'Downloading gdn folder from internal config repostiory...' - Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile - if (Test-Path $gdnFolder) { - # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case) - Remove-Item -Force -Recurse $gdnFolder - } - [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory) - Write-Host $gdnFolder - ExitWithExitCode 0 -} catch [System.Net.WebException] { } # Catch and ignore webexception + try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository Write-Host 'Initializing Guardian...' diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 968b39bef..3bd8b29eb 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index c64c4f568..53c100222 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -83,7 +83,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 + -GuardianPackageName Microsoft.Guardian.Cli.0.53.3 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 761fb1a29..1b0af40d5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -65,7 +65,9 @@ parameters: VS167ChannelId: 1011 VS168ChannelId: 1154 VSMasterChannelId: 1012 - + VS169ChannelId: 1473 + VS1610ChannelId: 1692 + stages: - ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate @@ -94,8 +96,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}} - job: displayName: NuGet Validation dependsOn: setupMaestroVars @@ -608,3 +609,33 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_16_9_Publishing' + channelName: 'VS 16.9' + channelId: ${{ parameters.VS169ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_16_10_Publishing' + channelName: 'VS 16.10' + channelId: ${{ parameters.VS1610ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index 1a93f9a81..2d311e487 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3" } } From b16002eb8878cfdc405fe5c14d1adb1880df7995 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Feb 2021 01:07:47 +0000 Subject: [PATCH 10/22] Update dependencies from https://github.com/dotnet/sdk build 20210212.21 (#9722) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 9814bd652..97e191199 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 5a4f6d2c97e683b5c51418166e8537e7d781c43b + b3eda42b76cc7e491d154e1a1514431bbd0e2839 - + https://github.com/dotnet/sdk - 5a4f6d2c97e683b5c51418166e8537e7d781c43b + b3eda42b76cc7e491d154e1a1514431bbd0e2839 diff --git a/eng/Versions.props b/eng/Versions.props index 16fcfef37..4cb2b4329 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.11 - 5.0.200-preview.21112.11 + 5.0.200-preview.21112.21 + 5.0.200-preview.21112.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2157b6d16f28d45604ca6a747a07957d343f78eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Feb 2021 01:53:48 +0000 Subject: [PATCH 11/22] Update dependencies from https://github.com/dotnet/sdk build 20210212.23 (#9723) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21112.8 to 3.9.0-5.21112.20 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97e191199..54d3d74e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - b3eda42b76cc7e491d154e1a1514431bbd0e2839 + 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 - + https://github.com/dotnet/sdk - b3eda42b76cc7e491d154e1a1514431bbd0e2839 + 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - f3ff04378c972d435826e6181de364b3c0db8d14 + 9178f0d178266e004ceb4da029e9f21bc431fe31 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4cb2b4329..c1d476a39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.21 - 5.0.200-preview.21112.21 + 5.0.200-preview.21112.23 + 5.0.200-preview.21112.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98a9b7f4ee7010483fb5fe879d452f5e0adb8db7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:08:06 +0000 Subject: [PATCH 12/22] Update dependencies from https://github.com/dotnet/sdk build 20210215.11 (#9732) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.9.0 to 16.9.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3abdc9e49..ed61ab0c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54d3d74e2..523bd2b9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 + b513c17d738d8fe4452ae5f06879d6c8c00441db - + https://github.com/dotnet/sdk - 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 + b513c17d738d8fe4452ae5f06879d6c8c00441db @@ -123,7 +123,7 @@ https://github.com/dotnet/msbuild - 663c136fcd9b4015abba52e9a99890d005adfa0e + 57a23d249aafe6409b3e24836a486f769cb74c2c https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index c1d476a39..d1636a7a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.23 - 5.0.200-preview.21112.23 + 5.0.200-preview.21115.11 + 5.0.200-preview.21115.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ceb2977a744ed9d573a19dc8a667226563ae1897 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Feb 2021 10:27:40 +0000 Subject: [PATCH 13/22] Update dependencies from https://github.com/dotnet/sdk build 20210216.2 (#9733) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.9.0-rc.7097 to 5.9.0-rc.7121 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 523bd2b9b..0cdd545b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - b513c17d738d8fe4452ae5f06879d6c8c00441db + 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d - + https://github.com/dotnet/sdk - b513c17d738d8fe4452ae5f06879d6c8c00441db + 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 57a23d249aafe6409b3e24836a486f769cb74c2c - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - ed9af679b4425c1ff4d41d2302d73f6e580a2839 + 5596ad8221369990f634a3d01f8c334e0ccb2b3d https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index d1636a7a1..333d6403e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21115.11 - 5.0.200-preview.21115.11 + 5.0.200-preview.21116.2 + 5.0.200-preview.21116.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 533a174fe07a39d06c56b4bce62701ab0265e490 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Tue, 16 Feb 2021 09:22:48 -0800 Subject: [PATCH 14/22] Duplicate productVersion.txt with repo-specific name (#9666) (#9709) In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links. --- eng/Publishing.props | 3 +++ src/redist/targets/GenerateBundledVersions.targets | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/eng/Publishing.props b/eng/Publishing.props index e34b66cc2..4ef1c204b 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -76,6 +76,8 @@ + @@ -86,6 +88,7 @@ + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 18fc1ea27..31e587227 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -8,6 +8,12 @@ Lines="$(PackageVersion)" Overwrite="true" Encoding="ASCII" /> + + Date: Tue, 16 Feb 2021 14:12:36 -0800 Subject: [PATCH 15/22] Update branding to servicing --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 333d6403e..d8c8e7979 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From ac4b7d95d97be6a5656a96a10511ac99b48546d0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 16 Dec 2020 11:01:44 -0800 Subject: [PATCH 16/22] Automatically calculate the implicit version number based on the current version. This will need to be updated any time 2.1 or 3.1 don't ship. --- .../targets/GenerateBundledVersions.targets | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 31e587227..de45cc97b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -23,12 +23,16 @@ + + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 12)) + + Microsoft.NETCoreSdk.BundledVersions.props - - + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion) <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) @@ -37,20 +41,20 @@ <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_NETCoreApp31RuntimePackVersion>3.1.9 + <_NETCoreApp31RuntimePackVersion>3.1.$(VersionFeature31) <_NETCoreApp31TargetingPackVersion>3.1.0 <_WindowsDesktop30RuntimePackVersion>3.0.3 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_WindowsDesktop31RuntimePackVersion>3.1.9 + <_WindowsDesktop31RuntimePackVersion>3.1.$(VersionFeature31) <_WindowsDesktop31TargetingPackVersion>3.1.0 <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 - <_AspNet31RuntimePackVersion>3.1.10 - <_AspNet31TargetingPackVersion>3.1.10 + <_AspNet31RuntimePackVersion>3.1.$(VersionFeature31) + <_AspNet31TargetingPackVersion>3.1.$(VersionFeature31) <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) @@ -154,7 +158,7 @@ + LatestVersion="2.1.$(VersionFeature21)" /> + LatestVersion="2.1.$(VersionFeature21)"/> + LatestVersion="2.1.$(VersionFeature21)"/> Date: Wed, 17 Feb 2021 08:33:38 +0000 Subject: [PATCH 17/22] Update dependencies from https://github.com/dotnet/sdk build 20210216.9 (#9734) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210209-03 to 16.9.0-release-20210216-04 (parent: Microsoft.NET.Sdk) --- 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 0cdd545b5..82b179633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d + 14e0e93285da96070e2f1acc5fb7768fbc21783d - + https://github.com/dotnet/sdk - 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d + 14e0e93285da96070e2f1acc5fb7768fbc21783d @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - bae1c7e3de5a7eab8d9264189ec47cd4539866c5 + 27786c21f7f586214b5721d2aa6380e69079b072 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 333d6403e..553b98fc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21116.2 - 5.0.200-preview.21116.2 + 5.0.200-preview.21116.9 + 5.0.200-preview.21116.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20210209-03 + 16.9.0-release-20210216-04 From ad7e175e66b0694aee23a29bab842f82cda4e785 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 17 Feb 2021 09:12:52 -0800 Subject: [PATCH 18/22] aspnet targeting pack does not move every release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index de45cc97b..2328c7bc0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -54,7 +54,7 @@ <_AspNet30TargetingPackVersion>3.0.1 <_AspNet31RuntimePackVersion>3.1.$(VersionFeature31) - <_AspNet31TargetingPackVersion>3.1.$(VersionFeature31) + <_AspNet31TargetingPackVersion>3.1.10 <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) From 808d111fd21916c3b4a89296465b7383eedaee58 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 17 Feb 2021 14:31:27 -0800 Subject: [PATCH 19/22] Update Windows SDK projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index f41f4965e..e89f3da42 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.13 - 10.0.18362.13 - 10.0.19041.13 + 10.0.17763.14 + 10.0.18362.14 + 10.0.19041.14 From e146fe631ae2238b45d3e43c7cc83af21fa59505 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Feb 2021 23:34:30 +0000 Subject: [PATCH 20/22] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9737) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21112.20 to 3.9.0-5.21116.10 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82b179633..b08f9d133 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 14e0e93285da96070e2f1acc5fb7768fbc21783d + 4ead43bc3c528ab046655a6466c4ef824af02f8c - + https://github.com/dotnet/sdk - 14e0e93285da96070e2f1acc5fb7768fbc21783d + 4ead43bc3c528ab046655a6466c4ef824af02f8c @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 9178f0d178266e004ceb4da029e9f21bc431fe31 + 7a63d79b60ffb33e919bee8056816f8f449d00ce https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index f28ffd018..04bdbe56c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21116.9 - 5.0.200-preview.21116.9 + 5.0.200-preview.21116.22 + 5.0.200-preview.21116.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5767330bf6b19adf190f438e64fffa322443711b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 03:53:36 +0000 Subject: [PATCH 21/22] Update dependencies from https://github.com/dotnet/sdk build 20210217.28 (#9742) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21116.10 to 3.9.0-5.21117.36 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b08f9d133..46a788ddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 4ead43bc3c528ab046655a6466c4ef824af02f8c + ffd9511f95878b0f22ef50f2b2858a007651a6f2 - + https://github.com/dotnet/sdk - 4ead43bc3c528ab046655a6466c4ef824af02f8c + ffd9511f95878b0f22ef50f2b2858a007651a6f2 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 7a63d79b60ffb33e919bee8056816f8f449d00ce + 27b636fe5edc14e8b4199ea5464b8879529615bf https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 04bdbe56c..d3bc92368 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21116.22 - 5.0.200-preview.21116.22 + 5.0.200-servicing.21117.28 + 5.0.200-servicing.21117.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a7f1714438e27681266bb7b3c2796ad78d62ec8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 05:03:16 +0000 Subject: [PATCH 22/22] Update dependencies from https://github.com/dotnet/sdk build 20210217.30 (#9743) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 46a788ddf..699153aee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - ffd9511f95878b0f22ef50f2b2858a007651a6f2 + 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 - + https://github.com/dotnet/sdk - ffd9511f95878b0f22ef50f2b2858a007651a6f2 + 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 diff --git a/eng/Versions.props b/eng/Versions.props index d3bc92368..f15f8914c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21117.28 - 5.0.200-servicing.21117.28 + 5.0.200-servicing.21117.30 + 5.0.200-servicing.21117.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)