From 9b88532e51cf62a4613b1d118a62d4bb5e8148b0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 17 Aug 2021 16:16:54 -0700 Subject: [PATCH 01/22] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e65a1ce31..dea132111 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rc - 1 + 2 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 3fa2b28d9ffdc676cd189502a5e548190d38451c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 22:30:37 +0000 Subject: [PATCH 02/22] Update dependencies from https://github.com/dotnet/sdk build 20210818.28 (#11576) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.1.21416.10 to 6.0.0-rc.1.21418.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.1.21416.10 to 6.0.0-rc.1.21418.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.1.21417.2 to 6.0.100-rc.2.21417.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.1.21416.10 to 6.0.0-rc.1.21418.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.1.21416.2 to 6.0.0-rc.2.21417.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.1.21416.10 to 6.0.0-rc.1.21418.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.1.21416.16 to 6.0.0-rc.1.21418.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210817-01 to 17.0.0-preview-20210817-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21416-02 to 17.0.0-preview-21418-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2854723a..d1a507109 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 03cad95cdb01dfcf9bf4e51afc8b4cad30baefde + 63656d080a6e8c397041e6806caaa97851b34d1e - + https://github.com/dotnet/windowsdesktop - 03cad95cdb01dfcf9bf4e51afc8b4cad30baefde + 63656d080a6e8c397041e6806caaa97851b34d1e - + https://github.com/dotnet/windowsdesktop - 03cad95cdb01dfcf9bf4e51afc8b4cad30baefde + 63656d080a6e8c397041e6806caaa97851b34d1e - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 5a5d7f0518b564e7f840c6c939bb6618c778b21b @@ -39,34 +39,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/aspnetcore - 02f537463dbdce00dfed82bbf953bad01d53ad42 + 66ceea4fc6ccbd710c5b77782761f92557a08be6 - + https://github.com/dotnet/aspnetcore - 02f537463dbdce00dfed82bbf953bad01d53ad42 + 66ceea4fc6ccbd710c5b77782761f92557a08be6 - + https://github.com/dotnet/aspnetcore - 02f537463dbdce00dfed82bbf953bad01d53ad42 + 66ceea4fc6ccbd710c5b77782761f92557a08be6 - + https://github.com/dotnet/aspnetcore - 02f537463dbdce00dfed82bbf953bad01d53ad42 + 66ceea4fc6ccbd710c5b77782761f92557a08be6 - + https://github.com/dotnet/aspnetcore - 02f537463dbdce00dfed82bbf953bad01d53ad42 + 66ceea4fc6ccbd710c5b77782761f92557a08be6 - + https://github.com/dotnet/aspnetcore - 02f537463dbdce00dfed82bbf953bad01d53ad42 + 66ceea4fc6ccbd710c5b77782761f92557a08be6 https://github.com/dotnet/test-templates @@ -81,28 +81,28 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - 2f73c3677bdaa9dcfcecf7c417cfd76f0ac94f45 + ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - fe9022ab971593bf1df73e86faa69e4a0a5fae6c + 6ff78b31906fce1121eac224f80096b0f9711892 - + https://github.com/dotnet/sdk - fe9022ab971593bf1df73e86faa69e4a0a5fae6c + 6ff78b31906fce1121eac224f80096b0f9711892 - + https://github.com/dotnet/winforms - 0b0fb72df7dd54ae0e155c0d9fc61c41181b7c1d + 871fda6a779a7ff12049914c4df3b6271a71d62e - + https://github.com/dotnet/wpf - e75a31c427875dce964eb7ce7414e543ee31bf6c + 16dfdcf877f729d65d54049db4d50aa447510a9b https://github.com/dotnet/fsharp @@ -113,9 +113,9 @@ 767a4e86cf817685256214483da09b01100879c5 - + https://github.com/microsoft/vstest - dca5df07721799727eea49790dd2e00d6744a062 + e79909063ddfc9d8fd4959e072b2dcf5e8d9d3c1 https://github.com/mono/linker @@ -128,9 +128,9 @@ d3c561af0682fd0182b5897fb4f4d95a16da95c3 - + https://github.com/dotnet/msbuild - cb314448332a1ad684bb47152ef87c50d056db5e + 46d8f9b0bbda55fd6e72a5bdfcbd7dbf0b420839 diff --git a/eng/Versions.props b/eng/Versions.props index dea132111..6379bab90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,15 +24,15 @@ - 6.0.0-rc.1.21416.2 + 6.0.0-rc.2.21417.12 - 6.0.0-rc.1.21416.16 + 6.0.0-rc.1.21418.3 - 6.0.100-rc.1.21417.2 + 6.0.100-rc.2.21417.7 @@ -45,42 +45,42 @@ - 6.0.0-rc.1.21417.2 - 6.0.0-rc.1.21417.2 - 6.0.0-rc.1.21417.2 - 6.0.0-rc.1.21417.2 - 6.0.0-rc.1.21417.2 - 6.0.0-rc.1.21417.2 + 6.0.0-rc.1.21417.8 + 6.0.0-rc.1.21417.8 + 6.0.0-rc.1.21417.8 + 6.0.0-rc.1.21417.8 + 6.0.0-rc.1.21417.8 + 6.0.0-rc.1.21417.8 0.2.0 - 6.0.100-rc.1.21417.14 - 6.0.100-rc.1.21417.14 + 6.0.100-rc.2.21418.28 + 6.0.100-rc.2.21418.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.1.21417.1 + 6.0.0-rc.2.21417.16 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 + 6.0.0-rc.2.21417.16 + 6.0.0-rc.2.21417.16 + 6.0.0-rc.2.21417.16 + 6.0.0-rc.2.21417.16 + 6.0.0-rc.2.21417.16 2.1.0 - 6.0.0-rc.1.21416.10 - 6.0.0-rc.1.21416.10 - 6.0.0-rc.1.21416.10 + 6.0.0-rc.1.21418.2 + 6.0.0-rc.1.21418.2 + 6.0.0-rc.1.21418.2 @@ -149,7 +149,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-preview-20210817-01 + 17.0.0-preview-20210817-02 From 7775f51a076214c002080d1ecdb5fa7c01b4688b Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 18 Aug 2021 15:39:36 -0700 Subject: [PATCH 03/22] Add IncludedWorkloadManifest.txt --- src/redist/targets/GenerateLayout.targets | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index e76b3ba1f..32638b670 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -440,6 +440,15 @@ Overwrite="true" /> + + + + + + + @@ -504,6 +513,7 @@ LayoutBundledComponents; GenerateFullNuGetVersion; GenerateVersionFile; + CopyIncludedWorkloadManifestFile; GenerateBundledVersions; LayoutRuntimeGraph; LayoutTemplates; From 8800c3faa3faa0451682b8c95aeb7b9df711a1f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 00:27:31 +0000 Subject: [PATCH 04/22] Update dependencies from https://github.com/dotnet/sdk build 20210818.35 (#11578) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21416.1 to 12.0.0-beta.21418.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 5.0.3-beta.21416.1 to 5.0.3-beta.21418.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1a507109..f588c63b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 6ff78b31906fce1121eac224f80096b0f9711892 + 3599714d98a812cfcdaffc535a1ae121ff8670bc - + https://github.com/dotnet/sdk - 6ff78b31906fce1121eac224f80096b0f9711892 + 3599714d98a812cfcdaffc535a1ae121ff8670bc @@ -104,13 +104,13 @@ https://github.com/dotnet/wpf 16dfdcf877f729d65d54049db4d50aa447510a9b - + https://github.com/dotnet/fsharp - 767a4e86cf817685256214483da09b01100879c5 + f6a27e03a99b11ccaa0e6adfec5e036886067d10 - + https://github.com/dotnet/fsharp - 767a4e86cf817685256214483da09b01100879c5 + f6a27e03a99b11ccaa0e6adfec5e036886067d10 diff --git a/eng/Versions.props b/eng/Versions.props index 6379bab90..683af1a13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21418.28 - 6.0.100-rc.2.21418.28 + 6.0.100-rc.2.21418.35 + 6.0.100-rc.2.21418.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 276faaebc1995ab900e3cb2246e5e61cde345136 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 01:08:09 +0000 Subject: [PATCH 05/22] Update dependencies from https://github.com/dotnet/sdk build 20210818.39 (#11580) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.1.21418.2 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.1.21418.2 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.1.21418.2 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21417.12 to 6.0.0-rc.2.21418.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.1.21418.2 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.1.21418.3 to 6.0.0-rc.2.21418.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 f588c63b0..b402e5794 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 63656d080a6e8c397041e6806caaa97851b34d1e + c82c60e98062903d48b6e165de6bb26ece9acf41 - + https://github.com/dotnet/windowsdesktop - 63656d080a6e8c397041e6806caaa97851b34d1e + c82c60e98062903d48b6e165de6bb26ece9acf41 - + https://github.com/dotnet/windowsdesktop - 63656d080a6e8c397041e6806caaa97851b34d1e + c82c60e98062903d48b6e165de6bb26ece9acf41 https://github.com/dotnet/runtime @@ -86,23 +86,23 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 3599714d98a812cfcdaffc535a1ae121ff8670bc + b2dadbeca3c21c09c1a36fb5cdaac06ccf250845 - + https://github.com/dotnet/sdk - 3599714d98a812cfcdaffc535a1ae121ff8670bc + b2dadbeca3c21c09c1a36fb5cdaac06ccf250845 - + https://github.com/dotnet/winforms - 871fda6a779a7ff12049914c4df3b6271a71d62e + 55ac4dd054482c13a45bac2983d7049e30dba18e - + https://github.com/dotnet/wpf - 16dfdcf877f729d65d54049db4d50aa447510a9b + dc020cceb4eefa2542533e38ceeee16e055417b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 683af1a13..1436ef6a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-rc.2.21417.12 + 6.0.0-rc.2.21418.1 - 6.0.0-rc.1.21418.3 + 6.0.0-rc.2.21418.12 @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21418.35 - 6.0.100-rc.2.21418.35 + 6.0.100-rc.2.21418.39 + 6.0.100-rc.2.21418.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-rc.1.21418.2 - 6.0.0-rc.1.21418.2 - 6.0.0-rc.1.21418.2 + 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21418.11 From 8005e886818f9e5f417c62005d9679c8d85d448b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 01:56:50 +0000 Subject: [PATCH 06/22] Update dependencies from https://github.com/dotnet/sdk build 20210818.43 (#11583) [release/6.0.1xx] 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 b402e5794..3f374cf6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - b2dadbeca3c21c09c1a36fb5cdaac06ccf250845 + 1107eb1ce453a7390ca5e40325b440072867b87a - + https://github.com/dotnet/sdk - b2dadbeca3c21c09c1a36fb5cdaac06ccf250845 + 1107eb1ce453a7390ca5e40325b440072867b87a diff --git a/eng/Versions.props b/eng/Versions.props index 1436ef6a2..fca3231ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21418.39 - 6.0.100-rc.2.21418.39 + 6.0.100-rc.2.21418.43 + 6.0.100-rc.2.21418.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7446fa78fe70cdbfcff30c3e6bbabbee80e358b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 02:50:04 +0000 Subject: [PATCH 07/22] Update dependencies from https://github.com/dotnet/sdk build 20210818.49 (#11586) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.1.21417.8 to 6.0.0-rc.2.21418.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.1.21417.8 to 6.0.0-rc.2.21418.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21417.8 to 6.0.0-rc.2.21418.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21417.8 to 6.0.0-rc.2.21418.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.1.21417.8 to 6.0.0-rc.2.21418.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.1.21417.8 to 6.0.0-rc.2.21418.6 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21416.1 to 6.0.100-preview.6.21418.3 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21416.10 to 4.0.0-4.21418.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f374cf6c..3d4eeeacf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,30 +43,30 @@ https://github.com/dotnet/runtime 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/aspnetcore - 66ceea4fc6ccbd710c5b77782761f92557a08be6 + dfb1901a6a89b195f636d6c31b00d0ea397d6354 - + https://github.com/dotnet/aspnetcore - 66ceea4fc6ccbd710c5b77782761f92557a08be6 + dfb1901a6a89b195f636d6c31b00d0ea397d6354 - + https://github.com/dotnet/aspnetcore - 66ceea4fc6ccbd710c5b77782761f92557a08be6 + dfb1901a6a89b195f636d6c31b00d0ea397d6354 - + https://github.com/dotnet/aspnetcore - 66ceea4fc6ccbd710c5b77782761f92557a08be6 + dfb1901a6a89b195f636d6c31b00d0ea397d6354 - + https://github.com/dotnet/aspnetcore - 66ceea4fc6ccbd710c5b77782761f92557a08be6 + dfb1901a6a89b195f636d6c31b00d0ea397d6354 - + https://github.com/dotnet/aspnetcore - 66ceea4fc6ccbd710c5b77782761f92557a08be6 + dfb1901a6a89b195f636d6c31b00d0ea397d6354 https://github.com/dotnet/test-templates @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 1107eb1ce453a7390ca5e40325b440072867b87a + 9f158f3c4e752f8cd5aaa71e31da68ce50c0c495 - + https://github.com/dotnet/sdk - 1107eb1ce453a7390ca5e40325b440072867b87a + 9f158f3c4e752f8cd5aaa71e31da68ce50c0c495 @@ -117,15 +117,15 @@ https://github.com/microsoft/vstest e79909063ddfc9d8fd4959e072b2dcf5e8d9d3c1 - + https://github.com/mono/linker 5b2391c2c56af47350a5789375e8dbddc692e67f linker - + https://github.com/dotnet/roslyn - d3c561af0682fd0182b5897fb4f4d95a16da95c3 + ec4452b89959159c8ba196e56a0d57de8414bdcb diff --git a/eng/Versions.props b/eng/Versions.props index fca3231ae..1b26a7ab9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-rc.1.21417.8 - 6.0.0-rc.1.21417.8 - 6.0.0-rc.1.21417.8 - 6.0.0-rc.1.21417.8 - 6.0.0-rc.1.21417.8 - 6.0.0-rc.1.21417.8 + 6.0.0-rc.2.21418.6 + 6.0.0-rc.2.21418.6 + 6.0.0-rc.2.21418.6 + 6.0.0-rc.2.21418.6 + 6.0.0-rc.2.21418.6 + 6.0.0-rc.2.21418.6 0.2.0 - 6.0.100-rc.2.21418.43 - 6.0.100-rc.2.21418.43 + 6.0.100-rc.2.21418.49 + 6.0.100-rc.2.21418.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b308548236f7a701260ba28477b7dae2dd599623 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 03:55:50 +0000 Subject: [PATCH 08/22] Update dependencies from https://github.com/dotnet/sdk build 20210818.56 (#11589) [release/6.0.1xx] 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 3d4eeeacf..ae9f2c268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 9f158f3c4e752f8cd5aaa71e31da68ce50c0c495 + 79d6cb3335df6b74d980a248923b96e051241a1f - + https://github.com/dotnet/sdk - 9f158f3c4e752f8cd5aaa71e31da68ce50c0c495 + 79d6cb3335df6b74d980a248923b96e051241a1f diff --git a/eng/Versions.props b/eng/Versions.props index 1b26a7ab9..74cf87a43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21418.49 - 6.0.100-rc.2.21418.49 + 6.0.100-rc.2.21418.56 + 6.0.100-rc.2.21418.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c2d8ef2b3e254260f7c703d8d35d2f2c5b43d97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 04:56:36 +0000 Subject: [PATCH 09/22] Update dependencies from https://github.com/dotnet/sdk build 20210818.59 (#11590) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21418.6 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21418.6 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21418.6 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21418.6 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21418.6 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21418.6 to 6.0.0-rc.2.21418.11 (parent: Microsoft.NET.Sdk) --- 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 ae9f2c268..7f0c647cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,30 +43,30 @@ https://github.com/dotnet/runtime 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/aspnetcore - dfb1901a6a89b195f636d6c31b00d0ea397d6354 + b3c9a2956735b5171981d9b4f0a8de74951d7120 - + https://github.com/dotnet/aspnetcore - dfb1901a6a89b195f636d6c31b00d0ea397d6354 + b3c9a2956735b5171981d9b4f0a8de74951d7120 - + https://github.com/dotnet/aspnetcore - dfb1901a6a89b195f636d6c31b00d0ea397d6354 + b3c9a2956735b5171981d9b4f0a8de74951d7120 - + https://github.com/dotnet/aspnetcore - dfb1901a6a89b195f636d6c31b00d0ea397d6354 + b3c9a2956735b5171981d9b4f0a8de74951d7120 - + https://github.com/dotnet/aspnetcore - dfb1901a6a89b195f636d6c31b00d0ea397d6354 + b3c9a2956735b5171981d9b4f0a8de74951d7120 - + https://github.com/dotnet/aspnetcore - dfb1901a6a89b195f636d6c31b00d0ea397d6354 + b3c9a2956735b5171981d9b4f0a8de74951d7120 https://github.com/dotnet/test-templates @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 79d6cb3335df6b74d980a248923b96e051241a1f + 8164dbcb396b99e1bd267e4f57a9bff0dc247cca - + https://github.com/dotnet/sdk - 79d6cb3335df6b74d980a248923b96e051241a1f + 8164dbcb396b99e1bd267e4f57a9bff0dc247cca diff --git a/eng/Versions.props b/eng/Versions.props index 74cf87a43..e9d6ab09b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-rc.2.21418.6 - 6.0.0-rc.2.21418.6 - 6.0.0-rc.2.21418.6 - 6.0.0-rc.2.21418.6 - 6.0.0-rc.2.21418.6 - 6.0.0-rc.2.21418.6 + 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21418.11 0.2.0 - 6.0.100-rc.2.21418.56 - 6.0.100-rc.2.21418.56 + 6.0.100-rc.2.21418.59 + 6.0.100-rc.2.21418.59 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6fda72c23f061f1f7c7e62fabd9165c8cb712888 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 18:23:24 +0000 Subject: [PATCH 10/22] Update dependencies from https://github.com/dotnet/arcade build 20210818.12 (#11598) [release/6.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21309-01 to 1.1.0-beta-21417-01 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21412.1 to 1.0.0-beta.21417.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 20 +++++++++--------- eng/Versions.props | 2 +- eng/common/build.sh | 1 + .../post-build/sourcelink-validation.ps1 | 17 ++++++++++----- eng/common/sdk-task.ps1 | 1 + .../templates/job/source-index-stage1.yml | 21 +++++++------------ eng/common/tools.ps1 | 21 +++++++++++++++++++ eng/common/tools.sh | 7 +++++++ global.json | 4 ++-- 9 files changed, 63 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f0c647cf..a13dfbe41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -157,32 +157,32 @@ - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink - 4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc + eb501912e5ffca67618ed2c9b72b8555a919ee1d - + https://github.com/dotnet/xliff-tasks - e75ee06448aa07fa02853aac97a6cc4bff387ecb + 956a13308e5bc4b812fce23e7fec796b25630ac8 diff --git a/eng/Versions.props b/eng/Versions.props index e9d6ab09b..402064ca1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21413.4 + 6.0.0-beta.21418.12 diff --git a/eng/common/build.sh b/eng/common/build.sh index 55b298f16..9d3042a94 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -187,6 +187,7 @@ function InitializeCustomToolset { } function Build { + TryLogClientIpAddress InitializeToolset InitializeCustomToolset diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 85c898617..3b6fc9533 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -17,6 +17,7 @@ $global:RepoFiles = @{} $MaxParallelJobs = 16 $MaxRetries = 5 +$RetryWaitTimeInSeconds = 30 # Wait time between check for system load $SecondsBetweenLoadChecks = 10 @@ -99,9 +100,9 @@ $ValidatePackage = { $Status = 200 $Cache = $using:RepoFiles - $totalRetries = 0 + $attempts = 0 - while ($totalRetries -lt $using:MaxRetries) { + while ($attempts -lt $using:MaxRetries) { if ( !($Cache.ContainsKey($FilePath)) ) { try { $Uri = $Link -as [System.URI] @@ -113,7 +114,7 @@ $ValidatePackage = { else { # If it's not a github link, we want to break out of the loop and not retry. $Status = 0 - $totalRetries = $using:MaxRetries + $attempts = $using:MaxRetries } } catch { @@ -123,9 +124,15 @@ $ValidatePackage = { } if ($Status -ne 200) { - $totalRetries++ + $attempts++ - if ($totalRetries -ge $using:MaxRetries) { + if ($attempts -lt $using:MaxRetries) + { + $attemptsLeft = $using:MaxRetries - $attempts + Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds" + Start-Sleep -Seconds $using:RetryWaitTimeInSeconds + } + else { if ($NumFailedLinks -eq 0) { if ($FailedFiles.Value -eq 0) { Write-Host diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b1bca63ab..7ffa3591e 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,6 +83,7 @@ try { } if ($restore) { + Try-LogClientIpAddress Build 'Restore' } diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b58d42364..1cc0c29e4 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -34,29 +34,24 @@ jobs: inputs: packageType: sdk version: 3.1.x - - - task: UseDotNet@2 - displayName: Use .NET Core sdk - inputs: - useGlobalJson: true + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) - script: | - dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools - dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools - echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - env: - DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) displayName: Upload stage1 artifacts to source index env: BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) - DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5d526c74d..e607aa436 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } + # In case of network error, try to log the current IP for reference + Try-LogClientIpAddress + # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism $env:DOTNET_MULTILEVEL_LOOKUP=0 @@ -872,3 +875,21 @@ if (!$disableConfigureToolsetImport) { } } } + +function Try-LogClientIpAddress() +{ + Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" + try + { + $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing + $lines = $result.Content.Split([Environment]::NewLine) + $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" + Write-Host $socketIp + $clientIp = $lines | Select-String -Pattern "^Client IP:.*" + Write-Host $clientIp + } + catch + { + Write-Host "Unable to get this machine's effective IP address for logging: $_" + } +} diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 828119be4..3c5f3a12c 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -399,6 +399,13 @@ function StopProcesses { return 0 } +function TryLogClientIpAddress () { + echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' + if command -v curl > /dev/null; then + curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' + fi +} + function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index 1459b4253..2102fbc5b 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21413.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21413.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21418.12", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21418.12" } } From d913815a42b99c11c570dd74d0ff9f4515d836c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 23:57:42 +0000 Subject: [PATCH 11/22] [release/6.0.1xx] Update dependencies from dotnet/sdk (#11601) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.3 (parent: Microsoft.NET.Sdk) --- 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 a13dfbe41..cd745d188 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,30 +43,30 @@ https://github.com/dotnet/runtime 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/aspnetcore - b3c9a2956735b5171981d9b4f0a8de74951d7120 + 2db04778013a2d2245978af69106b7dd6e8b5378 - + https://github.com/dotnet/aspnetcore - b3c9a2956735b5171981d9b4f0a8de74951d7120 + 2db04778013a2d2245978af69106b7dd6e8b5378 - + https://github.com/dotnet/aspnetcore - b3c9a2956735b5171981d9b4f0a8de74951d7120 + 2db04778013a2d2245978af69106b7dd6e8b5378 - + https://github.com/dotnet/aspnetcore - b3c9a2956735b5171981d9b4f0a8de74951d7120 + 2db04778013a2d2245978af69106b7dd6e8b5378 - + https://github.com/dotnet/aspnetcore - b3c9a2956735b5171981d9b4f0a8de74951d7120 + 2db04778013a2d2245978af69106b7dd6e8b5378 - + https://github.com/dotnet/aspnetcore - b3c9a2956735b5171981d9b4f0a8de74951d7120 + 2db04778013a2d2245978af69106b7dd6e8b5378 https://github.com/dotnet/test-templates @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 8164dbcb396b99e1bd267e4f57a9bff0dc247cca + dfd7d8fee38a1ee091581cf2dc14c09e22e6e6cf - + https://github.com/dotnet/sdk - 8164dbcb396b99e1bd267e4f57a9bff0dc247cca + dfd7d8fee38a1ee091581cf2dc14c09e22e6e6cf diff --git a/eng/Versions.props b/eng/Versions.props index 402064ca1..9e843aedb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-rc.2.21418.11 - 6.0.0-rc.2.21418.11 - 6.0.0-rc.2.21418.11 - 6.0.0-rc.2.21418.11 - 6.0.0-rc.2.21418.11 - 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21419.3 + 6.0.0-rc.2.21419.3 + 6.0.0-rc.2.21419.3 + 6.0.0-rc.2.21419.3 + 6.0.0-rc.2.21419.3 + 6.0.0-rc.2.21419.3 0.2.0 - 6.0.100-rc.2.21418.59 - 6.0.100-rc.2.21418.59 + 6.0.100-rc.2.21419.23 + 6.0.100-rc.2.21419.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59784ce14878c3dec176a152dd25b6ffe1c82682 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 02:42:13 +0000 Subject: [PATCH 12/22] [release/6.0.1xx] Update dependencies from dotnet/sdk (#11603) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21419.3 to 6.0.0-rc.2.21419.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21419.3 to 6.0.0-rc.2.21419.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21419.3 to 6.0.0-rc.2.21419.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21419.3 to 6.0.0-rc.2.21419.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21419.3 to 6.0.0-rc.2.21419.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21419.3 to 6.0.0-rc.2.21419.10 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21418.11 to 6.0.0-rc.2.21419.6 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd745d188..eda16a99d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - c82c60e98062903d48b6e165de6bb26ece9acf41 + 93c5fc46c0feb87c724e19ca13b74060655a99d1 - + https://github.com/dotnet/windowsdesktop - c82c60e98062903d48b6e165de6bb26ece9acf41 + 93c5fc46c0feb87c724e19ca13b74060655a99d1 - + https://github.com/dotnet/windowsdesktop - c82c60e98062903d48b6e165de6bb26ece9acf41 + 93c5fc46c0feb87c724e19ca13b74060655a99d1 https://github.com/dotnet/runtime @@ -43,30 +43,30 @@ https://github.com/dotnet/runtime 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/aspnetcore - 2db04778013a2d2245978af69106b7dd6e8b5378 + 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 - + https://github.com/dotnet/aspnetcore - 2db04778013a2d2245978af69106b7dd6e8b5378 + 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 - + https://github.com/dotnet/aspnetcore - 2db04778013a2d2245978af69106b7dd6e8b5378 + 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 - + https://github.com/dotnet/aspnetcore - 2db04778013a2d2245978af69106b7dd6e8b5378 + 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 - + https://github.com/dotnet/aspnetcore - 2db04778013a2d2245978af69106b7dd6e8b5378 + 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 - + https://github.com/dotnet/aspnetcore - 2db04778013a2d2245978af69106b7dd6e8b5378 + 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 https://github.com/dotnet/test-templates @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - dfd7d8fee38a1ee091581cf2dc14c09e22e6e6cf + f89ae2f796ac71512e4a96ca03feec0f61841597 - + https://github.com/dotnet/sdk - dfd7d8fee38a1ee091581cf2dc14c09e22e6e6cf + f89ae2f796ac71512e4a96ca03feec0f61841597 diff --git a/eng/Versions.props b/eng/Versions.props index 9e843aedb..a4672acee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-rc.2.21419.3 - 6.0.0-rc.2.21419.3 - 6.0.0-rc.2.21419.3 - 6.0.0-rc.2.21419.3 - 6.0.0-rc.2.21419.3 - 6.0.0-rc.2.21419.3 + 6.0.0-rc.2.21419.10 + 6.0.0-rc.2.21419.10 + 6.0.0-rc.2.21419.10 + 6.0.0-rc.2.21419.10 + 6.0.0-rc.2.21419.10 + 6.0.0-rc.2.21419.10 0.2.0 - 6.0.100-rc.2.21419.23 - 6.0.100-rc.2.21419.23 + 6.0.100-rc.2.21419.29 + 6.0.100-rc.2.21419.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-rc.2.21418.11 - 6.0.0-rc.2.21418.11 - 6.0.0-rc.2.21418.11 + 6.0.0-rc.2.21419.6 + 6.0.0-rc.2.21419.6 + 6.0.0-rc.2.21419.6 From a7366f17c6926ccccdf5bca666506d3b99adb7b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 06:30:37 +0000 Subject: [PATCH 13/22] [release/6.0.1xx] Update dependencies from dotnet/sdk (#11605) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21419.10 to 6.0.0-rc.2.21419.24 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21419.10 to 6.0.0-rc.2.21419.24 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21419.10 to 6.0.0-rc.2.21419.24 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21419.10 to 6.0.0-rc.2.21419.24 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21419.10 to 6.0.0-rc.2.21419.24 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21419.10 to 6.0.0-rc.2.21419.24 (parent: Microsoft.NET.Sdk) --- 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 eda16a99d..62fc1e204 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,30 +43,30 @@ https://github.com/dotnet/runtime 5a5d7f0518b564e7f840c6c939bb6618c778b21b - + https://github.com/dotnet/aspnetcore - 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 + b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 - + https://github.com/dotnet/aspnetcore - 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 + b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 - + https://github.com/dotnet/aspnetcore - 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 + b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 - + https://github.com/dotnet/aspnetcore - 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 + b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 - + https://github.com/dotnet/aspnetcore - 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 + b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 - + https://github.com/dotnet/aspnetcore - 7b20901ead00dc09086a2b5e25bd634bbd1bfca3 + b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 https://github.com/dotnet/test-templates @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - f89ae2f796ac71512e4a96ca03feec0f61841597 + 817bdd900a63b8bb536fa8c6f1b60acebdb99f35 - + https://github.com/dotnet/sdk - f89ae2f796ac71512e4a96ca03feec0f61841597 + 817bdd900a63b8bb536fa8c6f1b60acebdb99f35 diff --git a/eng/Versions.props b/eng/Versions.props index a4672acee..4503dfe1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-rc.2.21419.10 - 6.0.0-rc.2.21419.10 - 6.0.0-rc.2.21419.10 - 6.0.0-rc.2.21419.10 - 6.0.0-rc.2.21419.10 - 6.0.0-rc.2.21419.10 + 6.0.0-rc.2.21419.24 + 6.0.0-rc.2.21419.24 + 6.0.0-rc.2.21419.24 + 6.0.0-rc.2.21419.24 + 6.0.0-rc.2.21419.24 + 6.0.0-rc.2.21419.24 0.2.0 - 6.0.100-rc.2.21419.29 - 6.0.100-rc.2.21419.29 + 6.0.100-rc.2.21419.42 + 6.0.100-rc.2.21419.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c7c0f192b958794e56e4b0fd2a5f4a9b67732b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 07:31:25 +0000 Subject: [PATCH 14/22] Update dependencies from https://github.com/dotnet/sdk build 20210819.47 (#11607) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21418.3 to 4.0.0-4.21419.3 (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 62fc1e204..3e545156a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 817bdd900a63b8bb536fa8c6f1b60acebdb99f35 + 7639b0a5372026f8f3f0ed1778f427ad36cd5fcb - + https://github.com/dotnet/sdk - 817bdd900a63b8bb536fa8c6f1b60acebdb99f35 + 7639b0a5372026f8f3f0ed1778f427ad36cd5fcb @@ -123,9 +123,9 @@ linker - + https://github.com/dotnet/roslyn - ec4452b89959159c8ba196e56a0d57de8414bdcb + 9501ef45a07675603e4c88076e26f0d0337e1812 diff --git a/eng/Versions.props b/eng/Versions.props index 4503dfe1b..bde2685c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21419.42 - 6.0.100-rc.2.21419.42 + 6.0.100-rc.2.21419.47 + 6.0.100-rc.2.21419.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f4b6855c6fec4cdfe319a8e4e9908c8bef750c02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 09:12:45 +0000 Subject: [PATCH 15/22] Update dependencies from https://github.com/dotnet/sdk build 20210820.4 (#11609) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21419.6 to 6.0.0-rc.2.21419.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21419.6 to 6.0.0-rc.2.21419.14 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21419.6 to 6.0.0-rc.2.21419.14 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21419.6 to 6.0.0-rc.2.21419.14 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21418.12 to 6.0.0-rc.2.21419.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 3e545156a..57272b684 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 93c5fc46c0feb87c724e19ca13b74060655a99d1 + 139cb9518e7bdd2219a552b5e23ac412f09000a4 - + https://github.com/dotnet/windowsdesktop - 93c5fc46c0feb87c724e19ca13b74060655a99d1 + 139cb9518e7bdd2219a552b5e23ac412f09000a4 - + https://github.com/dotnet/windowsdesktop - 93c5fc46c0feb87c724e19ca13b74060655a99d1 + 139cb9518e7bdd2219a552b5e23ac412f09000a4 https://github.com/dotnet/runtime @@ -86,23 +86,23 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - 7639b0a5372026f8f3f0ed1778f427ad36cd5fcb + f619c7fa60735d20658300518ecf5592a3fb31ea - + https://github.com/dotnet/sdk - 7639b0a5372026f8f3f0ed1778f427ad36cd5fcb + f619c7fa60735d20658300518ecf5592a3fb31ea https://github.com/dotnet/winforms 55ac4dd054482c13a45bac2983d7049e30dba18e - + https://github.com/dotnet/wpf - dc020cceb4eefa2542533e38ceeee16e055417b1 + aa45875d7868696c7d4453ebfc3ee6301827dccd https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bde2685c9..5bcf1c812 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 6.0.0-rc.2.21418.12 + 6.0.0-rc.2.21419.10 @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21419.47 - 6.0.100-rc.2.21419.47 + 6.0.100-rc.2.21420.4 + 6.0.100-rc.2.21420.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-rc.2.21419.6 - 6.0.0-rc.2.21419.6 - 6.0.0-rc.2.21419.6 + 6.0.0-rc.2.21419.14 + 6.0.0-rc.2.21419.14 + 6.0.0-rc.2.21419.14 From d39333637f02915c43c3dd1c6a9109a35c3782cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 12:03:35 +0000 Subject: [PATCH 16/22] Update dependencies from https://github.com/dotnet/sdk build 20210820.13 (#11611) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21419.3 to 4.0.0-4.21420.1 (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 57272b684..cb9aee742 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,14 +86,14 @@ ea0faeec472da442371c9a7db86dad5a3748233d - + https://github.com/dotnet/sdk - f619c7fa60735d20658300518ecf5592a3fb31ea + 8f45ec52248266e6808733d395635a9cf668cc86 - + https://github.com/dotnet/sdk - f619c7fa60735d20658300518ecf5592a3fb31ea + 8f45ec52248266e6808733d395635a9cf668cc86 @@ -123,9 +123,9 @@ linker - + https://github.com/dotnet/roslyn - 9501ef45a07675603e4c88076e26f0d0337e1812 + 1e6e37568a6406e701a5a0131665895ec368ada4 diff --git a/eng/Versions.props b/eng/Versions.props index 5bcf1c812..9af24b33f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21420.4 - 6.0.100-rc.2.21420.4 + 6.0.100-rc.2.21420.13 + 6.0.100-rc.2.21420.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f258b0ab005966c746feaf3598604a94c0f0044 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:57:00 +0000 Subject: [PATCH 17/22] [release/6.0.1xx] Update dependencies from dotnet/sdk (#11613) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21420.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21420.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21420.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21420.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21420.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21420.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21417.7 to 6.0.100-rc.2.21420.4 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21420.1 to 4.0.0-4.21420.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb9aee742..bb8837f4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 139cb9518e7bdd2219a552b5e23ac412f09000a4 - + https://github.com/dotnet/runtime - 5a5d7f0518b564e7f840c6c939bb6618c778b21b + aa219d8aa2a03726e02a643cf8b36fec13d2d484 - + https://github.com/dotnet/runtime - 5a5d7f0518b564e7f840c6c939bb6618c778b21b + aa219d8aa2a03726e02a643cf8b36fec13d2d484 - + https://github.com/dotnet/runtime - 5a5d7f0518b564e7f840c6c939bb6618c778b21b + aa219d8aa2a03726e02a643cf8b36fec13d2d484 - + https://github.com/dotnet/runtime - 5a5d7f0518b564e7f840c6c939bb6618c778b21b + aa219d8aa2a03726e02a643cf8b36fec13d2d484 - + https://github.com/dotnet/runtime - 5a5d7f0518b564e7f840c6c939bb6618c778b21b + aa219d8aa2a03726e02a643cf8b36fec13d2d484 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5a5d7f0518b564e7f840c6c939bb6618c778b21b + aa219d8aa2a03726e02a643cf8b36fec13d2d484 https://github.com/dotnet/aspnetcore @@ -81,19 +81,19 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - ea0faeec472da442371c9a7db86dad5a3748233d + 85f094779cc606d6354a8425537829028fac8015 - + https://github.com/dotnet/sdk - 8f45ec52248266e6808733d395635a9cf668cc86 + 88c604586ec9bebedb563e722b1a203a4e68cc38 - + https://github.com/dotnet/sdk - 8f45ec52248266e6808733d395635a9cf668cc86 + 88c604586ec9bebedb563e722b1a203a4e68cc38 @@ -123,9 +123,9 @@ linker - + https://github.com/dotnet/roslyn - 1e6e37568a6406e701a5a0131665895ec368ada4 + e8f2ac7e048cd62daaad888f13eff28f2684c63b diff --git a/eng/Versions.props b/eng/Versions.props index 9af24b33f..13a85c56e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-rc.2.21417.7 + 6.0.100-rc.2.21420.4 @@ -57,23 +57,23 @@ - 6.0.100-rc.2.21420.13 - 6.0.100-rc.2.21420.13 + 6.0.100-rc.2.21420.27 + 6.0.100-rc.2.21420.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21417.16 + 6.0.0-rc.2.21420.4 - 6.0.0-rc.2.21417.16 - 6.0.0-rc.2.21417.16 - 6.0.0-rc.2.21417.16 - 6.0.0-rc.2.21417.16 - 6.0.0-rc.2.21417.16 + 6.0.0-rc.2.21420.4 + 6.0.0-rc.2.21420.4 + 6.0.0-rc.2.21420.4 + 6.0.0-rc.2.21420.4 + 6.0.0-rc.2.21420.4 2.1.0 From 75bc8039a48f34d2d5a654e3d8eba906e52615ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 18:19:26 +0000 Subject: [PATCH 18/22] Update dependencies from https://github.com/dotnet/sdk build 20210820.38 (#11619) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21420.4 to 6.0.0-rc.2.21420.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21420.4 to 6.0.0-rc.2.21420.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21420.4 to 6.0.0-rc.2.21420.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21420.4 to 6.0.0-rc.2.21420.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21420.4 to 6.0.0-rc.2.21420.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21420.4 to 6.0.0-rc.2.21420.10 (parent: Microsoft.NET.Sdk) --- 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 bb8837f4b..937490692 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 139cb9518e7bdd2219a552b5e23ac412f09000a4 - + https://github.com/dotnet/runtime - aa219d8aa2a03726e02a643cf8b36fec13d2d484 + 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 - + https://github.com/dotnet/runtime - aa219d8aa2a03726e02a643cf8b36fec13d2d484 + 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 - + https://github.com/dotnet/runtime - aa219d8aa2a03726e02a643cf8b36fec13d2d484 + 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 - + https://github.com/dotnet/runtime - aa219d8aa2a03726e02a643cf8b36fec13d2d484 + 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 - + https://github.com/dotnet/runtime - aa219d8aa2a03726e02a643cf8b36fec13d2d484 + 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - aa219d8aa2a03726e02a643cf8b36fec13d2d484 + 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 https://github.com/dotnet/aspnetcore @@ -86,14 +86,14 @@ 85f094779cc606d6354a8425537829028fac8015 - + https://github.com/dotnet/sdk - 88c604586ec9bebedb563e722b1a203a4e68cc38 + 3141cfe93264e9cade9fb09c974f8c4a52208c24 - + https://github.com/dotnet/sdk - 88c604586ec9bebedb563e722b1a203a4e68cc38 + 3141cfe93264e9cade9fb09c974f8c4a52208c24 diff --git a/eng/Versions.props b/eng/Versions.props index 13a85c56e..994176912 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-rc.2.21420.27 - 6.0.100-rc.2.21420.27 + 6.0.100-rc.2.21420.38 + 6.0.100-rc.2.21420.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21420.4 + 6.0.0-rc.2.21420.10 - 6.0.0-rc.2.21420.4 - 6.0.0-rc.2.21420.4 - 6.0.0-rc.2.21420.4 - 6.0.0-rc.2.21420.4 - 6.0.0-rc.2.21420.4 + 6.0.0-rc.2.21420.10 + 6.0.0-rc.2.21420.10 + 6.0.0-rc.2.21420.10 + 6.0.0-rc.2.21420.10 + 6.0.0-rc.2.21420.10 2.1.0 From e4f099b69d50a4d98f7f4ca609a2f27da91ae085 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 20 Aug 2021 14:02:07 -0700 Subject: [PATCH 19/22] Add CPD for emsdk (#11622) --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 937490692..13b3d1ab4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -146,7 +146,7 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/emsdk 9f2345b3c5f43dbf34790e21657ae1f2445cd06a From a100dae568827c4f356923c6738bc3881fb3ecbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 04:50:08 +0000 Subject: [PATCH 20/22] [release/6.0.1xx] Update dependencies from dotnet/sdk (#11624) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21420.10 to 6.0.0-rc.2.21420.29 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21420.10 to 6.0.0-rc.2.21420.29 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21420.10 to 6.0.0-rc.2.21420.29 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21420.10 to 6.0.0-rc.2.21420.29 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21420.10 to 6.0.0-rc.2.21420.29 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21419.24 to 6.0.0-rc.2.21420.26 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21419.24 to 6.0.0-rc.2.21420.26 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21419.24 to 6.0.0-rc.2.21420.26 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21419.24 to 6.0.0-rc.2.21420.26 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21419.24 to 6.0.0-rc.2.21420.26 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21419.24 to 6.0.0-rc.2.21420.26 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21420.4 to 6.0.100-rc.2.21420.20 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21418.3 to 6.0.100-preview.6.21419.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21420.2 to 4.0.0-4.21420.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21420.10 to 6.0.0-rc.2.21420.29 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.1.21416.1 to 6.0.0-rc.1.21419.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-83727698-9cc4-4979-b52c-bd92c14aeeec --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13b3d1ab4..5f94bb359 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 139cb9518e7bdd2219a552b5e23ac412f09000a4 - + https://github.com/dotnet/runtime - 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 + 91406a13fb953d6ba8a6e274e8a6f6d240ac9436 - + https://github.com/dotnet/runtime - 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 + 91406a13fb953d6ba8a6e274e8a6f6d240ac9436 - + https://github.com/dotnet/runtime - 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 + 91406a13fb953d6ba8a6e274e8a6f6d240ac9436 - + https://github.com/dotnet/runtime - 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 + 91406a13fb953d6ba8a6e274e8a6f6d240ac9436 - + https://github.com/dotnet/runtime - 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 + 91406a13fb953d6ba8a6e274e8a6f6d240ac9436 @@ -39,34 +39,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1393ea8b00ed62025f2d0f7a4862f38abe8b73f2 + 91406a13fb953d6ba8a6e274e8a6f6d240ac9436 - + https://github.com/dotnet/aspnetcore - b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 + 51deae0b18ab779e227b31688a6157441027ea15 - + https://github.com/dotnet/aspnetcore - b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 + 51deae0b18ab779e227b31688a6157441027ea15 - + https://github.com/dotnet/aspnetcore - b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 + 51deae0b18ab779e227b31688a6157441027ea15 - + https://github.com/dotnet/aspnetcore - b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 + 51deae0b18ab779e227b31688a6157441027ea15 - + https://github.com/dotnet/aspnetcore - b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 + 51deae0b18ab779e227b31688a6157441027ea15 - + https://github.com/dotnet/aspnetcore - b4915a2ceecb7b6ac1bc7d39d55080bd61c27266 + 51deae0b18ab779e227b31688a6157441027ea15 https://github.com/dotnet/test-templates @@ -81,19 +81,19 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - 85f094779cc606d6354a8425537829028fac8015 + 4ac7e48a56644457fdb1948022e2e4dc957b0166 - + https://github.com/dotnet/sdk - 3141cfe93264e9cade9fb09c974f8c4a52208c24 + 5ed0d160c8f5feb815103d52ddee774c253ee9e6 - + https://github.com/dotnet/sdk - 3141cfe93264e9cade9fb09c974f8c4a52208c24 + 5ed0d160c8f5feb815103d52ddee774c253ee9e6 @@ -117,15 +117,15 @@ https://github.com/microsoft/vstest e79909063ddfc9d8fd4959e072b2dcf5e8d9d3c1 - + https://github.com/mono/linker - 5b2391c2c56af47350a5789375e8dbddc692e67f + 5851f6d62fedd9eb2edea9712c9764ca2ad6ab60 linker - + https://github.com/dotnet/roslyn - e8f2ac7e048cd62daaad888f13eff28f2684c63b + ac261dd6c30e75ee3dc4f5f687ddb9381c11c520 @@ -146,9 +146,9 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/emsdk - 9f2345b3c5f43dbf34790e21657ae1f2445cd06a + 74f858629aef569bf3b70b88183dca2ba2c2ad4e https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 994176912..25b24ffbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-rc.2.21420.4 + 6.0.100-rc.2.21420.20 @@ -45,35 +45,35 @@ - 6.0.0-rc.2.21419.24 - 6.0.0-rc.2.21419.24 - 6.0.0-rc.2.21419.24 - 6.0.0-rc.2.21419.24 - 6.0.0-rc.2.21419.24 - 6.0.0-rc.2.21419.24 + 6.0.0-rc.2.21420.26 + 6.0.0-rc.2.21420.26 + 6.0.0-rc.2.21420.26 + 6.0.0-rc.2.21420.26 + 6.0.0-rc.2.21420.26 + 6.0.0-rc.2.21420.26 0.2.0 - 6.0.100-rc.2.21420.38 - 6.0.100-rc.2.21420.38 + 6.0.100-rc.2.21422.9 + 6.0.100-rc.2.21422.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21420.10 + 6.0.0-rc.2.21420.29 - 6.0.0-rc.2.21420.10 - 6.0.0-rc.2.21420.10 - 6.0.0-rc.2.21420.10 - 6.0.0-rc.2.21420.10 - 6.0.0-rc.2.21420.10 + 6.0.0-rc.2.21420.29 + 6.0.0-rc.2.21420.29 + 6.0.0-rc.2.21420.29 + 6.0.0-rc.2.21420.29 + 6.0.0-rc.2.21420.29 2.1.0 @@ -170,7 +170,7 @@ 12.0.100-rc.1.496 15.0.100-rc.1.496 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rc.1.21416.1 + 6.0.0-rc.1.21419.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 66015273d0bbd1bb24bf786f0af36562bdc45681 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 06:48:00 +0000 Subject: [PATCH 21/22] Update dependencies from https://github.com/dotnet/sdk build 20210822.15 (#11640) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21420.6 to 4.0.0-4.21420.19 (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 5f94bb359..81d192cac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,14 +86,14 @@ 4ac7e48a56644457fdb1948022e2e4dc957b0166 - + https://github.com/dotnet/sdk - 5ed0d160c8f5feb815103d52ddee774c253ee9e6 + 2459ab6c7f124cdff8d9d197aa65797c650c07b6 - + https://github.com/dotnet/sdk - 5ed0d160c8f5feb815103d52ddee774c253ee9e6 + 2459ab6c7f124cdff8d9d197aa65797c650c07b6 @@ -123,9 +123,9 @@ linker - + https://github.com/dotnet/roslyn - ac261dd6c30e75ee3dc4f5f687ddb9381c11c520 + 158f906df6b1e4ca99fe7cf6ed78822515d64230 diff --git a/eng/Versions.props b/eng/Versions.props index 25b24ffbf..2b070ffd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21422.9 - 6.0.100-rc.2.21422.9 + 6.0.100-rc.2.21422.15 + 6.0.100-rc.2.21422.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eca586b5e70ee7f55557daed7fa00be974639bf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 08:43:21 +0000 Subject: [PATCH 22/22] Update dependencies from https://github.com/dotnet/sdk build 20210823.1 (#11641) [release/6.0.1xx] 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 81d192cac..01c2a13e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,14 +86,14 @@ 4ac7e48a56644457fdb1948022e2e4dc957b0166 - + https://github.com/dotnet/sdk - 2459ab6c7f124cdff8d9d197aa65797c650c07b6 + d5b2ff8732b55360bcdb64959c4617b5276f8813 - + https://github.com/dotnet/sdk - 2459ab6c7f124cdff8d9d197aa65797c650c07b6 + d5b2ff8732b55360bcdb64959c4617b5276f8813 diff --git a/eng/Versions.props b/eng/Versions.props index 2b070ffd9..c1fbbde5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21422.15 - 6.0.100-rc.2.21422.15 + 6.0.100-rc.2.21423.1 + 6.0.100-rc.2.21423.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)