From 6da560ac9e97c63352d3c83fb8991de42e151ca2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 May 2022 14:41:49 +0000 Subject: [PATCH 01/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220518.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22268.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22219.3 -> To Version 6.0.200-1.22178.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca1cdafb..8c32b6e42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 + 01c4f5905959c29f86781b85187bb676fc517ee9 linker @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 + 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 From 772aa20c051f1a28bc3051cb03ed5e9129c84ea5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Jun 2022 19:57:43 +0000 Subject: [PATCH 02/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220602.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22302.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c32b6e42..440ea747a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 + 6eb1f46c315e850c8ac318fa56a0f3e05c2214c5 From eeca7b601c6bbf160e20a59be3f34b181827ec49 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 6 Jun 2022 02:54:52 -0700 Subject: [PATCH 03/15] Restore the change for IL Link --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 440ea747a..df9e197d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 01c4f5905959c29f86781b85187bb676fc517ee9 + 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 linker From 787b7ce62922d421e7bd31a3ef30def150e5cc2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Jun 2022 15:03:29 +0000 Subject: [PATCH 04/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220609.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22309.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df9e197d6..36f345901 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 6eb1f46c315e850c8ac318fa56a0f3e05c2214c5 + e0d96c3f3b9e15553efb2b970e5af6e7a8677bcb From 3b7c25c763cc14fb52d7ee8400ac16437015cc21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jun 2022 02:20:08 +0000 Subject: [PATCH 05/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22314.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36f345901..83256d48d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - e0d96c3f3b9e15553efb2b970e5af6e7a8677bcb + bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b From 4efe6994e36054c034d2f7b3e63f45f03a1c48ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Jul 2022 15:01:11 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220705.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22355.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83256d48d..2054c20fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b + ffa2b64e8de11f0d148b7167c647fead3f2c33cb From 5eb8a241c8a43372b36a4df7eb5273c36c773e45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Jul 2022 14:58:40 +0000 Subject: [PATCH 07/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22357.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2054c20fb..2443f8e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - ffa2b64e8de11f0d148b7167c647fead3f2c33cb + 9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6 From a3290bfa2d775407cf53e5b73079c02d2ea8b1c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Jul 2022 15:07:24 +0000 Subject: [PATCH 08/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220713.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22363.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2443f8e02..bfee1f6bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6 + 08e4967761f81c4c40b6872a0e639b4f588b4f00 From 6b9fa18ad7f3392d86afef9197903b35ed30f900 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Jul 2022 13:43:25 -0700 Subject: [PATCH 09/15] Install the manifests into their specific feature band rather than the current band --- src/redist/targets/BundledManifests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 7b8536e48..b38fce70c 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -94,7 +94,7 @@ + DestinationFolder="$(RedistLayoutPath)sdk-manifests/%(FeatureBand)/%(DestinationPath)"/> From da4c6c0b23a333306f816c9211f43a4a984d3cc5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Jul 2022 17:15:27 -0700 Subject: [PATCH 10/15] Fix logic for putting the manifests in the right location. --- src/redist/targets/BundledManifests.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index b38fce70c..63bfd724e 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -82,19 +82,19 @@ + DestinationPath="%(BundledManifests.FeatureBand)/$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/localize"/> + DestinationFolder="$(RedistLayoutPath)sdk-manifests/%(DestinationPath)"/> From 9ff3ee5fc979cc76714d4c84a91a1d3745abbedf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 05:33:51 +0000 Subject: [PATCH 11/15] Update dependencies from https://github.com/dotnet/sdk build 20220713.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22363.39 -> To Version 6.0.400-preview.22363.52 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.0-rc.123 -> To Version 6.3.0-rc.128 (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 0c70c5efa..ab7b5acdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - 3cf60fea0352616c274a89ec580b2a521a37566b + 091beeec5285670ccb0914f85d10a8ef73cba1af - + https://github.com/dotnet/sdk - 3cf60fea0352616c274a89ec580b2a521a37566b + 091beeec5285670ccb0914f85d10a8ef73cba1af @@ -151,9 +151,9 @@ 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 - + https://github.com/nuget/nuget.client - 3f9d36bb147ad6a7833772c148d0ac7a11f6c2aa + 222ff7a5329be15520034b76fa1a84098d2ae9fd diff --git a/eng/Versions.props b/eng/Versions.props index 22a87bc44..00c543734 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22363.39 - 6.0.400-preview.22363.39 + 6.0.400-preview.22363.52 + 6.0.400-preview.22363.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9cec01214793b476c5bc9b8273c5ba07632f359e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 10:00:27 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/sdk build 20220714.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22363.52 -> To Version 6.0.400-preview.22364.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22329.30 -> To Version 4.3.0-3.22363.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 ab7b5acdf..932a97689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - 091beeec5285670ccb0914f85d10a8ef73cba1af + 4445b8be251722225295d23ad8c7607b294ba353 - + https://github.com/dotnet/sdk - 091beeec5285670ccb0914f85d10a8ef73cba1af + 4445b8be251722225295d23ad8c7607b294ba353 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 29e657c0582904529bae2a87c227220e03f509cf + 8b86c2058266c6069e71705623fe9f3b26b648cf diff --git a/eng/Versions.props b/eng/Versions.props index 00c543734..48982d6ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22363.52 - 6.0.400-preview.22363.52 + 6.0.400-preview.22364.3 + 6.0.400-preview.22364.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5cb321b8759d06853ec97ad0d2c4341725082d7a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 11:12:45 -0700 Subject: [PATCH 13/15] Update Versions.props --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 48982d6ad..8b6108da9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,11 +10,11 @@ 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 6e22d938effd14fe4b4125445578bf9c8f9d979c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 11:13:38 -0700 Subject: [PATCH 14/15] Update to target 3.1.28 --- 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 dddadab15..fe34c9857 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ 30 - $([MSBuild]::Add($(VersionFeature), 26)) + $([MSBuild]::Add($(VersionFeature), 27)) 17 From 55859829cd6c1ba18e7782630579e88df970a049 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 21 Jul 2022 10:56:34 -0700 Subject: [PATCH 15/15] Actually update implicit version to 3.1.28 (#14187) --- 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 fe34c9857..6fd052fb0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ 30 - $([MSBuild]::Add($(VersionFeature), 27)) + $([MSBuild]::Add($(VersionFeature), 28)) 17