From 134a7bf07847109cff29c1e8c47d490c64af7d16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 23:00:13 +0000 Subject: [PATCH 001/164] Update dependencies from https://github.com/dotnet/sdk build 20211014.40 (#12376) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21511.2 to 12.0.0-beta.21514.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21511.2 to 6.0.0-beta.21514.4 (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 d7cef7244..206b2129b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - 017a9901e1c2471279211f3ed2e5a59c3af24025 + 89e0c62202396b239b99f5a71ef1692ea456239d - + https://github.com/dotnet/sdk - 017a9901e1c2471279211f3ed2e5a59c3af24025 + 89e0c62202396b239b99f5a71ef1692ea456239d @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf bc889f2530324da100e9e5395fc09007646db9ce - + https://github.com/dotnet/fsharp - 1f28ed6e9ee51810012eca60e0047647bd3c9e0d + cd29a1cffc6af9b328d1363efe8827c944d67bd5 - + https://github.com/dotnet/fsharp - 1f28ed6e9ee51810012eca60e0047647bd3c9e0d + cd29a1cffc6af9b328d1363efe8827c944d67bd5 diff --git a/eng/Versions.props b/eng/Versions.props index b90ef369a..a0d1fcb8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.26 - 6.0.100-rtm.21514.26 + 6.0.100-rtm.21514.40 + 6.0.100-rtm.21514.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e189d5bc26ed2b75adb3ea670a3ed012b32a461a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 23:17:17 +0000 Subject: [PATCH 002/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211014.3 (#12377) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 206b2129b..3966f85f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 - + https://github.com/dotnet/source-build-reference-packages - 83a56ff632506f3d41fae37165136c8c59e697a9 + efe4afcc1f9ebfbb737187d1adf56a91f2a2a15d From 6c3ae2b2112041b2918d6307578b970d212abac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 23:30:46 +0000 Subject: [PATCH 003/164] Update dependencies from https://github.com/dotnet/sdk build 20211014.44 (#12378) [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 3966f85f2..ac671dfe9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - 89e0c62202396b239b99f5a71ef1692ea456239d + 31cd1fd56621716014178cca4751a4d8f3f1fd60 - + https://github.com/dotnet/sdk - 89e0c62202396b239b99f5a71ef1692ea456239d + 31cd1fd56621716014178cca4751a4d8f3f1fd60 diff --git a/eng/Versions.props b/eng/Versions.props index a0d1fcb8e..e2c88c421 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.40 - 6.0.100-rtm.21514.40 + 6.0.100-rtm.21514.44 + 6.0.100-rtm.21514.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0026f763ee4862fb7d066689b05788ca0600eace Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Thu, 14 Oct 2021 16:58:40 -0700 Subject: [PATCH 004/164] [ArPow] Resolve Microsoft.DotNet prebuilts for dotnet/roslyn (#12268) * remove two prebuilts * add link to roslyn PR in patch --- ...03-remove-Microsoft.DotNet-prebuilts.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch b/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch new file mode 100644 index 000000000..28d60fc27 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch @@ -0,0 +1,25 @@ +From 7260c572b1ce424f7ff3a64aa3227417c6a7a676 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Fri, 8 Oct 2021 00:56:41 +0000 +Subject: [PATCH] remove Microsoft.DotNet prebuilts + +Pull request for applying this patch: https://github.com/dotnet/roslyn/pull/57159 +--- + eng/Tools.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Tools.props b/eng/Tools.props +index 1579b510558..944448855ee 100644 +--- a/eng/Tools.props ++++ b/eng/Tools.props +@@ -1,6 +1,6 @@ + + +- ++ + @@ -146,9 +146,9 @@ 8ed6fe03b503e2ea2527162707cd9e57d04c2187 - + https://github.com/dotnet/msbuild - 6873d6956145ed66f8e9b9ed6ee13b7937e15b55 + b26f1a2dff48b08b58a6effea28b6cf6d8d9a4e2 diff --git a/eng/Versions.props b/eng/Versions.props index e2c88c421..43d3cb0c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.44 - 6.0.100-rtm.21514.44 + 6.0.100-rtm.21514.46 + 6.0.100-rtm.21514.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 792f36e69f2de3d0a49e361f746282a7fb5b145c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 01:22:48 +0000 Subject: [PATCH 006/164] Update dependencies from https://github.com/dotnet/sdk build 20211014.49 (#12382) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21514.6 to 6.0.0-rtm.21514.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21514.6 to 6.0.0-rtm.21514.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21514.6 to 6.0.0-rtm.21514.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.6 to 6.0.0-rtm.21514.13 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21514.6 to 6.0.0-rtm.21514.13 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21514.6 to 6.0.0-rtm.21514.13 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21511.11 to 4.0.0-6.21514.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 518934335..89c58561b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime ae31427bf065a1573c51f710633fe597cd359d0a - + https://github.com/dotnet/aspnetcore - 90a5030e59c373b287b48ca4b4356fa61df0d71a + 8729b3151c9db059c34cbc7c160047ef53275416 - + https://github.com/dotnet/aspnetcore - 90a5030e59c373b287b48ca4b4356fa61df0d71a + 8729b3151c9db059c34cbc7c160047ef53275416 - + https://github.com/dotnet/aspnetcore - 90a5030e59c373b287b48ca4b4356fa61df0d71a + 8729b3151c9db059c34cbc7c160047ef53275416 - + https://github.com/dotnet/aspnetcore - 90a5030e59c373b287b48ca4b4356fa61df0d71a + 8729b3151c9db059c34cbc7c160047ef53275416 - + https://github.com/dotnet/aspnetcore - 90a5030e59c373b287b48ca4b4356fa61df0d71a + 8729b3151c9db059c34cbc7c160047ef53275416 - + https://github.com/dotnet/aspnetcore - 90a5030e59c373b287b48ca4b4356fa61df0d71a + 8729b3151c9db059c34cbc7c160047ef53275416 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - 81da5b9203492f0c0d45d91b74d51feba3af4dae + bce612f8e543e90d343f35c7ce4e215270ba121c - + https://github.com/dotnet/sdk - 81da5b9203492f0c0d45d91b74d51feba3af4dae + bce612f8e543e90d343f35c7ce4e215270ba121c @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8ed6fe03b503e2ea2527162707cd9e57d04c2187 + df45061e218c9b5813c5531bc06fb238a23e30f6 diff --git a/eng/Versions.props b/eng/Versions.props index 43d3cb0c4..6f9ca6fa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21514.6 - 6.0.0-rtm.21514.6 - 6.0.0-rtm.21514.6 - 6.0.0-rtm.21514.6 - 6.0.0-rtm.21514.6 - 6.0.0-rtm.21514.6 + 6.0.0-rtm.21514.13 + 6.0.0-rtm.21514.13 + 6.0.0-rtm.21514.13 + 6.0.0-rtm.21514.13 + 6.0.0-rtm.21514.13 + 6.0.0-rtm.21514.13 0.2.0 - 6.0.100-rtm.21514.46 - 6.0.100-rtm.21514.46 + 6.0.100-rtm.21514.49 + 6.0.100-rtm.21514.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4dfb0e7951fc297e38f0566762e60818f7ff6084 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 01:54:39 +0000 Subject: [PATCH 007/164] Update dependencies from https://github.com/dotnet/sdk build 20211014.56 (#12383) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89c58561b..281458623 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop ceb63cd704cb33642a65e36cb67d736f96530e26 - + https://github.com/dotnet/runtime - ae31427bf065a1573c51f710633fe597cd359d0a + 892555a19b8b815f64406c7f9b4c44ec89cefaf7 - + https://github.com/dotnet/runtime - ae31427bf065a1573c51f710633fe597cd359d0a + 892555a19b8b815f64406c7f9b4c44ec89cefaf7 - + https://github.com/dotnet/runtime - ae31427bf065a1573c51f710633fe597cd359d0a + 892555a19b8b815f64406c7f9b4c44ec89cefaf7 - + https://github.com/dotnet/runtime - ae31427bf065a1573c51f710633fe597cd359d0a + 892555a19b8b815f64406c7f9b4c44ec89cefaf7 - + https://github.com/dotnet/runtime - ae31427bf065a1573c51f710633fe597cd359d0a + 892555a19b8b815f64406c7f9b4c44ec89cefaf7 - + https://github.com/dotnet/runtime - ae31427bf065a1573c51f710633fe597cd359d0a + 892555a19b8b815f64406c7f9b4c44ec89cefaf7 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ae31427bf065a1573c51f710633fe597cd359d0a + 892555a19b8b815f64406c7f9b4c44ec89cefaf7 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - bce612f8e543e90d343f35c7ce4e215270ba121c + ba72cedee2c4883bcf3d066ea33df460a5d00a6e - + https://github.com/dotnet/sdk - bce612f8e543e90d343f35c7ce4e215270ba121c + ba72cedee2c4883bcf3d066ea33df460a5d00a6e diff --git a/eng/Versions.props b/eng/Versions.props index 6f9ca6fa1..e8fd3704b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21514.49 - 6.0.100-rtm.21514.49 + 6.0.100-rtm.21514.56 + 6.0.100-rtm.21514.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21513.26 + 6.0.0-rtm.21514.7 - 6.0.0-rtm.21513.26 - 6.0.0-rtm.21513.26 - 6.0.0-rtm.21513.26 - 6.0.0-rtm.21513.26 - 6.0.0-rtm.21513.26 - 6.0.0-rtm.21513.26 + 6.0.0-rtm.21514.7 + 6.0.0-rtm.21514.7 + 6.0.0-rtm.21514.7 + 6.0.0-rtm.21514.7 + 6.0.0-rtm.21514.7 + 6.0.0-rtm.21514.7 2.1.0 From 723579bd57627b19b5f546fb569223bee6cb03a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 02:27:55 +0000 Subject: [PATCH 008/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211014.4 (#12384) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 281458623..5a77cc631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 - + https://github.com/dotnet/source-build-reference-packages - efe4afcc1f9ebfbb737187d1adf56a91f2a2a15d + b4a79cfec6f36bae56cecef07f9188c41f02ef32 From 0bdaa4380d8acc00460205dc0d07bab4de23fbb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 03:22:24 +0000 Subject: [PATCH 009/164] Update dependencies from https://github.com/dotnet/sdk build 20211014.59 (#12385) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21514.13 to 6.0.0-rtm.21514.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21514.13 to 6.0.0-rtm.21514.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21514.13 to 6.0.0-rtm.21514.18 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.13 to 6.0.0-rtm.21514.18 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21514.13 to 6.0.0-rtm.21514.18 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21514.13 to 6.0.0-rtm.21514.18 (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 5a77cc631..d2aba60c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 892555a19b8b815f64406c7f9b4c44ec89cefaf7 - + https://github.com/dotnet/aspnetcore - 8729b3151c9db059c34cbc7c160047ef53275416 + acd46eab669a2deef5be01520f9a83237a569ac5 - + https://github.com/dotnet/aspnetcore - 8729b3151c9db059c34cbc7c160047ef53275416 + acd46eab669a2deef5be01520f9a83237a569ac5 - + https://github.com/dotnet/aspnetcore - 8729b3151c9db059c34cbc7c160047ef53275416 + acd46eab669a2deef5be01520f9a83237a569ac5 - + https://github.com/dotnet/aspnetcore - 8729b3151c9db059c34cbc7c160047ef53275416 + acd46eab669a2deef5be01520f9a83237a569ac5 - + https://github.com/dotnet/aspnetcore - 8729b3151c9db059c34cbc7c160047ef53275416 + acd46eab669a2deef5be01520f9a83237a569ac5 - + https://github.com/dotnet/aspnetcore - 8729b3151c9db059c34cbc7c160047ef53275416 + acd46eab669a2deef5be01520f9a83237a569ac5 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - ba72cedee2c4883bcf3d066ea33df460a5d00a6e + 834568fb918f86a13d7660e8b364ba1eb05bca8e - + https://github.com/dotnet/sdk - ba72cedee2c4883bcf3d066ea33df460a5d00a6e + 834568fb918f86a13d7660e8b364ba1eb05bca8e diff --git a/eng/Versions.props b/eng/Versions.props index e8fd3704b..abf177fdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21514.13 - 6.0.0-rtm.21514.13 - 6.0.0-rtm.21514.13 - 6.0.0-rtm.21514.13 - 6.0.0-rtm.21514.13 - 6.0.0-rtm.21514.13 + 6.0.0-rtm.21514.18 + 6.0.0-rtm.21514.18 + 6.0.0-rtm.21514.18 + 6.0.0-rtm.21514.18 + 6.0.0-rtm.21514.18 + 6.0.0-rtm.21514.18 0.2.0 - 6.0.100-rtm.21514.56 - 6.0.100-rtm.21514.56 + 6.0.100-rtm.21514.59 + 6.0.100-rtm.21514.59 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fecf82df45ae60441ddfba82e629104da189e280 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 04:34:27 +0000 Subject: [PATCH 010/164] Update dependencies from https://github.com/dotnet/sdk build 20211014.61 (#12386) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21514.18 to 6.0.0-rtm.21514.23 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21514.18 to 6.0.0-rtm.21514.23 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21514.18 to 6.0.0-rtm.21514.23 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.18 to 6.0.0-rtm.21514.23 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21514.18 to 6.0.0-rtm.21514.23 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21514.18 to 6.0.0-rtm.21514.23 (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 d2aba60c9..4ed2e1a46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 892555a19b8b815f64406c7f9b4c44ec89cefaf7 - + https://github.com/dotnet/aspnetcore - acd46eab669a2deef5be01520f9a83237a569ac5 + 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 - + https://github.com/dotnet/aspnetcore - acd46eab669a2deef5be01520f9a83237a569ac5 + 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 - + https://github.com/dotnet/aspnetcore - acd46eab669a2deef5be01520f9a83237a569ac5 + 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 - + https://github.com/dotnet/aspnetcore - acd46eab669a2deef5be01520f9a83237a569ac5 + 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 - + https://github.com/dotnet/aspnetcore - acd46eab669a2deef5be01520f9a83237a569ac5 + 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 - + https://github.com/dotnet/aspnetcore - acd46eab669a2deef5be01520f9a83237a569ac5 + 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - 834568fb918f86a13d7660e8b364ba1eb05bca8e + 0b8487ebb2e2cc3960b66d8b256f0ad5f95ba507 - + https://github.com/dotnet/sdk - 834568fb918f86a13d7660e8b364ba1eb05bca8e + 0b8487ebb2e2cc3960b66d8b256f0ad5f95ba507 diff --git a/eng/Versions.props b/eng/Versions.props index abf177fdd..12a1c9fc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21514.18 - 6.0.0-rtm.21514.18 - 6.0.0-rtm.21514.18 - 6.0.0-rtm.21514.18 - 6.0.0-rtm.21514.18 - 6.0.0-rtm.21514.18 + 6.0.0-rtm.21514.23 + 6.0.0-rtm.21514.23 + 6.0.0-rtm.21514.23 + 6.0.0-rtm.21514.23 + 6.0.0-rtm.21514.23 + 6.0.0-rtm.21514.23 0.2.0 - 6.0.100-rtm.21514.59 - 6.0.100-rtm.21514.59 + 6.0.100-rtm.21514.61 + 6.0.100-rtm.21514.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb72427eb6ed1f91959d0d53d6dfc3a5f567e1c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 05:22:51 +0000 Subject: [PATCH 011/164] Update dependencies from https://github.com/dotnet/sdk build 20211014.63 (#12387) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21513.28 to 6.0.0-rtm.21514.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.28 to 6.0.0-rtm.21514.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21513.28 to 6.0.0-rtm.21514.10 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21513.28 to 6.0.0-rtm.21514.10 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21513.19 to 6.0.0-rtm.21514.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21513.28 to 6.0.0-rtm.21514.10 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21513.21 to 6.0.0-rtm.21514.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 4ed2e1a46..a0e7d92a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - ceb63cd704cb33642a65e36cb67d736f96530e26 + 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 - + https://github.com/dotnet/windowsdesktop - ceb63cd704cb33642a65e36cb67d736f96530e26 + 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 - + https://github.com/dotnet/windowsdesktop - ceb63cd704cb33642a65e36cb67d736f96530e26 + 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 - + https://github.com/dotnet/windowsdesktop - ceb63cd704cb33642a65e36cb67d736f96530e26 + 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - 0b8487ebb2e2cc3960b66d8b256f0ad5f95ba507 + 8a0460b11d5cb8543dad52ee442a5397182831d1 - + https://github.com/dotnet/sdk - 0b8487ebb2e2cc3960b66d8b256f0ad5f95ba507 + 8a0460b11d5cb8543dad52ee442a5397182831d1 - + https://github.com/dotnet/winforms - 69eebc37f171f3d6cee7ff6d63c20762b70b685e + 1eab25c83581a91e7c808aed960b0e27cefc54c9 - + https://github.com/dotnet/wpf - bc889f2530324da100e9e5395fc09007646db9ce + 396accedcec6c2fdd18a0e7cd027f6f7db1b3927 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 12a1c9fc2..388506d64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21513.19 + 6.0.0-rtm.21514.16 - 6.0.0-rtm.21513.21 + 6.0.0-rtm.21514.10 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.61 - 6.0.100-rtm.21514.61 + 6.0.100-rtm.21514.63 + 6.0.100-rtm.21514.63 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21513.28 - 6.0.0-rtm.21513.28 - 6.0.0-rtm.21513.28 - 6.0.0-rtm.21513.28 + 6.0.0-rtm.21514.10 + 6.0.0-rtm.21514.10 + 6.0.0-rtm.21514.10 + 6.0.0-rtm.21514.10 From aecabf58e5bbfd4f0295dd86681f01bc6bf41576 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 13:25:40 +0000 Subject: [PATCH 012/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.2 (#12390) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21514.4 to 6.0.100-rtm.21515.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21514.4 to 6.0.100-rtm.21515.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21514.4 to 6.0.100-rtm.21515.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0e7d92a2..cc8978c7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 + d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/templating - c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 + d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/templating - c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 + d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - 8a0460b11d5cb8543dad52ee442a5397182831d1 + ddc95fa41a416ff4bb8da792f496cb7670f12eb7 - + https://github.com/dotnet/sdk - 8a0460b11d5cb8543dad52ee442a5397182831d1 + ddc95fa41a416ff4bb8da792f496cb7670f12eb7 diff --git a/eng/Versions.props b/eng/Versions.props index 388506d64..07bae0f03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21514.4 + 6.0.100-rtm.21515.2 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.63 - 6.0.100-rtm.21514.63 + 6.0.100-rtm.21515.2 + 6.0.100-rtm.21515.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21514.4 + 6.0.100-rtm.21515.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From f5eac060796f6118352ea3b814f3130bc85aaf1f Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 13 Oct 2021 23:50:05 +0000 Subject: [PATCH 013/164] Resolve Microsoft.Extensions.CommandLineUtils prebuilt --- ...xtensions.CommandLineUtils-reference.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch b/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch new file mode 100644 index 000000000..99ab03f60 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 21 Jul 2021 17:33:03 -0500 +Subject: [PATCH] Update Microsoft.Extensions.CommandLineUtils reference + +Microsoft.Extensions.CommandLineUtils is obsolete and no longer being built. Because of this it can't be source-built. +Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. +--- + build/packages.targets | 3 ++- + .../NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/build/packages.targets b/build/packages.targets +index 614a0ca68..f6be9619e 100644 +--- a/build/packages.targets ++++ b/build/packages.targets +@@ -8,6 +8,7 @@ + 5.0.0 + 2.14.0-rtm-832 + 17.0.0-beta1-10402-05 ++ 5.0.1-rtm.21063.7 + + + +@@ -31,7 +32,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +index 21015c00a..e306cdee4 100644 +--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj ++++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +@@ -18,7 +18,7 @@ + + + +- ++ + + + From c694b83d08a949d336acd4c3cab74612b51f4199 Mon Sep 17 00:00:00 2001 From: "msimons@microsoft.com" Date: Fri, 15 Oct 2021 15:44:14 +0000 Subject: [PATCH 014/164] Revert "Resolve conflicts in source-build patches" This reverts commit e7cfd82155fd1f5054d89f8a03fd0b4b34d1f5e9. --- ...loads-WiX-dependency-in-source-build.patch | 124 ++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch diff --git a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch new file mode 100644 index 000000000..188312413 --- /dev/null +++ b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch @@ -0,0 +1,124 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 8 Oct 2021 16:15:42 -0700 +Subject: [PATCH] Disable Workloads WiX dependency in source-build + +This removes the prebuilt WiX dependency: https://github.com/dotnet/arcade/issues/8014 + +The patch is temporary, pending upstream fix and dependency flow. +--- + .../src/{FileRow.cs => FileRow.wix.cs} | 0 + ...ifestMsi.cs => GenerateManifestMsi.wix.cs} | 0 + .../{GenerateMsi.cs => GenerateMsi.wix.cs} | 0 + ...erateMsiBase.cs => GenerateMsiBase.wix.cs} | 0 + ...erateVisualStudioMsiPackageProject.wix.cs} | 0 + ...cs => GenerateVisualStudioWorkload.wix.cs} | 0 + ...oadMsis.cs => GenerateWorkloadMsis.wix.cs} | 0 + ...rosoft.DotNet.Build.Tasks.Workloads.csproj | 23 ++++++++++++++++--- + ...{MsiProperties.cs => MsiProperties.wix.cs} | 0 + .../src/{MsiUtils.cs => MsiUtils.wix.cs} | 0 + ...elatedProduct.cs => RelatedProduct.wix.cs} | 0 + 11 files changed, 20 insertions(+), 3 deletions(-) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{FileRow.cs => FileRow.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateManifestMsi.cs => GenerateManifestMsi.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsi.cs => GenerateMsi.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsiBase.cs => GenerateMsiBase.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioMsiPackageProject.cs => GenerateVisualStudioMsiPackageProject.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioWorkload.cs => GenerateVisualStudioWorkload.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateWorkloadMsis.cs => GenerateWorkloadMsis.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiProperties.cs => MsiProperties.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiUtils.cs => MsiUtils.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{RelatedProduct.cs => RelatedProduct.wix.cs} (100%) + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj +index 19cf67b5..2d02b7f4 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj ++++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj +@@ -11,6 +11,16 @@ + $(NoWarn);NU5127 + false + Microsoft.DotNet.Build.Tasks.Workloads ++ ++ ++ true + + + +@@ -19,13 +29,16 @@ + + + +- + +- ++ + + + +- ++ ++ ++ ++ ++ + + + +@@ -48,6 +61,10 @@ + + + ++ ++ ++ ++ + + + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs From 83cde83fc3225b91b4b23758f871c395b10a2f8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 17:30:00 +0000 Subject: [PATCH 015/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.10 (#12392) [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 cc8978c7e..d185f8721 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - ddc95fa41a416ff4bb8da792f496cb7670f12eb7 + d499199d3be09669d5554ef92060d8a2a200610a - + https://github.com/dotnet/sdk - ddc95fa41a416ff4bb8da792f496cb7670f12eb7 + d499199d3be09669d5554ef92060d8a2a200610a diff --git a/eng/Versions.props b/eng/Versions.props index 07bae0f03..cdcfd46d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21515.2 - 6.0.100-rtm.21515.2 + 6.0.100-rtm.21515.10 + 6.0.100-rtm.21515.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 726687d92695d945eaa22bf13390d6831ea73018 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Fri, 15 Oct 2021 12:40:58 -0500 Subject: [PATCH 016/164] [ArPow] Update aspnetcore to use built versions of analyzers (#12375) * Update aspnetcore to use built versions of analyzers * Move solution to repo project --- .../tarball/content/repos/aspnetcore.proj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 72389f7e8..ad9d77885 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -26,6 +26,18 @@ $(ProjectDirectory)NuGet.config + + + + + + From 470202635d3c0b9d90203b522f0895ccca460110 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:35:06 -0700 Subject: [PATCH 017/164] [ArPow] Resolve dotnet/linker Mono.Cecil prebuilt with patch (#12372) * add wip Mono.Cecil patches * remove unnecessary linker patch * add link to linker PR in patch --- .../0001-fix-tlens-Mono.Cecil-reference.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch diff --git a/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch b/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch new file mode 100644 index 000000000..319028d25 --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Wed, 13 Oct 2021 18:26:09 +0000 +Subject: [PATCH] fix tlens Mono.Cecil reference + +Pull request for applying the patch: https://github.com/dotnet/linker/pull/2317 +--- + src/tlens/tlens.csproj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/tlens/tlens.csproj b/src/tlens/tlens.csproj +index 92b3754..e17f9fb 100644 +--- a/src/tlens/tlens.csproj ++++ b/src/tlens/tlens.csproj +@@ -10,7 +10,8 @@ + + + +- ++ ++ + + + From fc13fc0ffd87d88b7f2205b65e62fc0bfc9b5c81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 18:52:11 +0000 Subject: [PATCH 018/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.15 (#12393) [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 d185f8721..e5e7fe520 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - d499199d3be09669d5554ef92060d8a2a200610a + 21c1dedb87f975d99183f747eb5155674a99a5fc - + https://github.com/dotnet/sdk - d499199d3be09669d5554ef92060d8a2a200610a + 21c1dedb87f975d99183f747eb5155674a99a5fc diff --git a/eng/Versions.props b/eng/Versions.props index cdcfd46d0..a82b4b865 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21515.10 - 6.0.100-rtm.21515.10 + 6.0.100-rtm.21515.15 + 6.0.100-rtm.21515.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b93b435c83516e67df4223acf64365e485c23e83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 19:59:03 +0000 Subject: [PATCH 019/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.17 (#12394) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rtm.21512.1 to 6.0.0-rtm.21514.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5e7fe520..d9e3c4b4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 - + https://github.com/dotnet/runtime - 892555a19b8b815f64406c7f9b4c44ec89cefaf7 + 80b753192beadbf8f32df7f981a09eacc5a4d7fd - + https://github.com/dotnet/runtime - 892555a19b8b815f64406c7f9b4c44ec89cefaf7 + 80b753192beadbf8f32df7f981a09eacc5a4d7fd - + https://github.com/dotnet/runtime - 892555a19b8b815f64406c7f9b4c44ec89cefaf7 + 80b753192beadbf8f32df7f981a09eacc5a4d7fd - + https://github.com/dotnet/runtime - 892555a19b8b815f64406c7f9b4c44ec89cefaf7 + 80b753192beadbf8f32df7f981a09eacc5a4d7fd - + https://github.com/dotnet/runtime - 892555a19b8b815f64406c7f9b4c44ec89cefaf7 + 80b753192beadbf8f32df7f981a09eacc5a4d7fd - + https://github.com/dotnet/runtime - 892555a19b8b815f64406c7f9b4c44ec89cefaf7 + 80b753192beadbf8f32df7f981a09eacc5a4d7fd @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 892555a19b8b815f64406c7f9b4c44ec89cefaf7 + 80b753192beadbf8f32df7f981a09eacc5a4d7fd https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - 21c1dedb87f975d99183f747eb5155674a99a5fc + b0e86c27ee26a927e08054844c92668c4195a4eb - + https://github.com/dotnet/sdk - 21c1dedb87f975d99183f747eb5155674a99a5fc + b0e86c27ee26a927e08054844c92668c4195a4eb @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 199dbf8b315d8f82dae2d6de72fb63ad26b31907 + 73c8cd3619efc79364fef5fa81989f9e0dd2147b https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index a82b4b865..716618fc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21515.15 - 6.0.100-rtm.21515.15 + 6.0.100-rtm.21515.17 + 6.0.100-rtm.21515.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21514.7 + 6.0.0-rtm.21515.2 - 6.0.0-rtm.21514.7 - 6.0.0-rtm.21514.7 - 6.0.0-rtm.21514.7 - 6.0.0-rtm.21514.7 - 6.0.0-rtm.21514.7 - 6.0.0-rtm.21514.7 + 6.0.0-rtm.21515.2 + 6.0.0-rtm.21515.2 + 6.0.0-rtm.21515.2 + 6.0.0-rtm.21515.2 + 6.0.0-rtm.21515.2 + 6.0.0-rtm.21515.2 2.1.0 @@ -171,7 +171,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rtm.21512.1 + 6.0.0-rtm.21514.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 7a06aeebbfeae240051f12c8945ae4a80298e42a Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 15 Oct 2021 15:35:44 -0500 Subject: [PATCH 020/164] [release/6.0.1xx] Remove msbuild prebuilts using patches (#12369) --- ...built-jnm2.ReferenceAssemblies.net35.patch | 36 +++++++++++++++++++ ...nnedApiAnalyzers-during-source-build.patch | 29 +++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch create mode 100644 src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch new file mode 100644 index 000000000..93717db90 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0001-Remove-prebuilt-jnm2.ReferenceAssemblies.net35.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Mon, 11 Oct 2021 17:09:14 -0500 +Subject: [PATCH] Remove prebuilt jnm2.ReferenceAssemblies.net35 + +This prebuilt package filled a gap in the official 1.0 version of the .NET +Framework reference assembly packages. The gap has been fixed in later versions +of the official packages. Removal fixes a prebuilt dependency by letting the +repo use the official version of the packges, which are produced by SBRP. +https://github.com/dotnet/msbuild/issues/6935 +--- + src/StringTools/StringTools.csproj | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/StringTools/StringTools.csproj b/src/StringTools/StringTools.csproj +index fef9909..93a4634 100644 +--- a/src/StringTools/StringTools.csproj ++++ b/src/StringTools/StringTools.csproj +@@ -20,17 +20,12 @@ + + + Microsoft.NET.StringTools.net35 +- +- true + + + + + + +- +- +- + + + diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch new file mode 100644 index 000000000..b5b0a84f6 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 12 Oct 2021 18:14:59 -0500 +Subject: [PATCH] Disable BannedApiAnalyzers during source-build + +BannedApiAnalyzers has some intentional old dependencies and it's not feasible +to build it during source-build. Remove this usage to remove a prebuilt. +https://github.com/dotnet/msbuild/issues/6961 +--- + eng/Packages.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Packages.props b/eng/Packages.props +index 0f478634f..3cc09a008 100644 +--- a/eng/Packages.props ++++ b/eng/Packages.props +@@ -45,11 +45,11 @@ + + + ++ + + + + +- + + + From bebdfd5ffa60a3e0fa3eb5d7f975fb2ad813c86d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 20:35:47 +0000 Subject: [PATCH 021/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.19 (#12395) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21514.23 to 6.0.0-rtm.21515.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21514.23 to 6.0.0-rtm.21515.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21514.23 to 6.0.0-rtm.21515.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.23 to 6.0.0-rtm.21515.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21514.23 to 6.0.0-rtm.21515.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21514.23 to 6.0.0-rtm.21515.4 (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 d9e3c4b4c..84dc62c71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 80b753192beadbf8f32df7f981a09eacc5a4d7fd - + https://github.com/dotnet/aspnetcore - 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 + fc36332fb876a346d1ea4791b6155cebd3c0d0b9 - + https://github.com/dotnet/aspnetcore - 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 + fc36332fb876a346d1ea4791b6155cebd3c0d0b9 - + https://github.com/dotnet/aspnetcore - 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 + fc36332fb876a346d1ea4791b6155cebd3c0d0b9 - + https://github.com/dotnet/aspnetcore - 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 + fc36332fb876a346d1ea4791b6155cebd3c0d0b9 - + https://github.com/dotnet/aspnetcore - 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 + fc36332fb876a346d1ea4791b6155cebd3c0d0b9 - + https://github.com/dotnet/aspnetcore - 2179fb60bba52cbddf247ea0ef5ba1596c7ca161 + fc36332fb876a346d1ea4791b6155cebd3c0d0b9 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - b0e86c27ee26a927e08054844c92668c4195a4eb + 7a3a263bf3084e802c5d76fa43f0a34bf4103b9c - + https://github.com/dotnet/sdk - b0e86c27ee26a927e08054844c92668c4195a4eb + 7a3a263bf3084e802c5d76fa43f0a34bf4103b9c diff --git a/eng/Versions.props b/eng/Versions.props index 716618fc9..4edeb3b2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21514.23 - 6.0.0-rtm.21514.23 - 6.0.0-rtm.21514.23 - 6.0.0-rtm.21514.23 - 6.0.0-rtm.21514.23 - 6.0.0-rtm.21514.23 + 6.0.0-rtm.21515.4 + 6.0.0-rtm.21515.4 + 6.0.0-rtm.21515.4 + 6.0.0-rtm.21515.4 + 6.0.0-rtm.21515.4 + 6.0.0-rtm.21515.4 0.2.0 - 6.0.100-rtm.21515.17 - 6.0.100-rtm.21515.17 + 6.0.100-rtm.21515.19 + 6.0.100-rtm.21515.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 49830f40e17ce363120e84f8679e4c7566d475ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 21:15:44 +0000 Subject: [PATCH 022/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.21 (#12396) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21515.4 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21515.4 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.4 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.4 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21515.4 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21515.4 to 6.0.0-rtm.21515.6 (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 84dc62c71..2c8ea69d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 80b753192beadbf8f32df7f981a09eacc5a4d7fd - + https://github.com/dotnet/aspnetcore - fc36332fb876a346d1ea4791b6155cebd3c0d0b9 + 647c768a25030ad0f8a3568f3766bcc1c254eb76 - + https://github.com/dotnet/aspnetcore - fc36332fb876a346d1ea4791b6155cebd3c0d0b9 + 647c768a25030ad0f8a3568f3766bcc1c254eb76 - + https://github.com/dotnet/aspnetcore - fc36332fb876a346d1ea4791b6155cebd3c0d0b9 + 647c768a25030ad0f8a3568f3766bcc1c254eb76 - + https://github.com/dotnet/aspnetcore - fc36332fb876a346d1ea4791b6155cebd3c0d0b9 + 647c768a25030ad0f8a3568f3766bcc1c254eb76 - + https://github.com/dotnet/aspnetcore - fc36332fb876a346d1ea4791b6155cebd3c0d0b9 + 647c768a25030ad0f8a3568f3766bcc1c254eb76 - + https://github.com/dotnet/aspnetcore - fc36332fb876a346d1ea4791b6155cebd3c0d0b9 + 647c768a25030ad0f8a3568f3766bcc1c254eb76 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - 7a3a263bf3084e802c5d76fa43f0a34bf4103b9c + 33148d0b5e8f91acea7e5a6c2896391d6512f568 - + https://github.com/dotnet/sdk - 7a3a263bf3084e802c5d76fa43f0a34bf4103b9c + 33148d0b5e8f91acea7e5a6c2896391d6512f568 diff --git a/eng/Versions.props b/eng/Versions.props index 4edeb3b2a..f16e3cc66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21515.4 - 6.0.0-rtm.21515.4 - 6.0.0-rtm.21515.4 - 6.0.0-rtm.21515.4 - 6.0.0-rtm.21515.4 - 6.0.0-rtm.21515.4 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 0.2.0 - 6.0.100-rtm.21515.19 - 6.0.100-rtm.21515.19 + 6.0.100-rtm.21515.21 + 6.0.100-rtm.21515.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 92ad65ff519394a07be7b5d940613f1568872825 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Fri, 15 Oct 2021 14:32:46 -0700 Subject: [PATCH 023/164] Update mac conclusion UI string --- .../packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- .../osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- .../osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed at /usr/local/share/dotnet +

The following was installed

  • .NET SDK {DOTNETSDKVERSION}
  • .NET Runtime {DOTNETRUNTIMEVERSION}
    • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -5,7 +5,7 @@
    -

    The following was installed at /usr/local/share/dotnet +

    The following was installed

    • .NET SDK {DOTNETSDKVERSION}
    • .NET Runtime {DOTNETRUNTIMEVERSION}
      • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -5,7 +5,7 @@
      -

      The following was installed at /usr/local/share/dotnet +

      The following was installed

      • .NET SDK {DOTNETSDKVERSION}
      • .NET Runtime {DOTNETRUNTIMEVERSION}
        • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -5,7 +5,7 @@
        -

        The following was installed at /usr/local/share/dotnet +

        The following was installed

        • .NET SDK {DOTNETSDKVERSION}
        • .NET Runtime {DOTNETRUNTIMEVERSION}
          • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -5,7 +5,7 @@
          -

          The following was installed at /usr/local/share/dotnet +

          The following was installed

          • .NET SDK {DOTNETSDKVERSION}
          • .NET Runtime {DOTNETRUNTIMEVERSION}
            • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -5,7 +5,7 @@
            -

            The following was installed at /usr/local/share/dotnet +

            The following was installed

            • .NET SDK {DOTNETSDKVERSION}
            • .NET Runtime {DOTNETRUNTIMEVERSION}
              • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -5,7 +5,7 @@
              -

              The following was installed at /usr/local/share/dotnet +

              The following was installed

              • .NET SDK {DOTNETSDKVERSION}
              • .NET Runtime {DOTNETRUNTIMEVERSION}
                • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -5,7 +5,7 @@
                -

                The following was installed at /usr/local/share/dotnet +

                The following was installed

                • .NET SDK {DOTNETSDKVERSION}
                • .NET Runtime {DOTNETRUNTIMEVERSION}
                  • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -5,7 +5,7 @@
                  -

                  The following was installed at /usr/local/share/dotnet +

                  The following was installed

                  • .NET SDK {DOTNETSDKVERSION}
                  • .NET Runtime {DOTNETRUNTIMEVERSION}
                    • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -5,7 +5,7 @@
                    -

                    The following was installed at /usr/local/share/dotnet +

                    The following was installed

                    • .NET SDK {DOTNETSDKVERSION}
                    • .NET Runtime {DOTNETRUNTIMEVERSION}
                      • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -5,7 +5,7 @@
                      -

                      The following was installed at /usr/local/share/dotnet +

                      The following was installed

                      • .NET SDK {DOTNETSDKVERSION}
                      • .NET Runtime {DOTNETRUNTIMEVERSION}
                        • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -5,7 +5,7 @@
                        -

                        The following was installed at /usr/local/share/dotnet +

                        The following was installed

                        • .NET SDK {DOTNETSDKVERSION}
                        • .NET Runtime {DOTNETRUNTIMEVERSION}
                          • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -5,7 +5,7 @@
                          -

                          The following was installed at /usr/local/share/dotnet +

                          The following was installed

                          • .NET SDK {DOTNETSDKVERSION}
                          • .NET Runtime {DOTNETRUNTIMEVERSION}
                            • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -5,7 +5,7 @@
                            -

                            The following was installed at /usr/local/share/dotnet +

                            The following was installed

                            • .NET SDK {DOTNETSDKVERSION}
                            • .NET Runtime {DOTNETRUNTIMEVERSION}
                              • From b9452bfa92cd4f1f5a9f83ed717abc6346f9bc22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 22:00:29 +0000 Subject: [PATCH 024/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.22 (#12398) [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 2c8ea69d2..657cd44f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - 33148d0b5e8f91acea7e5a6c2896391d6512f568 + 93064cee8d07ef2177ea3807924bb0a46d257694 - + https://github.com/dotnet/sdk - 33148d0b5e8f91acea7e5a6c2896391d6512f568 + 93064cee8d07ef2177ea3807924bb0a46d257694 diff --git a/eng/Versions.props b/eng/Versions.props index f16e3cc66..ceb5ace17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21515.21 - 6.0.100-rtm.21515.21 + 6.0.100-rtm.21515.22 + 6.0.100-rtm.21515.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 407de8d99d24e00d38160de65c38e69ff5f32891 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Fri, 15 Oct 2021 20:56:31 +0000 Subject: [PATCH 025/164] add patches for building more roslyn projects --- ...ld-more-projects-during-source-build.patch | 125 ++++++++++++++++++ ...e-src-Dependencies-from-source-build.patch | 45 +++++++ 2 files changed, 170 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch new file mode 100644 index 000000000..4cd594d3d --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch @@ -0,0 +1,125 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Thu, 14 Oct 2021 18:24:18 -0500 +Subject: [PATCH] Build more projects during source-build + +Use Roslyn.sln, not Compilers.sln, to build more projects during +source-build. Update ExcludeFromSourceBuild properties to include more +projects and exclude a few projects that shouldn't be in source-build. + +The newly included projects are used by downstream repos. + +PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 +--- + eng/SourceBuild.props | 2 +- + .../Core/Tests}/Directory.Build.props | 0 + .../CodeAnalysis.Debugging}/Directory.Build.props | 0 + src/Dependencies/Microsoft.NetFX20/Directory.Build.props | 6 ++++++ + src/Dependencies/PooledObjects/Directory.Build.props | 6 ++++++ + src/Features/LanguageServer/Directory.Build.props | 6 ++++++ + src/Features/Lsif/Directory.Build.props | 6 ++++++ + src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ + .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 2 -- + 9 files changed, 31 insertions(+), 3 deletions(-) + rename src/{Dependencies => CodeStyle/Core/Tests}/Directory.Build.props (100%) + rename src/{Features => Dependencies/CodeAnalysis.Debugging}/Directory.Build.props (100%) + create mode 100644 src/Dependencies/Microsoft.NetFX20/Directory.Build.props + create mode 100644 src/Dependencies/PooledObjects/Directory.Build.props + create mode 100644 src/Features/LanguageServer/Directory.Build.props + create mode 100644 src/Features/Lsif/Directory.Build.props + create mode 100644 src/NuGet/VisualStudio/Directory.Build.props + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 182f8a9cdb1..92e316a4744 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -11,7 +11,7 @@ + --> + + +- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln" ++ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" + + + +diff --git a/src/Dependencies/Directory.Build.props b/src/CodeStyle/Core/Tests/Directory.Build.props +similarity index 100% +rename from src/Dependencies/Directory.Build.props +rename to src/CodeStyle/Core/Tests/Directory.Build.props +diff --git a/src/Features/Directory.Build.props b/src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props +similarity index 100% +rename from src/Features/Directory.Build.props +rename to src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props +diff --git a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Dependencies/PooledObjects/Directory.Build.props b/src/Dependencies/PooledObjects/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Dependencies/PooledObjects/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/LanguageServer/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Features/Lsif/Directory.Build.props b/src/Features/Lsif/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/Lsif/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/NuGet/VisualStudio/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +index 3bd6d6398e3..2edf2da6d1a 100644 +--- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj ++++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +@@ -7,8 +7,6 @@ + true + netcoreapp3.1;net472 + $(DefineConstants);WORKSPACE_MSBUILD +- true +- + + true + diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch new file mode 100644 index 000000000..0d7e959a3 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 15 Oct 2021 02:41:32 -0500 +Subject: [PATCH] Exclude src/Dependencies from source-build + +This makes source-build stop producing the Microsoft.CodeAnalysis.Collections package. Downstream repos (MSBuild) can't safely use a source-built version. + +PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 +--- + .../{CodeAnalysis.Debugging => }/Directory.Build.props | 0 + src/Dependencies/Microsoft.NetFX20/Directory.Build.props | 6 ------ + src/Dependencies/PooledObjects/Directory.Build.props | 6 ------ + 3 files changed, 12 deletions(-) + rename src/Dependencies/{CodeAnalysis.Debugging => }/Directory.Build.props (100%) + delete mode 100644 src/Dependencies/Microsoft.NetFX20/Directory.Build.props + delete mode 100644 src/Dependencies/PooledObjects/Directory.Build.props + +diff --git a/src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props b/src/Dependencies/Directory.Build.props +similarity index 100% +rename from src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props +rename to src/Dependencies/Directory.Build.props +diff --git a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props +deleted file mode 100644 +index 6eef643958f..00000000000 +--- a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props ++++ /dev/null +@@ -1,6 +0,0 @@ +- +- +- +- true +- +- +diff --git a/src/Dependencies/PooledObjects/Directory.Build.props b/src/Dependencies/PooledObjects/Directory.Build.props +deleted file mode 100644 +index 6eef643958f..00000000000 +--- a/src/Dependencies/PooledObjects/Directory.Build.props ++++ /dev/null +@@ -1,6 +0,0 @@ +- +- +- +- true +- +- From 4a6f5cce993fed39f3793fbcacf60fb5fecbf9e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 22:58:54 +0000 Subject: [PATCH 026/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12400) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21515.2 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21515.2 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.2 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21515.2 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21515.2 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21515.2 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21514-08 to 17.0.0-preview-21515-03 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.2 to 6.0.0-rtm.21515.6 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 657cd44f7..151916efa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 - + https://github.com/dotnet/runtime - 80b753192beadbf8f32df7f981a09eacc5a4d7fd + f94d65ee440037fbcffea87ecfc71eb37057c0d7 - + https://github.com/dotnet/runtime - 80b753192beadbf8f32df7f981a09eacc5a4d7fd + f94d65ee440037fbcffea87ecfc71eb37057c0d7 - + https://github.com/dotnet/runtime - 80b753192beadbf8f32df7f981a09eacc5a4d7fd + f94d65ee440037fbcffea87ecfc71eb37057c0d7 - + https://github.com/dotnet/runtime - 80b753192beadbf8f32df7f981a09eacc5a4d7fd + f94d65ee440037fbcffea87ecfc71eb37057c0d7 - + https://github.com/dotnet/runtime - 80b753192beadbf8f32df7f981a09eacc5a4d7fd + f94d65ee440037fbcffea87ecfc71eb37057c0d7 - + https://github.com/dotnet/runtime - 80b753192beadbf8f32df7f981a09eacc5a4d7fd + f94d65ee440037fbcffea87ecfc71eb37057c0d7 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 80b753192beadbf8f32df7f981a09eacc5a4d7fd + f94d65ee440037fbcffea87ecfc71eb37057c0d7 - + https://github.com/dotnet/aspnetcore - 647c768a25030ad0f8a3568f3766bcc1c254eb76 + fcde7a903c70118a658932c51a1a6111918a3292 - + https://github.com/dotnet/aspnetcore - 647c768a25030ad0f8a3568f3766bcc1c254eb76 + fcde7a903c70118a658932c51a1a6111918a3292 - + https://github.com/dotnet/aspnetcore - 647c768a25030ad0f8a3568f3766bcc1c254eb76 + fcde7a903c70118a658932c51a1a6111918a3292 - + https://github.com/dotnet/aspnetcore - 647c768a25030ad0f8a3568f3766bcc1c254eb76 + fcde7a903c70118a658932c51a1a6111918a3292 - + https://github.com/dotnet/aspnetcore - 647c768a25030ad0f8a3568f3766bcc1c254eb76 + fcde7a903c70118a658932c51a1a6111918a3292 - + https://github.com/dotnet/aspnetcore - 647c768a25030ad0f8a3568f3766bcc1c254eb76 + fcde7a903c70118a658932c51a1a6111918a3292 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - 93064cee8d07ef2177ea3807924bb0a46d257694 + f3057896530fea86a2416f011dd05c06cbe89471 - + https://github.com/dotnet/sdk - 93064cee8d07ef2177ea3807924bb0a46d257694 + f3057896530fea86a2416f011dd05c06cbe89471 @@ -146,9 +146,9 @@ df45061e218c9b5813c5531bc06fb238a23e30f6 - + https://github.com/dotnet/msbuild - b26f1a2dff48b08b58a6effea28b6cf6d8d9a4e2 + d66a44095cd460a3031541cc05310bccab17a9e4 diff --git a/eng/Versions.props b/eng/Versions.props index ceb5ace17..4313618d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,36 +44,36 @@ - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 0.2.0 - 6.0.100-rtm.21515.22 - 6.0.100-rtm.21515.22 + 6.0.100-rtm.21515.28 + 6.0.100-rtm.21515.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21515.2 + 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.2 - 6.0.0-rtm.21515.2 - 6.0.0-rtm.21515.2 - 6.0.0-rtm.21515.2 - 6.0.0-rtm.21515.2 - 6.0.0-rtm.21515.2 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.6 2.1.0 From d2388b06e6d19756c0f04af4ad7e72222b673bef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 00:47:43 +0000 Subject: [PATCH 027/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.29 (#12402) [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 151916efa..269537ea0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - f3057896530fea86a2416f011dd05c06cbe89471 + c95c4bfc2adb606c4103ea5e6e9994214d6ae8a3 - + https://github.com/dotnet/sdk - f3057896530fea86a2416f011dd05c06cbe89471 + c95c4bfc2adb606c4103ea5e6e9994214d6ae8a3 diff --git a/eng/Versions.props b/eng/Versions.props index 4313618d6..deeebbd82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21515.28 - 6.0.100-rtm.21515.28 + 6.0.100-rtm.21515.29 + 6.0.100-rtm.21515.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 400a66ca436ea38a31a2b98510a919d13c58e959 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 00:57:41 +0000 Subject: [PATCH 028/164] Update dependencies from https://github.com/dotnet/arcade build 20211015.3 (#12403) [release/6.0.1xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 269537ea0..369f8b795 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index deeebbd82..d60fdd285 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21513.3 + 6.0.0-beta.21515.3 diff --git a/global.json b/global.json index d6b36eb70..f01235654 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.21513.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21513.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21515.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21515.3" } } From 3640810fcd78906b61f5ac895aba0774d7a10808 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 01:20:48 +0000 Subject: [PATCH 029/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.32 (#12404) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21514.4 to 4.0.0-6.21515.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 369f8b795..6f00d9524 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime f94d65ee440037fbcffea87ecfc71eb37057c0d7 - + https://github.com/dotnet/aspnetcore - fcde7a903c70118a658932c51a1a6111918a3292 + 53d0e3b464f65fc62bc738bb6993fc99e553f316 - + https://github.com/dotnet/aspnetcore - fcde7a903c70118a658932c51a1a6111918a3292 + 53d0e3b464f65fc62bc738bb6993fc99e553f316 - + https://github.com/dotnet/aspnetcore - fcde7a903c70118a658932c51a1a6111918a3292 + 53d0e3b464f65fc62bc738bb6993fc99e553f316 - + https://github.com/dotnet/aspnetcore - fcde7a903c70118a658932c51a1a6111918a3292 + 53d0e3b464f65fc62bc738bb6993fc99e553f316 - + https://github.com/dotnet/aspnetcore - fcde7a903c70118a658932c51a1a6111918a3292 + 53d0e3b464f65fc62bc738bb6993fc99e553f316 - + https://github.com/dotnet/aspnetcore - fcde7a903c70118a658932c51a1a6111918a3292 + 53d0e3b464f65fc62bc738bb6993fc99e553f316 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - c95c4bfc2adb606c4103ea5e6e9994214d6ae8a3 + 8ce5b12c1aa0f9d62bb1bef5c1f6663907a42fb8 - + https://github.com/dotnet/sdk - c95c4bfc2adb606c4103ea5e6e9994214d6ae8a3 + 8ce5b12c1aa0f9d62bb1bef5c1f6663907a42fb8 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - df45061e218c9b5813c5531bc06fb238a23e30f6 + 95b7a0198f8c805b367f17e4639020ec21c16705 diff --git a/eng/Versions.props b/eng/Versions.props index d60fdd285..f4bd7e1d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 0.2.0 - 6.0.100-rtm.21515.29 - 6.0.100-rtm.21515.29 + 6.0.100-rtm.21515.32 + 6.0.100-rtm.21515.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53180d998d35e5226414fc21870defe26ad54a6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 02:11:36 +0000 Subject: [PATCH 030/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12405) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.6 to 6.0.0-rtm.21515.9 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21508.1 to 0.1.0-alpha.1.21515.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 6f00d9524..de12a3d0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 - + https://github.com/dotnet/runtime - f94d65ee440037fbcffea87ecfc71eb37057c0d7 + 730146857b0a31a402e3926fe41d5cc46dfa10df - + https://github.com/dotnet/runtime - f94d65ee440037fbcffea87ecfc71eb37057c0d7 + 730146857b0a31a402e3926fe41d5cc46dfa10df - + https://github.com/dotnet/runtime - f94d65ee440037fbcffea87ecfc71eb37057c0d7 + 730146857b0a31a402e3926fe41d5cc46dfa10df - + https://github.com/dotnet/runtime - f94d65ee440037fbcffea87ecfc71eb37057c0d7 + 730146857b0a31a402e3926fe41d5cc46dfa10df - + https://github.com/dotnet/runtime - f94d65ee440037fbcffea87ecfc71eb37057c0d7 + 730146857b0a31a402e3926fe41d5cc46dfa10df - + https://github.com/dotnet/runtime - f94d65ee440037fbcffea87ecfc71eb37057c0d7 + 730146857b0a31a402e3926fe41d5cc46dfa10df @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f94d65ee440037fbcffea87ecfc71eb37057c0d7 + 730146857b0a31a402e3926fe41d5cc46dfa10df https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d46f8d921ed2a8a6487a8138425b66fb6c9f0374 - + https://github.com/dotnet/sdk - 8ce5b12c1aa0f9d62bb1bef5c1f6663907a42fb8 + 41c0e60a989a952009a76611f620d6cc8182e563 - + https://github.com/dotnet/sdk - 8ce5b12c1aa0f9d62bb1bef5c1f6663907a42fb8 + 41c0e60a989a952009a76611f620d6cc8182e563 @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk 73c8cd3619efc79364fef5fa81989f9e0dd2147b - + https://github.com/dotnet/source-build - b448fa29f5d273d8abf7354402d7b320d5cffcce + 03462c6b31f9c97d4fb0b9bcca7355b81c7fde76 diff --git a/eng/Versions.props b/eng/Versions.props index f4bd7e1d6..d58a55535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21515.32 - 6.0.100-rtm.21515.32 + 6.0.100-rtm.21515.36 + 6.0.100-rtm.21515.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 - 6.0.0-rtm.21515.6 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.9 2.1.0 From 3054c94657cb86d7105ad98f596323b7cd5368d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 02:42:33 +0000 Subject: [PATCH 031/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.38 (#12406) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21515.2 to 6.0.100-rtm.21515.8 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21515.2 to 6.0.100-rtm.21515.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21515.2 to 6.0.100-rtm.21515.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de12a3d0d..25e4be2fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - d46f8d921ed2a8a6487a8138425b66fb6c9f0374 + 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/templating - d46f8d921ed2a8a6487a8138425b66fb6c9f0374 + 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/templating - d46f8d921ed2a8a6487a8138425b66fb6c9f0374 + 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 41c0e60a989a952009a76611f620d6cc8182e563 + 03edd87f14b0d77e658f2db6e46047475169d560 - + https://github.com/dotnet/sdk - 41c0e60a989a952009a76611f620d6cc8182e563 + 03edd87f14b0d77e658f2db6e46047475169d560 diff --git a/eng/Versions.props b/eng/Versions.props index d58a55535..13d945d2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21515.2 + 6.0.100-rtm.21515.8 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21515.36 - 6.0.100-rtm.21515.36 + 6.0.100-rtm.21515.38 + 6.0.100-rtm.21515.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21515.2 + 6.0.100-rtm.21515.8 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From ebbbb2e15d0b5b339773800752614b24c4ac406a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 03:15:23 +0000 Subject: [PATCH 032/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.40 (#12407) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.9 to 6.0.0-rtm.21515.11 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25e4be2fd..80db3cb1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 - + https://github.com/dotnet/runtime - 730146857b0a31a402e3926fe41d5cc46dfa10df + 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 - + https://github.com/dotnet/runtime - 730146857b0a31a402e3926fe41d5cc46dfa10df + 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 - + https://github.com/dotnet/runtime - 730146857b0a31a402e3926fe41d5cc46dfa10df + 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 - + https://github.com/dotnet/runtime - 730146857b0a31a402e3926fe41d5cc46dfa10df + 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 - + https://github.com/dotnet/runtime - 730146857b0a31a402e3926fe41d5cc46dfa10df + 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 - + https://github.com/dotnet/runtime - 730146857b0a31a402e3926fe41d5cc46dfa10df + 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 730146857b0a31a402e3926fe41d5cc46dfa10df + 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 03edd87f14b0d77e658f2db6e46047475169d560 + 889c218cb9de62ff5cabd162a99631c196f41807 - + https://github.com/dotnet/sdk - 03edd87f14b0d77e658f2db6e46047475169d560 + 889c218cb9de62ff5cabd162a99631c196f41807 diff --git a/eng/Versions.props b/eng/Versions.props index 13d945d2d..2863a5992 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21515.38 - 6.0.100-rtm.21515.38 + 6.0.100-rtm.21515.40 + 6.0.100-rtm.21515.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.11 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 - 6.0.0-rtm.21515.9 + 6.0.0-rtm.21515.11 + 6.0.0-rtm.21515.11 + 6.0.0-rtm.21515.11 + 6.0.0-rtm.21515.11 + 6.0.0-rtm.21515.11 + 6.0.0-rtm.21515.11 2.1.0 From 577d57a3896030833022e2b8728c78bc4ecde8ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 05:00:08 +0000 Subject: [PATCH 033/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.41 (#12408) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21514.10 to 6.0.0-rtm.21515.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.10 to 6.0.0-rtm.21515.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21514.10 to 6.0.0-rtm.21515.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21514.10 to 6.0.0-rtm.21515.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21514.10 to 6.0.0-rtm.21515.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21514.10 to 6.0.0-rtm.21515.3 (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 80db3cb1e..5efb6bc3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 + 21b37ecbada4c45250565d873b972d3bfd9104e7 - + https://github.com/dotnet/windowsdesktop - 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 + 21b37ecbada4c45250565d873b972d3bfd9104e7 - + https://github.com/dotnet/windowsdesktop - 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 + 21b37ecbada4c45250565d873b972d3bfd9104e7 - + https://github.com/dotnet/windowsdesktop - 030c583fbf3d290b4b7b8d853cb59c60b1bbb911 + 21b37ecbada4c45250565d873b972d3bfd9104e7 https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 889c218cb9de62ff5cabd162a99631c196f41807 + d5d418036005e0886100c15994bc373eb1b313fa - + https://github.com/dotnet/sdk - 889c218cb9de62ff5cabd162a99631c196f41807 + d5d418036005e0886100c15994bc373eb1b313fa https://github.com/dotnet/winforms 1eab25c83581a91e7c808aed960b0e27cefc54c9 - + https://github.com/dotnet/wpf - 396accedcec6c2fdd18a0e7cd027f6f7db1b3927 + ab1debe519b68f533df9f3d3e3ecd2ea20a8378e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2863a5992..baf88a9ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.0-rtm.21514.10 + 6.0.0-rtm.21515.3 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21515.40 - 6.0.100-rtm.21515.40 + 6.0.100-rtm.21515.41 + 6.0.100-rtm.21515.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21514.10 - 6.0.0-rtm.21514.10 - 6.0.0-rtm.21514.10 - 6.0.0-rtm.21514.10 + 6.0.0-rtm.21515.5 + 6.0.0-rtm.21515.5 + 6.0.0-rtm.21515.5 + 6.0.0-rtm.21515.5 From 4247c0719c7c186a8c59db5f3d2451ff904be1c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 06:08:16 +0000 Subject: [PATCH 034/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.43 (#12409) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21515.20 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21515.20 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21515.20 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21515.20 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21515.20 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21515.20 (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 5efb6bc3e..2b2a2bcd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 - + https://github.com/dotnet/aspnetcore - 53d0e3b464f65fc62bc738bb6993fc99e553f316 + fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 - + https://github.com/dotnet/aspnetcore - 53d0e3b464f65fc62bc738bb6993fc99e553f316 + fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 - + https://github.com/dotnet/aspnetcore - 53d0e3b464f65fc62bc738bb6993fc99e553f316 + fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 - + https://github.com/dotnet/aspnetcore - 53d0e3b464f65fc62bc738bb6993fc99e553f316 + fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 - + https://github.com/dotnet/aspnetcore - 53d0e3b464f65fc62bc738bb6993fc99e553f316 + fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 - + https://github.com/dotnet/aspnetcore - 53d0e3b464f65fc62bc738bb6993fc99e553f316 + fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - d5d418036005e0886100c15994bc373eb1b313fa + 23b95f482da4346ff8158a4f840170fcafee2de9 - + https://github.com/dotnet/sdk - d5d418036005e0886100c15994bc373eb1b313fa + 23b95f482da4346ff8158a4f840170fcafee2de9 diff --git a/eng/Versions.props b/eng/Versions.props index baf88a9ed..e10ce2c8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.20 + 6.0.0-rtm.21515.20 + 6.0.0-rtm.21515.20 + 6.0.0-rtm.21515.20 + 6.0.0-rtm.21515.20 + 6.0.0-rtm.21515.20 0.2.0 - 6.0.100-rtm.21515.41 - 6.0.100-rtm.21515.41 + 6.0.100-rtm.21515.43 + 6.0.100-rtm.21515.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f195c0663aa32adfe8e1691da3a7fe90a101aa70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 07:29:09 +0000 Subject: [PATCH 035/164] Update dependencies from https://github.com/dotnet/sdk build 20211015.45 (#12410) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21515.11 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21515.11 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.11 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21515.11 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21515.11 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21515.11 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.11 to 6.0.0-rtm.21515.15 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b2a2bcd3..ea9acbb57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 21b37ecbada4c45250565d873b972d3bfd9104e7 - + https://github.com/dotnet/runtime - 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 + a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/runtime - 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 + a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/runtime - 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 + a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/runtime - 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 + a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/runtime - 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 + a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/runtime - 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 + a1c550c1228af5b381dc517483ae89ed161df153 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8b0cf9ca8ffc13cba0e665d26c161405cd2bcb84 + a1c550c1228af5b381dc517483ae89ed161df153 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 23b95f482da4346ff8158a4f840170fcafee2de9 + dcf6fff5325961ce3dcbc2e5ce65696f8895d019 - + https://github.com/dotnet/sdk - 23b95f482da4346ff8158a4f840170fcafee2de9 + dcf6fff5325961ce3dcbc2e5ce65696f8895d019 diff --git a/eng/Versions.props b/eng/Versions.props index e10ce2c8f..348ee9aaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21515.43 - 6.0.100-rtm.21515.43 + 6.0.100-rtm.21515.45 + 6.0.100-rtm.21515.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21515.11 + 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.11 - 6.0.0-rtm.21515.11 - 6.0.0-rtm.21515.11 - 6.0.0-rtm.21515.11 - 6.0.0-rtm.21515.11 - 6.0.0-rtm.21515.11 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 + 6.0.0-rtm.21515.15 2.1.0 From 15af705d3a5d4b6f4af7f9f8fe3ea5981b5f4b5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 08:11:03 +0000 Subject: [PATCH 036/164] Update dependencies from https://github.com/dotnet/sdk build 20211016.2 (#12411) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21515.20 to 6.0.0-rtm.21515.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21515.20 to 6.0.0-rtm.21515.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.20 to 6.0.0-rtm.21515.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.20 to 6.0.0-rtm.21515.22 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21515.20 to 6.0.0-rtm.21515.22 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21515.20 to 6.0.0-rtm.21515.22 (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 ea9acbb57..cf10e768d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/aspnetcore - fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 + 55a7eb9991de30a48b7d9529470b5f180b19524d - + https://github.com/dotnet/aspnetcore - fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 + 55a7eb9991de30a48b7d9529470b5f180b19524d - + https://github.com/dotnet/aspnetcore - fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 + 55a7eb9991de30a48b7d9529470b5f180b19524d - + https://github.com/dotnet/aspnetcore - fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 + 55a7eb9991de30a48b7d9529470b5f180b19524d - + https://github.com/dotnet/aspnetcore - fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 + 55a7eb9991de30a48b7d9529470b5f180b19524d - + https://github.com/dotnet/aspnetcore - fb8d5d5522c3d0d7e27bb7803d807739fb7c1fa9 + 55a7eb9991de30a48b7d9529470b5f180b19524d https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - dcf6fff5325961ce3dcbc2e5ce65696f8895d019 + c4fc10bb1e01bfef51a1128122d30744dc47ca5b - + https://github.com/dotnet/sdk - dcf6fff5325961ce3dcbc2e5ce65696f8895d019 + c4fc10bb1e01bfef51a1128122d30744dc47ca5b diff --git a/eng/Versions.props b/eng/Versions.props index 348ee9aaf..7cf44824b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21515.20 - 6.0.0-rtm.21515.20 - 6.0.0-rtm.21515.20 - 6.0.0-rtm.21515.20 - 6.0.0-rtm.21515.20 - 6.0.0-rtm.21515.20 + 6.0.0-rtm.21515.22 + 6.0.0-rtm.21515.22 + 6.0.0-rtm.21515.22 + 6.0.0-rtm.21515.22 + 6.0.0-rtm.21515.22 + 6.0.0-rtm.21515.22 0.2.0 - 6.0.100-rtm.21515.45 - 6.0.100-rtm.21515.45 + 6.0.100-rtm.21516.2 + 6.0.100-rtm.21516.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 942518ff024c1b165383398db0ac0e8e9b412412 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 11:01:47 +0000 Subject: [PATCH 037/164] Update dependencies from https://github.com/dotnet/sdk build 20211016.3 (#12412) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21515.22 to 6.0.0-rtm.21516.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21515.22 to 6.0.0-rtm.21516.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.22 to 6.0.0-rtm.21516.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.22 to 6.0.0-rtm.21516.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21515.22 to 6.0.0-rtm.21516.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21515.22 to 6.0.0-rtm.21516.1 (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 cf10e768d..22bdf80ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/aspnetcore - 55a7eb9991de30a48b7d9529470b5f180b19524d + 53f00629bbb5a4487c413abb262acce173b0797c - + https://github.com/dotnet/aspnetcore - 55a7eb9991de30a48b7d9529470b5f180b19524d + 53f00629bbb5a4487c413abb262acce173b0797c - + https://github.com/dotnet/aspnetcore - 55a7eb9991de30a48b7d9529470b5f180b19524d + 53f00629bbb5a4487c413abb262acce173b0797c - + https://github.com/dotnet/aspnetcore - 55a7eb9991de30a48b7d9529470b5f180b19524d + 53f00629bbb5a4487c413abb262acce173b0797c - + https://github.com/dotnet/aspnetcore - 55a7eb9991de30a48b7d9529470b5f180b19524d + 53f00629bbb5a4487c413abb262acce173b0797c - + https://github.com/dotnet/aspnetcore - 55a7eb9991de30a48b7d9529470b5f180b19524d + 53f00629bbb5a4487c413abb262acce173b0797c https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - c4fc10bb1e01bfef51a1128122d30744dc47ca5b + 68a82ea4aa6e4197a6f9b6879fe2f0821540f01c - + https://github.com/dotnet/sdk - c4fc10bb1e01bfef51a1128122d30744dc47ca5b + 68a82ea4aa6e4197a6f9b6879fe2f0821540f01c diff --git a/eng/Versions.props b/eng/Versions.props index 7cf44824b..2bf7551cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21515.22 - 6.0.0-rtm.21515.22 - 6.0.0-rtm.21515.22 - 6.0.0-rtm.21515.22 - 6.0.0-rtm.21515.22 - 6.0.0-rtm.21515.22 + 6.0.0-rtm.21516.1 + 6.0.0-rtm.21516.1 + 6.0.0-rtm.21516.1 + 6.0.0-rtm.21516.1 + 6.0.0-rtm.21516.1 + 6.0.0-rtm.21516.1 0.2.0 - 6.0.100-rtm.21516.2 - 6.0.100-rtm.21516.2 + 6.0.100-rtm.21516.3 + 6.0.100-rtm.21516.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4673fa8dd75f4fdc0a76b6eaaede0bd48ee213c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 17 Oct 2021 02:23:00 +0000 Subject: [PATCH 038/164] Update dependencies from https://github.com/dotnet/sdk build 20211016.8 (#12414) [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 22bdf80ce..d1a687fae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 68a82ea4aa6e4197a6f9b6879fe2f0821540f01c + eb277e236a1477dc229211dd40f4f7bba25ff38e - + https://github.com/dotnet/sdk - 68a82ea4aa6e4197a6f9b6879fe2f0821540f01c + eb277e236a1477dc229211dd40f4f7bba25ff38e diff --git a/eng/Versions.props b/eng/Versions.props index 2bf7551cc..6a06a5fb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21516.3 - 6.0.100-rtm.21516.3 + 6.0.100-rtm.21516.8 + 6.0.100-rtm.21516.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6169fc37da7cc76281a531ba18f1c6fc97396ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 17 Oct 2021 23:38:30 +0000 Subject: [PATCH 039/164] Update dependencies from https://github.com/dotnet/sdk build 20211017.4 (#12415) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21516.1 to 6.0.0-rtm.21517.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21516.1 to 6.0.0-rtm.21517.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21516.1 to 6.0.0-rtm.21517.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21516.1 to 6.0.0-rtm.21517.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21516.1 to 6.0.0-rtm.21517.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21516.1 to 6.0.0-rtm.21517.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 d1a687fae..8f5bafebe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime a1c550c1228af5b381dc517483ae89ed161df153 - + https://github.com/dotnet/aspnetcore - 53f00629bbb5a4487c413abb262acce173b0797c + e7937b0fb63d1ebb982f500e9134d93f30da6de5 - + https://github.com/dotnet/aspnetcore - 53f00629bbb5a4487c413abb262acce173b0797c + e7937b0fb63d1ebb982f500e9134d93f30da6de5 - + https://github.com/dotnet/aspnetcore - 53f00629bbb5a4487c413abb262acce173b0797c + e7937b0fb63d1ebb982f500e9134d93f30da6de5 - + https://github.com/dotnet/aspnetcore - 53f00629bbb5a4487c413abb262acce173b0797c + e7937b0fb63d1ebb982f500e9134d93f30da6de5 - + https://github.com/dotnet/aspnetcore - 53f00629bbb5a4487c413abb262acce173b0797c + e7937b0fb63d1ebb982f500e9134d93f30da6de5 - + https://github.com/dotnet/aspnetcore - 53f00629bbb5a4487c413abb262acce173b0797c + e7937b0fb63d1ebb982f500e9134d93f30da6de5 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - eb277e236a1477dc229211dd40f4f7bba25ff38e + 8ad8b8d83bbd52fa29571975b78d7417117941af - + https://github.com/dotnet/sdk - eb277e236a1477dc229211dd40f4f7bba25ff38e + 8ad8b8d83bbd52fa29571975b78d7417117941af diff --git a/eng/Versions.props b/eng/Versions.props index 6a06a5fb9..39dec7a7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21516.1 - 6.0.0-rtm.21516.1 - 6.0.0-rtm.21516.1 - 6.0.0-rtm.21516.1 - 6.0.0-rtm.21516.1 - 6.0.0-rtm.21516.1 + 6.0.0-rtm.21517.3 + 6.0.0-rtm.21517.3 + 6.0.0-rtm.21517.3 + 6.0.0-rtm.21517.3 + 6.0.0-rtm.21517.3 + 6.0.0-rtm.21517.3 0.2.0 - 6.0.100-rtm.21516.8 - 6.0.100-rtm.21516.8 + 6.0.100-rtm.21517.4 + 6.0.100-rtm.21517.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 013df0fc306d80b06d9a7bd004a27eaf35cfe3e5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 18 Oct 2021 02:16:38 +0000 Subject: [PATCH 040/164] Update source-build prebuilts and previous source-built --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 39dec7a7b..e33bc3702 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,8 +159,8 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.23 - 0.1.0-6.0.100-30 + 0.1.0-6.0.100-bootstrap.24 + 0.1.0-6.0.100-31 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 365caa902..4f5172e5f 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -22,6 +22,6 @@ 0.1.0-6.0.100- - 30 + 31 From f771064a6df761487fc7169b66fc26615a706804 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 03:36:29 +0000 Subject: [PATCH 041/164] Update dependencies from https://github.com/dotnet/sdk build 20211017.6 (#12418) [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 8f5bafebe..c173ce16a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 8ad8b8d83bbd52fa29571975b78d7417117941af + 1add14eb935aace8b769996307a974ce1de753b9 - + https://github.com/dotnet/sdk - 8ad8b8d83bbd52fa29571975b78d7417117941af + 1add14eb935aace8b769996307a974ce1de753b9 diff --git a/eng/Versions.props b/eng/Versions.props index 39dec7a7b..cdc4cc0d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21517.4 - 6.0.100-rtm.21517.4 + 6.0.100-rtm.21517.6 + 6.0.100-rtm.21517.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd9ce324ee6bb678ef8d34657ad86cd5764bede1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 08:19:38 +0000 Subject: [PATCH 042/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.1 (#12419) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21514.16 to 6.0.0-rtm.21517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21515.3 to 6.0.0-rtm.21517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 c173ce16a..2ef53bed6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 21b37ecbada4c45250565d873b972d3bfd9104e7 + e94662dc8eb09ea9c50f3e132da6014da64a43aa - + https://github.com/dotnet/windowsdesktop - 21b37ecbada4c45250565d873b972d3bfd9104e7 + e94662dc8eb09ea9c50f3e132da6014da64a43aa - + https://github.com/dotnet/windowsdesktop - 21b37ecbada4c45250565d873b972d3bfd9104e7 + e94662dc8eb09ea9c50f3e132da6014da64a43aa - + https://github.com/dotnet/windowsdesktop - 21b37ecbada4c45250565d873b972d3bfd9104e7 + e94662dc8eb09ea9c50f3e132da6014da64a43aa https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 1add14eb935aace8b769996307a974ce1de753b9 + 1b4a7c1c66ff47d971a81360a90c08a768a2aeb8 - + https://github.com/dotnet/sdk - 1add14eb935aace8b769996307a974ce1de753b9 + 1b4a7c1c66ff47d971a81360a90c08a768a2aeb8 - + https://github.com/dotnet/winforms - 1eab25c83581a91e7c808aed960b0e27cefc54c9 + 4f2c62360b84ff6faba86bd3a0f6cd5b7a3ab726 - + https://github.com/dotnet/wpf - ab1debe519b68f533df9f3d3e3ecd2ea20a8378e + 25a68a19de0de45ade5015f0db75aac0092dede6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index cdc4cc0d4..30f07f555 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21514.16 + 6.0.0-rtm.21517.6 - 6.0.0-rtm.21515.3 + 6.0.0-rtm.21517.6 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21517.6 - 6.0.100-rtm.21517.6 + 6.0.100-rtm.21518.1 + 6.0.100-rtm.21518.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21515.5 - 6.0.0-rtm.21515.5 - 6.0.0-rtm.21515.5 - 6.0.0-rtm.21515.5 + 6.0.0-rtm.21517.6 + 6.0.0-rtm.21517.6 + 6.0.0-rtm.21517.6 + 6.0.0-rtm.21517.6 From 623702b1358cb0c40f5d1d208c61a0cbc966473d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 09:38:22 +0000 Subject: [PATCH 043/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.3 (#12420) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ef53bed6..674be3a1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e94662dc8eb09ea9c50f3e132da6014da64a43aa - + https://github.com/dotnet/runtime - a1c550c1228af5b381dc517483ae89ed161df153 + 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/runtime - a1c550c1228af5b381dc517483ae89ed161df153 + 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/runtime - a1c550c1228af5b381dc517483ae89ed161df153 + 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/runtime - a1c550c1228af5b381dc517483ae89ed161df153 + 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/runtime - a1c550c1228af5b381dc517483ae89ed161df153 + 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/runtime - a1c550c1228af5b381dc517483ae89ed161df153 + 92ff02435693486da161626246f016b4f1e7b8e8 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a1c550c1228af5b381dc517483ae89ed161df153 + 92ff02435693486da161626246f016b4f1e7b8e8 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 243e70b8bafe63eaf7953c60aef047e7b830c303 - + https://github.com/dotnet/sdk - 1b4a7c1c66ff47d971a81360a90c08a768a2aeb8 + 42c552ffababd18fbc4f5c28d4ea9e58d002c600 - + https://github.com/dotnet/sdk - 1b4a7c1c66ff47d971a81360a90c08a768a2aeb8 + 42c552ffababd18fbc4f5c28d4ea9e58d002c600 diff --git a/eng/Versions.props b/eng/Versions.props index 30f07f555..c9e34095e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21518.1 - 6.0.100-rtm.21518.1 + 6.0.100-rtm.21518.3 + 6.0.100-rtm.21518.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21515.15 + 6.0.0-rtm.21517.2 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 - 6.0.0-rtm.21515.15 + 6.0.0-rtm.21517.2 + 6.0.0-rtm.21517.2 + 6.0.0-rtm.21517.2 + 6.0.0-rtm.21517.2 + 6.0.0-rtm.21517.2 + 6.0.0-rtm.21517.2 2.1.0 From 4cba5995022e769f2f9688ce44d8fc204559e4d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 11:14:38 +0000 Subject: [PATCH 044/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.6 (#12421) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21515.8 to 6.0.100-rtm.21517.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21515.8 to 6.0.100-rtm.21517.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21515.8 to 6.0.100-rtm.21517.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 674be3a1a..5ade26352 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 243e70b8bafe63eaf7953c60aef047e7b830c303 + 00241290293ece3dedb857dc8f4c67f52f082d59 - + https://github.com/dotnet/templating - 243e70b8bafe63eaf7953c60aef047e7b830c303 + 00241290293ece3dedb857dc8f4c67f52f082d59 - + https://github.com/dotnet/templating - 243e70b8bafe63eaf7953c60aef047e7b830c303 + 00241290293ece3dedb857dc8f4c67f52f082d59 - + https://github.com/dotnet/sdk - 42c552ffababd18fbc4f5c28d4ea9e58d002c600 + c644da11c8da8c6275fd017bb133174140608a24 - + https://github.com/dotnet/sdk - 42c552ffababd18fbc4f5c28d4ea9e58d002c600 + c644da11c8da8c6275fd017bb133174140608a24 diff --git a/eng/Versions.props b/eng/Versions.props index c9e34095e..01e4d8ed7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21515.8 + 6.0.100-rtm.21517.2 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.3 - 6.0.100-rtm.21518.3 + 6.0.100-rtm.21518.6 + 6.0.100-rtm.21518.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21515.8 + 6.0.100-rtm.21517.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From eaa6dd81c4ec8d04f253aaad04fb0a499e3236b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 13:18:56 +0000 Subject: [PATCH 045/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.10 (#12424) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21517.3 to 6.0.0-rtm.21518.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21517.3 to 6.0.0-rtm.21518.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21517.3 to 6.0.0-rtm.21518.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21517.3 to 6.0.0-rtm.21518.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21517.3 to 6.0.0-rtm.21518.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21517.3 to 6.0.0-rtm.21518.1 (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 5ade26352..47087d56a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/aspnetcore - e7937b0fb63d1ebb982f500e9134d93f30da6de5 + 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 - + https://github.com/dotnet/aspnetcore - e7937b0fb63d1ebb982f500e9134d93f30da6de5 + 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 - + https://github.com/dotnet/aspnetcore - e7937b0fb63d1ebb982f500e9134d93f30da6de5 + 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 - + https://github.com/dotnet/aspnetcore - e7937b0fb63d1ebb982f500e9134d93f30da6de5 + 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 - + https://github.com/dotnet/aspnetcore - e7937b0fb63d1ebb982f500e9134d93f30da6de5 + 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 - + https://github.com/dotnet/aspnetcore - e7937b0fb63d1ebb982f500e9134d93f30da6de5 + 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 00241290293ece3dedb857dc8f4c67f52f082d59 - + https://github.com/dotnet/sdk - c644da11c8da8c6275fd017bb133174140608a24 + 26448c83023cd1b7fa25769d64d5e1c6dcc0310b - + https://github.com/dotnet/sdk - c644da11c8da8c6275fd017bb133174140608a24 + 26448c83023cd1b7fa25769d64d5e1c6dcc0310b diff --git a/eng/Versions.props b/eng/Versions.props index 01e4d8ed7..eb58d3454 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21517.3 - 6.0.0-rtm.21517.3 - 6.0.0-rtm.21517.3 - 6.0.0-rtm.21517.3 - 6.0.0-rtm.21517.3 - 6.0.0-rtm.21517.3 + 6.0.0-rtm.21518.1 + 6.0.0-rtm.21518.1 + 6.0.0-rtm.21518.1 + 6.0.0-rtm.21518.1 + 6.0.0-rtm.21518.1 + 6.0.0-rtm.21518.1 0.2.0 - 6.0.100-rtm.21518.6 - 6.0.100-rtm.21518.6 + 6.0.100-rtm.21518.10 + 6.0.100-rtm.21518.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f2a0b984aacf24b63b17db41c8761fa99bd6aa39 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 18 Oct 2021 08:09:27 -0700 Subject: [PATCH 046/164] Switch to stable RTM branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 32f5ec698..90a89dcd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 696312c24b5fb3408a5f1faaa651b78b6741f4b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 15:23:15 +0000 Subject: [PATCH 047/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.14 (#12425) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21517.6 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21517.6 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21517.6 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.1 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.1 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.1 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.1 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21518.1 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21518.1 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21517.6 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21517.6 to 6.0.0-rtm.21518.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21517.6 to 6.0.0-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21517.6 to 6.0.0-rtm.21518.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47087d56a..1df64cc08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - e94662dc8eb09ea9c50f3e132da6014da64a43aa + ca0c7faff25dacc075e88196d9d187fafb60b63e - + https://github.com/dotnet/windowsdesktop - e94662dc8eb09ea9c50f3e132da6014da64a43aa + ca0c7faff25dacc075e88196d9d187fafb60b63e - + https://github.com/dotnet/windowsdesktop - e94662dc8eb09ea9c50f3e132da6014da64a43aa + ca0c7faff25dacc075e88196d9d187fafb60b63e - + https://github.com/dotnet/windowsdesktop - e94662dc8eb09ea9c50f3e132da6014da64a43aa + ca0c7faff25dacc075e88196d9d187fafb60b63e https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/aspnetcore - 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 + afb4990d708390efcdec701e33e5d66c37603d9a - + https://github.com/dotnet/aspnetcore - 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 + afb4990d708390efcdec701e33e5d66c37603d9a - + https://github.com/dotnet/aspnetcore - 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 + afb4990d708390efcdec701e33e5d66c37603d9a - + https://github.com/dotnet/aspnetcore - 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 + afb4990d708390efcdec701e33e5d66c37603d9a - + https://github.com/dotnet/aspnetcore - 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 + afb4990d708390efcdec701e33e5d66c37603d9a - + https://github.com/dotnet/aspnetcore - 98ae00feda806c6cf6ccf42995d1dbc26bb2dd45 + afb4990d708390efcdec701e33e5d66c37603d9a https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 00241290293ece3dedb857dc8f4c67f52f082d59 - + https://github.com/dotnet/sdk - 26448c83023cd1b7fa25769d64d5e1c6dcc0310b + 258147e696a37dda5d6da0c7c6a585869d08bed4 - + https://github.com/dotnet/sdk - 26448c83023cd1b7fa25769d64d5e1c6dcc0310b + 258147e696a37dda5d6da0c7c6a585869d08bed4 - + https://github.com/dotnet/winforms - 4f2c62360b84ff6faba86bd3a0f6cd5b7a3ab726 + 8f0e966c73a333e61158431ee07b50e4226c2489 - + https://github.com/dotnet/wpf - 25a68a19de0de45ade5015f0db75aac0092dede6 + 918ee86568586e48678db572165154ea7da8c713 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 32f5ec698..1bf146cf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21517.6 + 6.0.0-rtm.21518.2 - 6.0.0-rtm.21517.6 + 6.0.0-rtm.21518.5 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21518.1 - 6.0.0-rtm.21518.1 - 6.0.0-rtm.21518.1 - 6.0.0-rtm.21518.1 - 6.0.0-rtm.21518.1 - 6.0.0-rtm.21518.1 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 0.2.0 - 6.0.100-rtm.21518.10 - 6.0.100-rtm.21518.10 + 6.0.100-rtm.21518.14 + 6.0.100-rtm.21518.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21517.6 - 6.0.0-rtm.21517.6 - 6.0.0-rtm.21517.6 - 6.0.0-rtm.21517.6 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.3 From 8452fc4b22b703723553deb4b1d24687fdb92464 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 16:09:07 +0000 Subject: [PATCH 048/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.18 (#12428) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21517.2 to 6.0.100-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21517.2 to 6.0.100-rtm.21518.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21517.2 to 6.0.100-rtm.21518.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1df64cc08..650ef539f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 00241290293ece3dedb857dc8f4c67f52f082d59 + b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/templating - 00241290293ece3dedb857dc8f4c67f52f082d59 + b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/templating - 00241290293ece3dedb857dc8f4c67f52f082d59 + b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 258147e696a37dda5d6da0c7c6a585869d08bed4 + 48c96233c589f714e4db3379a61552cc25763157 - + https://github.com/dotnet/sdk - 258147e696a37dda5d6da0c7c6a585869d08bed4 + 48c96233c589f714e4db3379a61552cc25763157 diff --git a/eng/Versions.props b/eng/Versions.props index 1bf146cf9..6c9c6737f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21517.2 + 6.0.100-rtm.21518.3 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.14 - 6.0.100-rtm.21518.14 + 6.0.100-rtm.21518.18 + 6.0.100-rtm.21518.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21517.2 + 6.0.100-rtm.21518.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 0ed648d529f0dec568652a112cdcda9e8034ae97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 16:51:38 +0000 Subject: [PATCH 049/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.20 (#12429) [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 650ef539f..48f114e44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 48c96233c589f714e4db3379a61552cc25763157 + 3654140be5bee7afb236ff811ac7b33f2d74f380 - + https://github.com/dotnet/sdk - 48c96233c589f714e4db3379a61552cc25763157 + 3654140be5bee7afb236ff811ac7b33f2d74f380 diff --git a/eng/Versions.props b/eng/Versions.props index 6c9c6737f..5ad2fee3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.18 - 6.0.100-rtm.21518.18 + 6.0.100-rtm.21518.20 + 6.0.100-rtm.21518.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90703bce9ef62e2394308810cde2d999a57e54e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 18:11:25 +0000 Subject: [PATCH 050/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211018.1 (#12430) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 48f114e44..7bca3a0dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - b4a79cfec6f36bae56cecef07f9188c41f02ef32 + cd98d6537bd2b90ae6e97575b03c42cea2735166 From 68c7f22c0aeaa62ec8e094521c58a40e6e691a78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 18:38:23 +0000 Subject: [PATCH 051/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.24 (#12431) [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 7bca3a0dc..40a98c216 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 3654140be5bee7afb236ff811ac7b33f2d74f380 + 26b71abdb1dc72214b842d42056b8ce32f4eb6dc - + https://github.com/dotnet/sdk - 3654140be5bee7afb236ff811ac7b33f2d74f380 + 26b71abdb1dc72214b842d42056b8ce32f4eb6dc diff --git a/eng/Versions.props b/eng/Versions.props index 5ad2fee3e..87c43db3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.20 - 6.0.100-rtm.21518.20 + 6.0.100-rtm.21518.24 + 6.0.100-rtm.21518.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18d5f714612c09feb274801a23abe1f292169e21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 20:13:03 +0000 Subject: [PATCH 052/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211018.2 (#12433) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 40a98c216..b28f2b3de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - cd98d6537bd2b90ae6e97575b03c42cea2735166 + d0cda09fed8040f7100b66914f2a1995894d8c14 From 0e5cf1b0a4bc167677aabb0176ac926b1c50296d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 20:19:29 +0000 Subject: [PATCH 053/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12432) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21518.3 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21518.3 to 6.0.0-rtm.21518.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21518.3 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21518.3 to 6.0.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 5 +++++ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index c6dfa67b0..95988fa5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b28f2b3de..65618eaf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - ca0c7faff25dacc075e88196d9d187fafb60b63e + 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 - + https://github.com/dotnet/windowsdesktop - ca0c7faff25dacc075e88196d9d187fafb60b63e + 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 - + https://github.com/dotnet/windowsdesktop - ca0c7faff25dacc075e88196d9d187fafb60b63e + 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 - + https://github.com/dotnet/windowsdesktop - ca0c7faff25dacc075e88196d9d187fafb60b63e + 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 92ff02435693486da161626246f016b4f1e7b8e8 - + https://github.com/dotnet/aspnetcore - afb4990d708390efcdec701e33e5d66c37603d9a + dcee38b158b2eaf9e48de989de94f107dec752bd - + https://github.com/dotnet/aspnetcore - afb4990d708390efcdec701e33e5d66c37603d9a + dcee38b158b2eaf9e48de989de94f107dec752bd - + https://github.com/dotnet/aspnetcore - afb4990d708390efcdec701e33e5d66c37603d9a + dcee38b158b2eaf9e48de989de94f107dec752bd - + https://github.com/dotnet/aspnetcore - afb4990d708390efcdec701e33e5d66c37603d9a + dcee38b158b2eaf9e48de989de94f107dec752bd - + https://github.com/dotnet/aspnetcore - afb4990d708390efcdec701e33e5d66c37603d9a + dcee38b158b2eaf9e48de989de94f107dec752bd - + https://github.com/dotnet/aspnetcore - afb4990d708390efcdec701e33e5d66c37603d9a + dcee38b158b2eaf9e48de989de94f107dec752bd https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 26b71abdb1dc72214b842d42056b8ce32f4eb6dc + 539c03a880bef5f5ca27164eff0a217521509356 - + https://github.com/dotnet/sdk - 26b71abdb1dc72214b842d42056b8ce32f4eb6dc + 539c03a880bef5f5ca27164eff0a217521509356 diff --git a/eng/Versions.props b/eng/Versions.props index 87c43db3b..1648451e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.7 + 6.0.0-rtm.21518.7 + 6.0.0-rtm.21518.7 + 6.0.0-rtm.21518.7 + 6.0.0-rtm.21518.7 + 6.0.0-rtm.21518.7 0.2.0 - 6.0.100-rtm.21518.24 - 6.0.100-rtm.21518.24 + 6.0.100-rtm.21518.33 + 6.0.100-rtm.21518.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 - 6.0.0-rtm.21518.3 + 6.0.0-rtm.21518.9 + 6.0.0-rtm.21518.9 + 6.0.0 + 6.0.0 From a1772c7f17c456e3232134d68a48893b5445c63b Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 18 Oct 2021 15:49:31 -0500 Subject: [PATCH 054/164] Add DotNetHost runtime patch. This should only be necessary until https://github.com/dotnet/runtime/pull/60577 is merged. --- ...ges-are-not-created-during-source-bu.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch b/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch new file mode 100644 index 000000000..0d13c1cf5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0002-DotNetHost-packages-are-not-created-during-source-bu.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric Erhardt +Date: Mon, 18 Oct 2021 15:47:39 -0500 +Subject: [PATCH] DotNetHost packages are not created during source-build + +The subset `host.pkg` is not producing the DotNetHost* NuGet packages. This is because the "Pack" target is getting invoked on the pkgprojs, but pkgprojs expect the "Build" target to be called. Since the "Pack" target is overriden in the Directory.Build.targets to be empty, no one is calling the "Build" target on the pkgprojs. + +In an official build, a later subset `packs.tests` comes through and builds `Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj`, which explicitly calls "Build" on the pkgprojs. So official builds still get these packages produced. + +In source-build, we are no longer building the `packs.tests` subset, so the packages are not produced. + +See also: +* https://github.com/dotnet/runtime/pull/60575 +* https://github.com/dotnet/runtime/pull/60577 +--- + src/installer/Directory.Build.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets +index c6e8cf1a140..dccb8277ba7 100644 +--- a/src/installer/Directory.Build.targets ++++ b/src/installer/Directory.Build.targets +@@ -15,5 +15,5 @@ + + + +- ++ + From 82cfc6b0daf7381279d950194505ecfe823de0a0 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 18 Oct 2021 16:04:37 -0500 Subject: [PATCH 055/164] dotnet/aspnetcore: Enable targeting pack build during source-build --- ...eting-pack-build-during-source-build.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch new file mode 100644 index 000000000..a39dd0021 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch @@ -0,0 +1,61 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Mon, 18 Oct 2021 14:25:29 -0500 +Subject: [PATCH] Enable targeting pack build during source-build + +For prebuilt removal: https://github.com/dotnet/source-build/issues/2506 + +Upstream PR to main: https://github.com/dotnet/aspnetcore/pull/37652 +--- + Directory.Build.props | 1 - + Directory.Build.targets | 4 ++-- + .../CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj | 7 +++++++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 204df64da7..77045590cd 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -142,7 +142,6 @@ + aspnetcore-targeting-pack + + +- false + false + true +diff --git a/Directory.Build.targets b/Directory.Build.targets +index 6e30c30881..1f1616124b 100644 +--- a/Directory.Build.targets ++++ b/Directory.Build.targets +@@ -1,10 +1,10 @@ +  + + +- ++ + + true ++ Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(MSBuildProjectName)' != '$(TargetingPackName)' and '$(IsAnalyzersProject)' != 'true'">true + + +diff --git a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj +index d70178504e..02bad93889 100644 +--- a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj ++++ b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj +@@ -2,6 +2,13 @@ + + CSharp CodeFixes for ASP.NET Core. + false ++ ++ true + false + netstandard2.0 + false From a0ead2cec9b86516a8db3a6f4176e5b8780de21c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 21:56:26 +0000 Subject: [PATCH 056/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.34 (#12436) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65618eaf1..267be63ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 - + https://github.com/dotnet/runtime - 92ff02435693486da161626246f016b4f1e7b8e8 + 7785ce1aed2506859b8193a7073a8b1e394a6c29 - + https://github.com/dotnet/runtime - 92ff02435693486da161626246f016b4f1e7b8e8 + 7785ce1aed2506859b8193a7073a8b1e394a6c29 - + https://github.com/dotnet/runtime - 92ff02435693486da161626246f016b4f1e7b8e8 + 7785ce1aed2506859b8193a7073a8b1e394a6c29 - + https://github.com/dotnet/runtime - 92ff02435693486da161626246f016b4f1e7b8e8 + 7785ce1aed2506859b8193a7073a8b1e394a6c29 - + https://github.com/dotnet/runtime - 92ff02435693486da161626246f016b4f1e7b8e8 + 7785ce1aed2506859b8193a7073a8b1e394a6c29 - + https://github.com/dotnet/runtime - 92ff02435693486da161626246f016b4f1e7b8e8 + 7785ce1aed2506859b8193a7073a8b1e394a6c29 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 92ff02435693486da161626246f016b4f1e7b8e8 + 7785ce1aed2506859b8193a7073a8b1e394a6c29 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 539c03a880bef5f5ca27164eff0a217521509356 + fde6f0440046b325f913d8d885780f4fa9fdfa5e - + https://github.com/dotnet/sdk - 539c03a880bef5f5ca27164eff0a217521509356 + fde6f0440046b325f913d8d885780f4fa9fdfa5e diff --git a/eng/Versions.props b/eng/Versions.props index 1648451e2..642b45153 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21518.33 - 6.0.100-rtm.21518.33 + 6.0.100-rtm.21518.34 + 6.0.100-rtm.21518.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21517.2 + 6.0.0-rtm.21518.4 - 6.0.0-rtm.21517.2 - 6.0.0-rtm.21517.2 - 6.0.0-rtm.21517.2 - 6.0.0-rtm.21517.2 - 6.0.0-rtm.21517.2 - 6.0.0-rtm.21517.2 + 6.0.0-rtm.21518.4 + 6.0.0-rtm.21518.4 + 6.0.0-rtm.21518.4 + 6.0.0-rtm.21518.4 + 6.0.0-rtm.21518.4 + 6.0.0-rtm.21518.4 2.1.0 From 98396fc664ce30a69d43a456527dd0ef1ae47405 Mon Sep 17 00:00:00 2001 From: "msimons@microsoft.com" Date: Mon, 18 Oct 2021 22:14:57 +0000 Subject: [PATCH 057/164] Resolve arcade nuget prebuilts --- .../tarball/content/repos/arcade.proj | 28 +----- ...rade-newtonsoft-dependency-to-13.0.1.patch | 86 +++++++++++++++++++ 2 files changed, 90 insertions(+), 24 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/arcade/0010-Upgrade-newtonsoft-dependency-to-13.0.1.patch diff --git a/src/SourceBuild/tarball/content/repos/arcade.proj b/src/SourceBuild/tarball/content/repos/arcade.proj index 7c743ded7..f5da6fc94 100644 --- a/src/SourceBuild/tarball/content/repos/arcade.proj +++ b/src/SourceBuild/tarball/content/repos/arcade.proj @@ -32,33 +32,13 @@ + + + + - - - - - - - - - - - - - - %(PreviouslySourceBuiltNuGetPackageInfo.PackageVersion) - $(BuildCommand) /p:NuGetVersion=$(PreviouslySourceBuiltNuGetVersion) - - - diff --git a/src/SourceBuild/tarball/patches/arcade/0010-Upgrade-newtonsoft-dependency-to-13.0.1.patch b/src/SourceBuild/tarball/patches/arcade/0010-Upgrade-newtonsoft-dependency-to-13.0.1.patch new file mode 100644 index 000000000..3a13c271f --- /dev/null +++ b/src/SourceBuild/tarball/patches/arcade/0010-Upgrade-newtonsoft-dependency-to-13.0.1.patch @@ -0,0 +1,86 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "msimons@microsoft.com" +Date: Mon, 18 Oct 2021 19:31:58 +0000 +Subject: [PATCH] Upgrade newtonsoft dependency to 13.0.1 + +--- + Directory.Build.props | 10 ---------- + eng/Versions.props | 2 +- + .../Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj | 2 -- + .../Microsoft.DotNet.Helix.Sdk.Tests.csproj | 2 ++ + .../Microsoft.DotNet.VersionTools.Tasks.Tests.csproj | 2 ++ + 5 files changed, 5 insertions(+), 13 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 960eb6c9..37feef5e 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -18,16 +18,6 @@ + $(NoWarn);NU1603 + + +- +- +- 9.0.1 +- +- + + +- + + + +diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj +index 5de33cd0..fbe08347 100644 +--- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj ++++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj +@@ -11,6 +11,8 @@ + + + ++ ++ + + + +diff --git a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj +index 7d9fb9a1..193648cb 100644 +--- a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj ++++ b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj +@@ -7,6 +7,8 @@ + + + ++ ++ + + + From 34b2e939e11dfc1371767c5cdb0f806c499d7fe6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 22:47:32 +0000 Subject: [PATCH 058/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211018.3 (#12437) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 267be63ee..b6625c78f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - d0cda09fed8040f7100b66914f2a1995894d8c14 + a0fb9a743e28ddbd9d4f9f638ae4477979cbf276 From a77268933f3b6c35b83c48c26c9be7db3adb5b0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 23:48:14 +0000 Subject: [PATCH 059/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12439) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21518.4 to 6.0.0-rtm.21518.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.4 to 6.0.0-rtm.21518.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.4 to 6.0.0-rtm.21518.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21518.4 to 6.0.0-rtm.21518.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21518.4 to 6.0.0-rtm.21518.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21518.4 to 6.0.0-rtm.21518.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.7 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.7 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.7 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.7 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21518.7 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21518.7 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.4 to 6.0.0-rtm.21518.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6625c78f..2fd572c51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 - + https://github.com/dotnet/runtime - 7785ce1aed2506859b8193a7073a8b1e394a6c29 + ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/runtime - 7785ce1aed2506859b8193a7073a8b1e394a6c29 + ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/runtime - 7785ce1aed2506859b8193a7073a8b1e394a6c29 + ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/runtime - 7785ce1aed2506859b8193a7073a8b1e394a6c29 + ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/runtime - 7785ce1aed2506859b8193a7073a8b1e394a6c29 + ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/runtime - 7785ce1aed2506859b8193a7073a8b1e394a6c29 + ac21bbf3c2dabc2c424930acb00c4c0fac383f34 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7785ce1aed2506859b8193a7073a8b1e394a6c29 + ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/aspnetcore - dcee38b158b2eaf9e48de989de94f107dec752bd + cfabc4242644352503512f53ab660202499cf51e - + https://github.com/dotnet/aspnetcore - dcee38b158b2eaf9e48de989de94f107dec752bd + cfabc4242644352503512f53ab660202499cf51e - + https://github.com/dotnet/aspnetcore - dcee38b158b2eaf9e48de989de94f107dec752bd + cfabc4242644352503512f53ab660202499cf51e - + https://github.com/dotnet/aspnetcore - dcee38b158b2eaf9e48de989de94f107dec752bd + cfabc4242644352503512f53ab660202499cf51e - + https://github.com/dotnet/aspnetcore - dcee38b158b2eaf9e48de989de94f107dec752bd + cfabc4242644352503512f53ab660202499cf51e - + https://github.com/dotnet/aspnetcore - dcee38b158b2eaf9e48de989de94f107dec752bd + cfabc4242644352503512f53ab660202499cf51e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - fde6f0440046b325f913d8d885780f4fa9fdfa5e + 999493c23f5ca505988718e30a0e7c815dc96767 - + https://github.com/dotnet/sdk - fde6f0440046b325f913d8d885780f4fa9fdfa5e + 999493c23f5ca505988718e30a0e7c815dc96767 diff --git a/eng/Versions.props b/eng/Versions.props index 642b45153..2c2e073d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,36 +44,36 @@ - 6.0.0-rtm.21518.7 - 6.0.0-rtm.21518.7 - 6.0.0-rtm.21518.7 - 6.0.0-rtm.21518.7 - 6.0.0-rtm.21518.7 - 6.0.0-rtm.21518.7 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 0.2.0 - 6.0.100-rtm.21518.34 - 6.0.100-rtm.21518.34 + 6.0.100-rtm.21518.39 + 6.0.100-rtm.21518.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21518.4 + 6.0.0-rtm.21518.8 - 6.0.0-rtm.21518.4 - 6.0.0-rtm.21518.4 - 6.0.0-rtm.21518.4 - 6.0.0-rtm.21518.4 - 6.0.0-rtm.21518.4 - 6.0.0-rtm.21518.4 + 6.0.0-rtm.21518.8 + 6.0.0-rtm.21518.8 + 6.0.0-rtm.21518.8 + 6.0.0-rtm.21518.8 + 6.0.0-rtm.21518.8 + 6.0.0-rtm.21518.8 2.1.0 From 87d65a7283fd6711919fbf7fb4003fb4b93f8a58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 00:09:14 +0000 Subject: [PATCH 060/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211018.4 (#12440) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 2fd572c51..86922e9c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - a0fb9a743e28ddbd9d4f9f638ae4477979cbf276 + 54354d1a40acf8e12f298ddbff350d1a80fbbb38 From 5245649d9dd5559739c319f96d7b2a6b77e91f96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 00:43:59 +0000 Subject: [PATCH 061/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.41 (#12442) [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 86922e9c6..4092c61e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 999493c23f5ca505988718e30a0e7c815dc96767 + 16f7326a19bd05cf72daa71b6677f7a1661cac88 - + https://github.com/dotnet/sdk - 999493c23f5ca505988718e30a0e7c815dc96767 + 16f7326a19bd05cf72daa71b6677f7a1661cac88 diff --git a/eng/Versions.props b/eng/Versions.props index 2c2e073d9..26b08cedb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.39 - 6.0.100-rtm.21518.39 + 6.0.100-rtm.21518.41 + 6.0.100-rtm.21518.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f93d2a775bd6daa99f957c7f51769e373087b3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 01:14:34 +0000 Subject: [PATCH 062/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.42 (#12443) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (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 4092c61e0..a3f7c0667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/aspnetcore - cfabc4242644352503512f53ab660202499cf51e + 5d7af3ee165238d10acfc2760796767137e7f411 - + https://github.com/dotnet/aspnetcore - cfabc4242644352503512f53ab660202499cf51e + 5d7af3ee165238d10acfc2760796767137e7f411 - + https://github.com/dotnet/aspnetcore - cfabc4242644352503512f53ab660202499cf51e + 5d7af3ee165238d10acfc2760796767137e7f411 - + https://github.com/dotnet/aspnetcore - cfabc4242644352503512f53ab660202499cf51e + 5d7af3ee165238d10acfc2760796767137e7f411 - + https://github.com/dotnet/aspnetcore - cfabc4242644352503512f53ab660202499cf51e + 5d7af3ee165238d10acfc2760796767137e7f411 - + https://github.com/dotnet/aspnetcore - cfabc4242644352503512f53ab660202499cf51e + 5d7af3ee165238d10acfc2760796767137e7f411 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 16f7326a19bd05cf72daa71b6677f7a1661cac88 + 573d68a5719059be35f283f86ff9cd5baccfaa65 - + https://github.com/dotnet/sdk - 16f7326a19bd05cf72daa71b6677f7a1661cac88 + 573d68a5719059be35f283f86ff9cd5baccfaa65 diff --git a/eng/Versions.props b/eng/Versions.props index 26b08cedb..30d50846b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.14 0.2.0 - 6.0.100-rtm.21518.41 - 6.0.100-rtm.21518.41 + 6.0.100-rtm.21518.42 + 6.0.100-rtm.21518.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e392cd5e6d2d1f646b4ab561f0c380336e587e74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 03:03:23 +0000 Subject: [PATCH 063/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.45 (#12444) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21518.2 to 6.0.0-rtm.21518.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21518.5 to 6.0.0-rtm.21518.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 95988fa5b..d00c93170 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3f7c0667..e4799461b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 + f22ff8b39a792223f335f7cadf937bb3fe1d886e - + https://github.com/dotnet/windowsdesktop - 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 + f22ff8b39a792223f335f7cadf937bb3fe1d886e - + https://github.com/dotnet/windowsdesktop - 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 + f22ff8b39a792223f335f7cadf937bb3fe1d886e https://github.com/dotnet/windowsdesktop - 234831dbf01dc6f1bfd7a8e5ff7b112cc56d9088 + f22ff8b39a792223f335f7cadf937bb3fe1d886e https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 573d68a5719059be35f283f86ff9cd5baccfaa65 + 85088e041d68971c222841111441601cf558bf7b - + https://github.com/dotnet/sdk - 573d68a5719059be35f283f86ff9cd5baccfaa65 + 85088e041d68971c222841111441601cf558bf7b - + https://github.com/dotnet/winforms - 8f0e966c73a333e61158431ee07b50e4226c2489 + 7f142cb2881f5ad828e2ded52903f6e0c0ca7fb2 - + https://github.com/dotnet/wpf - 918ee86568586e48678db572165154ea7da8c713 + 9b2f3bf0eb86fa13478b7e951c3d8cbaacad31c3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 30d50846b..4e12a4951 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21518.2 + 6.0.0-rtm.21518.6 - 6.0.0-rtm.21518.5 + 6.0.0-rtm.21518.9 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.42 - 6.0.100-rtm.21518.42 + 6.0.100-rtm.21518.45 + 6.0.100-rtm.21518.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.0-rtm.21518.9 - 6.0.0-rtm.21518.9 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 6.0.0 6.0.0 From e2cded5205e722942ecd22c51a9fe04b3fc35d20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 03:32:53 +0000 Subject: [PATCH 064/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211018.5 (#12445) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 e4799461b..9bcf35b73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - 54354d1a40acf8e12f298ddbff350d1a80fbbb38 + 9442be44ffcd224aa611e31e78e6cd23cbeb26bc From a896cafdfa07a69040a96a6bdb9fdf2db2db386c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 03:49:29 +0000 Subject: [PATCH 065/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.48 (#12446) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (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 9bcf35b73..661051b27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime ac21bbf3c2dabc2c424930acb00c4c0fac383f34 - + https://github.com/dotnet/aspnetcore - 5d7af3ee165238d10acfc2760796767137e7f411 + 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 - + https://github.com/dotnet/aspnetcore - 5d7af3ee165238d10acfc2760796767137e7f411 + 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 - + https://github.com/dotnet/aspnetcore - 5d7af3ee165238d10acfc2760796767137e7f411 + 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 - + https://github.com/dotnet/aspnetcore - 5d7af3ee165238d10acfc2760796767137e7f411 + 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 - + https://github.com/dotnet/aspnetcore - 5d7af3ee165238d10acfc2760796767137e7f411 + 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 - + https://github.com/dotnet/aspnetcore - 5d7af3ee165238d10acfc2760796767137e7f411 + 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 85088e041d68971c222841111441601cf558bf7b + 3b2c07c41bf8de699764b324847ad25792a45143 - + https://github.com/dotnet/sdk - 85088e041d68971c222841111441601cf558bf7b + 3b2c07c41bf8de699764b324847ad25792a45143 diff --git a/eng/Versions.props b/eng/Versions.props index 4e12a4951..4f9d6d73b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21518.14 - 6.0.0-rtm.21518.14 - 6.0.0-rtm.21518.14 - 6.0.0-rtm.21518.14 - 6.0.0-rtm.21518.14 - 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.18 + 6.0.0-rtm.21518.18 + 6.0.0-rtm.21518.18 + 6.0.0-rtm.21518.18 + 6.0.0-rtm.21518.18 + 6.0.0-rtm.21518.18 0.2.0 - 6.0.100-rtm.21518.45 - 6.0.100-rtm.21518.45 + 6.0.100-rtm.21518.48 + 6.0.100-rtm.21518.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33753c85f084126e6f52b994bdc1aeda99fb48f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 03:51:12 +0000 Subject: [PATCH 066/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.51 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.51 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++++---------- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index d00c93170..96b9503b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 661051b27..8d0e0c5ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://github.com/dotnet/windowsdesktop - f22ff8b39a792223f335f7cadf937bb3fe1d886e + eb0c518052937527d1fc8193a3c7b92d683d6bea - + https://github.com/dotnet/windowsdesktop - f22ff8b39a792223f335f7cadf937bb3fe1d886e + eb0c518052937527d1fc8193a3c7b92d683d6bea - + https://github.com/dotnet/windowsdesktop - f22ff8b39a792223f335f7cadf937bb3fe1d886e + eb0c518052937527d1fc8193a3c7b92d683d6bea https://github.com/dotnet/windowsdesktop - f22ff8b39a792223f335f7cadf937bb3fe1d886e + eb0c518052937527d1fc8193a3c7b92d683d6bea - + https://github.com/dotnet/runtime - ac21bbf3c2dabc2c424930acb00c4c0fac383f34 + 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/runtime - ac21bbf3c2dabc2c424930acb00c4c0fac383f34 + 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/runtime - ac21bbf3c2dabc2c424930acb00c4c0fac383f34 + 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/runtime - ac21bbf3c2dabc2c424930acb00c4c0fac383f34 + 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/runtime - ac21bbf3c2dabc2c424930acb00c4c0fac383f34 + 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/runtime - ac21bbf3c2dabc2c424930acb00c4c0fac383f34 + 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ac21bbf3c2dabc2c424930acb00c4c0fac383f34 + 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 https://github.com/dotnet/aspnetcore @@ -103,23 +103,23 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 3b2c07c41bf8de699764b324847ad25792a45143 + 85c7f151eec232c0d8fb586eb3da541ba9c9ee06 - + https://github.com/dotnet/sdk - 3b2c07c41bf8de699764b324847ad25792a45143 + 85c7f151eec232c0d8fb586eb3da541ba9c9ee06 - + https://github.com/dotnet/winforms - 7f142cb2881f5ad828e2ded52903f6e0c0ca7fb2 + e73e15755db6f219e05030ca650debd5b5df8e4c - + https://github.com/dotnet/wpf - 9b2f3bf0eb86fa13478b7e951c3d8cbaacad31c3 + f132a103cbf5e334699485b547dcac564c9e111f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4f9d6d73b..3cdfdc3d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21518.6 + 6.0.0-rtm.21518.9 - 6.0.0-rtm.21518.9 + 6.0.0-rtm.21518.11 @@ -56,30 +56,30 @@ - 6.0.100-rtm.21518.48 - 6.0.100-rtm.21518.48 + 6.0.100-rtm.21518.51 + 6.0.100-rtm.21518.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21518.8 + 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.8 - 6.0.0-rtm.21518.8 - 6.0.0-rtm.21518.8 - 6.0.0-rtm.21518.8 - 6.0.0-rtm.21518.8 - 6.0.0-rtm.21518.8 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.12 2.1.0 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 + 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.14 6.0.0 6.0.0 From 0f9e17c468bfa54cf0b2a8fcd54d06704736f5ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 04:27:16 +0000 Subject: [PATCH 067/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.53 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.53 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.0 (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 8d0e0c5ce..38e305bba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/aspnetcore - 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 + c01686185a4ceb8e0c6597a38a57abe2cd059b33 - + https://github.com/dotnet/aspnetcore - 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 + c01686185a4ceb8e0c6597a38a57abe2cd059b33 - + https://github.com/dotnet/aspnetcore - 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 + c01686185a4ceb8e0c6597a38a57abe2cd059b33 - + https://github.com/dotnet/aspnetcore - 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 + c01686185a4ceb8e0c6597a38a57abe2cd059b33 - + https://github.com/dotnet/aspnetcore - 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 + c01686185a4ceb8e0c6597a38a57abe2cd059b33 - + https://github.com/dotnet/aspnetcore - 230b3e1bc9c7fcf2faf414f5e844e011ff23e2f9 + c01686185a4ceb8e0c6597a38a57abe2cd059b33 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - 85c7f151eec232c0d8fb586eb3da541ba9c9ee06 + ef8caa3a5b1e6da22e265b0da70ac9e4ff19019c - + https://github.com/dotnet/sdk - 85c7f151eec232c0d8fb586eb3da541ba9c9ee06 + ef8caa3a5b1e6da22e265b0da70ac9e4ff19019c diff --git a/eng/Versions.props b/eng/Versions.props index 3cdfdc3d4..12ffd0b65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21518.18 - 6.0.0-rtm.21518.18 - 6.0.0-rtm.21518.18 - 6.0.0-rtm.21518.18 - 6.0.0-rtm.21518.18 - 6.0.0-rtm.21518.18 + 6.0.0-rtm.21518.20 + 6.0.0-rtm.21518.20 + 6.0.0-rtm.21518.20 + 6.0.0-rtm.21518.20 + 6.0.0-rtm.21518.20 + 6.0.0-rtm.21518.20 0.2.0 - 6.0.100-rtm.21518.51 - 6.0.100-rtm.21518.51 + 6.0.100-rtm.21518.53 + 6.0.100-rtm.21518.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5da1dd1b5679cec1df7cfe23028b63cc0a349048 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 06:06:33 +0000 Subject: [PATCH 068/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.54 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.54 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38e305bba..f7aa9b87f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - eb0c518052937527d1fc8193a3c7b92d683d6bea + 07d3454cfcd12d931064177e254bf2f739717468 - + https://github.com/dotnet/windowsdesktop - eb0c518052937527d1fc8193a3c7b92d683d6bea + 07d3454cfcd12d931064177e254bf2f739717468 - + https://github.com/dotnet/windowsdesktop - eb0c518052937527d1fc8193a3c7b92d683d6bea + 07d3454cfcd12d931064177e254bf2f739717468 https://github.com/dotnet/windowsdesktop - eb0c518052937527d1fc8193a3c7b92d683d6bea + 07d3454cfcd12d931064177e254bf2f739717468 https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - ef8caa3a5b1e6da22e265b0da70ac9e4ff19019c + f4af335f4c02ab09d65f6f4bb6f0de12998bb1a7 - + https://github.com/dotnet/sdk - ef8caa3a5b1e6da22e265b0da70ac9e4ff19019c + f4af335f4c02ab09d65f6f4bb6f0de12998bb1a7 https://github.com/dotnet/winforms e73e15755db6f219e05030ca650debd5b5df8e4c - + https://github.com/dotnet/wpf - f132a103cbf5e334699485b547dcac564c9e111f + d37c1f5613110dbcd3d735e2723bb8b610acc5cd https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 12ffd0b65..4bda67525 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.0-rtm.21518.11 + 6.0.0-rtm.21518.14 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.53 - 6.0.100-rtm.21518.53 + 6.0.100-rtm.21518.54 + 6.0.100-rtm.21518.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.0-rtm.21518.14 - 6.0.0-rtm.21518.14 + 6.0.0-rtm.21518.16 + 6.0.0-rtm.21518.16 6.0.0 6.0.0 From 4ad613d326370bdfdb12414d91b8a7c79d2bbe9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 06:35:13 +0000 Subject: [PATCH 069/164] Update dependencies from https://github.com/dotnet/sdk build 20211018.56 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.56 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.0 (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 f7aa9b87f..55681c418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b17a9db23c1d89163801c673accbb2317f048e43 - + https://github.com/dotnet/sdk - f4af335f4c02ab09d65f6f4bb6f0de12998bb1a7 + 72484f5c2b8ad795283ccea63a0028cc76b0cf7a - + https://github.com/dotnet/sdk - f4af335f4c02ab09d65f6f4bb6f0de12998bb1a7 + 72484f5c2b8ad795283ccea63a0028cc76b0cf7a @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf d37c1f5613110dbcd3d735e2723bb8b610acc5cd - + https://github.com/dotnet/fsharp - cd29a1cffc6af9b328d1363efe8827c944d67bd5 + 10a05c1adde29cbb7ffebf35b6c9612b789beba3 - + https://github.com/dotnet/fsharp - cd29a1cffc6af9b328d1363efe8827c944d67bd5 + 10a05c1adde29cbb7ffebf35b6c9612b789beba3 diff --git a/eng/Versions.props b/eng/Versions.props index 4bda67525..1e511ea95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.54 - 6.0.100-rtm.21518.54 + 6.0.100-rtm.21518.56 + 6.0.100-rtm.21518.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d502e9313ade40d957907c124cae49ab20c5d042 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Oct 2021 01:09:47 -0700 Subject: [PATCH 070/164] Restore darc-pub-dotnet-windowsdesktop feed --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 96b9503b5..d00c93170 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + From cf368887e074243698ff8fe98ddfc9500fb53761 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 19 Oct 2021 12:50:56 +0000 Subject: [PATCH 071/164] Update source-build prebuilts and previous source-built --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 30d50846b..98678ca87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,8 +159,8 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.24 - 0.1.0-6.0.100-31 + 0.1.0-6.0.100-bootstrap.25 + 0.1.0-6.0.100-32 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 4f5172e5f..2f07670e1 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -22,6 +22,6 @@ 0.1.0-6.0.100- - 31 + 32 From 927359a1d9bc18383b81a5abc3c76e57af202bb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 14:33:05 +0000 Subject: [PATCH 072/164] Update dependencies from https://github.com/dotnet/sdk build 20211019.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21519.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index d00c93170..96b9503b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55681c418..7bfb0cfdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - b17a9db23c1d89163801c673accbb2317f048e43 + e380623de8e689cd7209ffe0881b744413e3e0d6 - + https://github.com/dotnet/templating - b17a9db23c1d89163801c673accbb2317f048e43 + e380623de8e689cd7209ffe0881b744413e3e0d6 - + https://github.com/dotnet/templating - b17a9db23c1d89163801c673accbb2317f048e43 + e380623de8e689cd7209ffe0881b744413e3e0d6 - + https://github.com/dotnet/sdk - 72484f5c2b8ad795283ccea63a0028cc76b0cf7a + 18232f27b6b1408d0a7095f79d264a8f356338e5 - + https://github.com/dotnet/sdk - 72484f5c2b8ad795283ccea63a0028cc76b0cf7a + 18232f27b6b1408d0a7095f79d264a8f356338e5 diff --git a/eng/Versions.props b/eng/Versions.props index 1e511ea95..d2e2f6573 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21518.3 + 6.0.100-rtm.21519.1 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21518.56 - 6.0.100-rtm.21518.56 + 6.0.100-rtm.21519.2 + 6.0.100-rtm.21519.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21518.3 + 6.0.100-rtm.21519.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 6834fb954da51cbbf5f742591f9393389102a48d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 14:42:47 +0000 Subject: [PATCH 073/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.1 (#12450) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- 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 661051b27..97575fca2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - 9442be44ffcd224aa611e31e78e6cd23cbeb26bc + 0e204dad07931f0317232ce9779d83118a24f182 From a2c74df0c0db5fda8e842622a9a1bfd504d83707 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Tue, 19 Oct 2021 08:30:56 -0700 Subject: [PATCH 074/164] Adding windows feed back --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 96b9503b5..d00c93170 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + From c26605442bdcd6fa4e6ce9b8d5c109d5428c9420 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 19 Oct 2021 10:46:38 -0500 Subject: [PATCH 075/164] dotnet/aspnetcore: Fix AppHost pack prebuilt usage in source-build (#12441) --- ...-pack-prebuilt-usage-in-source-build.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch new file mode 100644 index 000000000..224850434 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Mon, 18 Oct 2021 18:45:16 -0500 +Subject: [PATCH] Fix AppHost pack prebuilt usage in source-build + +This avoids downloading a prebuilt apphost pack. + +Upstream PR: https://github.com/dotnet/aspnetcore/pull/37672 +--- + Directory.Build.props | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index dc1f355411..e2dea35567 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -197,9 +197,21 @@ + + + +- $(RepoRoot).dotnet\ +- +- $(LocalDotNetRoot)packs\ ++ ++ $(RepoRoot).dotnet\ ++ $(LocalDotNetRoot)packs\ + + + From 53b74e75510a2593f407b4d8543f8921071286fb Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 19 Oct 2021 11:51:47 -0500 Subject: [PATCH 076/164] Eliminate pre-built assets during source-build for roslyn-analyzers This is taking the approach used in previous versions of source-build: update the dependency versions of Microsoft.CodeAnalysis to the version currently being built by source-build. This is a short-term solution to get unblocked in the 6.0.0 timeframe. In the future, the previous Microsoft.CodeAnalysis versions will be available in SBRP. Contributes to https://github.com/dotnet/source-build/issues/2420 Contributes to https://github.com/dotnet/source-build/issues/2527 --- .../content/repos/roslyn-analyzers.proj | 6 +- ...ilt-assets-during-source-build-for-r.patch | 211 ++++++++++++++++++ 2 files changed, 212 insertions(+), 5 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch diff --git a/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj b/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj index 3c7dc4453..3d7882a5b 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj @@ -2,12 +2,8 @@ - - $(StandardSourceBuildArgs.Replace('/p:DotNetPackageVersionPropsPath="$(PackageVersionPropsPath)"', '')) + $(StandardSourceBuildArgs) $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) - $(BuildCommandArgs) /p:SourceBuildPackageVersionPropsPath="$(PackageVersionPropsPath)" $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch new file mode 100644 index 000000000..953624bfd --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -0,0 +1,211 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric Erhardt +Date: Tue, 19 Oct 2021 11:12:25 -0500 +Subject: [PATCH] Eliminate pre-built assets during source-build for + roslyn-analyzers + +This is taking the approach used in previous versions of source-build: update the dependency versions of Microsoft.CodeAnalysis to the version currently being built by source-build. This is a short-term solution to get unblocked in the 6.0.0 timeframe. In the future, the previous Microsoft.CodeAnalysis versions will be available in SBRP. + +* Remove SourceBuildPackageVersionPropsPath at the top of Versions.props. The PVP from source-build will be imported after the repo's Versions.props +* Workaround a naming collison with DocumentBasedFixAllProvider. The latest Roslyn has a class with the same name. +* Remove hard-coded versions to Microsoft.CodeAnalysis in ResxSourceGenerator, Roslyn.Diagnostics.Analyzers, and GenerateDocumentationAndConfigFiles, so the latest gets picked up. +* Exclude ReleaseNotesUtil from source-build since it brings in the 3.1 app host. This tool shouldn't be needed during source-build. +* Disable BannedApiAnalyzers when in source-build. Other previously built code analysis packages are disabled already. + +Contributes to https://github.com/dotnet/source-build/issues/2420 +Contributes to https://github.com/dotnet/source-build/issues/2527 +--- + eng/Versions.props | 14 -------------- + src/Directory.Build.targets | 5 +++-- + .../Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs | 2 +- + ....CodeAnalysis.ResxSourceGenerator.CSharp.csproj | 1 - + ...Analysis.ResxSourceGenerator.VisualBasic.csproj | 1 - + ...crosoft.CodeAnalysis.ResxSourceGenerator.csproj | 1 - + .../DoNotDirectlyAwaitATask.Fixer.cs | 2 +- + .../Roslyn.Diagnostics.CSharp.Analyzers.csproj | 2 +- + .../Core/Roslyn.Diagnostics.Analyzers.csproj | 1 - + ...Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj | 2 +- + .../GenerateDocumentationAndConfigFiles.csproj | 1 - + ...umentationAndConfigFilesForBrokenRuntime.csproj | 4 +--- + src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj | 1 + + 13 files changed, 9 insertions(+), 28 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 46d30b3bd..635f8bb5c 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -1,18 +1,4 @@ + +- +- +- +- $(SystemCollectionsImmutableVersion) +- 5.0.0 +- $(SystemReflectionMetadataVersion) +- 5.0.0 +- $(MicrosoftCodeAnalysisVersion) +- 3.8.0 +- + + 3.3.3 + beta1 +diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets +index c7c28fd9f..e5be9e028 100644 +--- a/src/Directory.Build.targets ++++ b/src/Directory.Build.targets +@@ -35,8 +35,9 @@ + AnalyzerReleases\$(AssemblyName)\AnalyzerReleases.Shipped.md + + +- +- ++ ++ ++ + + + +diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs +index 7a6877e0e..a0cbd06e7 100644 +--- a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs ++++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs +@@ -48,7 +48,7 @@ private async Task ConvertKindToIsKindAsync(Document document, TextSpa + + protected abstract void FixDiagnostic(DocumentEditor editor, SyntaxNode nodeToFix); + +- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider ++ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider + { + private readonly PreferIsKindFix _fixer; + +diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj +index 114e30a43..e38f8549f 100644 +--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj ++++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj +@@ -7,7 +7,6 @@ + + + *$(MSBuildProjectFile)* +- 3.9.0 + + + +diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj +index a44df8a50..cba084cd5 100644 +--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj ++++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj +@@ -7,7 +7,6 @@ + + + *$(MSBuildProjectFile)* +- 3.9.0 + + + +diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj +index 46a4fca6b..c9fa15584 100644 +--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj ++++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj +@@ -7,7 +7,6 @@ + + + *$(MSBuildProjectFile)* +- 3.9.0 + + + +diff --git a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs +index 738fdebf2..6d13947ce 100644 +--- a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs ++++ b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs +@@ -82,7 +82,7 @@ private class MyCodeAction : DocumentChangeAction + } + } + +- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider ++ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider + { + public static readonly CustomFixAllProvider Instance = new(); + +diff --git a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj +index e62266894..b858d7097 100644 +--- a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj ++++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj +@@ -10,7 +10,7 @@ + + + +- ++ + + + +\ No newline at end of file +diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj +index 60450aee0..3489028d4 100644 +--- a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj ++++ b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj +@@ -7,7 +7,6 @@ + Restore would conclude that there is a cyclic dependency between us and the Roslyn.Diagnostics.Analyzers package. + --> + *$(MSBuildProjectFile)* +- $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion) + + + +diff --git a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj +index 509a3c069..737a2cf24 100644 +--- a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj ++++ b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj +@@ -7,7 +7,7 @@ + + + +- ++ + + + +\ No newline at end of file +diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj +index c00a9ab5d..74f5f4d5a 100644 +--- a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj ++++ b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj +@@ -5,7 +5,6 @@ + true + false + true +- $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion) + + + +diff --git a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj +index fa2233feb..f19ae8d4d 100644 +--- a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj ++++ b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj +@@ -12,8 +12,6 @@ + + + +- +- +- ++ + + +diff --git a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj +index fe90e93ca..01b64e055 100644 +--- a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj ++++ b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj +@@ -3,6 +3,7 @@ + Exe + netcoreapp3.1 + true ++ true + + + From 9c7822aad2baba44ecd2823a184bde5e3b8112f1 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 19 Oct 2021 13:52:54 -0500 Subject: [PATCH 077/164] Add ArcadeSharedFrameworkSdkOverride (#12452) --- src/SourceBuild/tarball/content/repos/Directory.Build.props | 1 + src/SourceBuild/tarball/content/repos/arcade.proj | 1 + src/SourceBuild/tarball/content/repos/runtime.common.props | 1 + 3 files changed, 3 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 64536436d..69dab2b18 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -151,6 +151,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/arcade.proj b/src/SourceBuild/tarball/content/repos/arcade.proj index f5da6fc94..fbf8b3a48 100644 --- a/src/SourceBuild/tarball/content/repos/arcade.proj +++ b/src/SourceBuild/tarball/content/repos/arcade.proj @@ -25,6 +25,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.props b/src/SourceBuild/tarball/content/repos/runtime.common.props index 0f83bfc44..b1e9e6adb 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.common.props +++ b/src/SourceBuild/tarball/content/repos/runtime.common.props @@ -32,6 +32,7 @@ + From 3d7f71a34dc18ac38e3576f9b1204bb3a0cb84db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 19:00:16 +0000 Subject: [PATCH 078/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21519.1 -> To Version 6.0.0-alpha.1.21519.2 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index d00c93170..96b9503b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d92269534..deba3495f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - 0e204dad07931f0317232ce9779d83118a24f182 + 61bcc16159e7008aa0e918788502695cf1ee1c23 From 027603a892009cc5d05d9bde09e6a569df47ae91 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 13 Oct 2021 21:06:13 +0000 Subject: [PATCH 079/164] Add format repo to source-build tarball --- .../tarball/content/repos/format.proj | 22 ++++++++++ .../tarball/content/repos/known-good.proj | 1 + .../tarball/content/repos/sdk.proj | 1 + ...d-performance-test-from-source-build.patch | 34 ++++++++++++++ ...sion-changes-to-support-source-build.patch | 44 +++++++++++++++++++ ...oject-changes-to-eliminate-prebuilts.patch | 30 +++++++++++++ .../0001-Fix-humanizer-assembly-version.patch | 23 ++++++++++ 7 files changed, 155 insertions(+) create mode 100644 src/SourceBuild/tarball/content/repos/format.proj create mode 100644 src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch create mode 100644 src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repos/format.proj new file mode 100644 index 000000000..280856ab2 --- /dev/null +++ b/src/SourceBuild/tarball/content/repos/format.proj @@ -0,0 +1,22 @@ + + + + + $(ProjectDirectory)eng\common\build$(ShellExtension) $(StandardSourceBuildArgs) + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + false + + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 1208a937a..eab516290 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -54,6 +54,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 9cb477726..22f91b0eb 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -42,6 +42,7 @@ + diff --git a/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch b/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch new file mode 100644 index 000000000..58f729c98 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Thu, 14 Oct 2021 01:15:37 +0000 +Subject: [PATCH] Exclude unit and performance test from source-build + +--- + perf/dotnet-format.Performance.csproj | 1 + + tests/dotnet-format.UnitTests.csproj | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj +index dd4c95e..c96e8b8 100644 +--- a/perf/dotnet-format.Performance.csproj ++++ b/perf/dotnet-format.Performance.csproj +@@ -14,6 +14,7 @@ + + + LatestMajor ++ true + + + +diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj +index 06dbbb4..f566d6a 100644 +--- a/tests/dotnet-format.UnitTests.csproj ++++ b/tests/dotnet-format.UnitTests.csproj +@@ -12,6 +12,7 @@ + + 6.0.0-preview.7.21317.1 + LatestMajor ++ true + + + diff --git a/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch b/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch new file mode 100644 index 000000000..33535cae1 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Thu, 14 Oct 2021 10:35:52 +0000 +Subject: [PATCH] Package version changes to support source-build + +--- + Directory.Packages.props | 3 +-- + eng/Versions.props | 2 ++ + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 57c2735..6b628c2 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -2,7 +2,6 @@ + + + +- 16.11.0 + 5.0.0 + + 6.0.0-preview.4.221 +@@ -15,7 +14,7 @@ + + + +- ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 7a39a9c..5270ea4 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -13,6 +13,8 @@ + true + + ++ 16.11.0 ++ 3.3.2 + + 4.0.0-6.21515.3 + diff --git a/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch b/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch new file mode 100644 index 000000000..c1e097eeb --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "msimons@microsoft.com" +Date: Tue, 19 Oct 2021 14:32:25 +0000 +Subject: [PATCH] Project changes to eliminate prebuilts + +--- + src/dotnet-format.csproj | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj +index dbc94b8..994e539 100644 +--- a/src/dotnet-format.csproj ++++ b/src/dotnet-format.csproj +@@ -19,7 +19,6 @@ + true + + +- 6.0.0-preview.7.21317.1 + LatestMajor + + true +@@ -29,7 +28,7 @@ + These identifiers are for generating the shim'd core executables for signing. Not all options + from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context. + --> +- win-x64;win-x86;osx-x64 ++ win-x64;win-x86;osx-x64 + + + diff --git a/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch b/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch new file mode 100644 index 000000000..763c5f3b2 --- /dev/null +++ b/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "msimons@microsoft.com" +Date: Tue, 19 Oct 2021 18:59:23 +0000 +Subject: [PATCH] Fix humanizer assembly version + +Patch for https://github.com/dotnet/source-build/pull/2539 +--- + .../humanizer/0001-Fix-building-in-a-source-build-context.patch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch +index 8d31028..7a5e5f3 100644 +--- a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch ++++ b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch +@@ -24,7 +24,7 @@ index 842a373..e018285 100644 + netstandard1.0 + Mehdi Khalili, Oren Novotny + https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE +-+ 2.2.0 +++ 2.2.0 + https://github.com/Humanizr/Humanizer + 2.12 + A micro-framework that turns your normal strings, type names, enum fields, date fields ETC into a human friendly format From 35104750bce8e349a76beab8be28a0af724cd516 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:25:33 +0000 Subject: [PATCH 080/164] add patch for forcing roslyn Microsoft.Build to 16.5.0 --- ....Build-to-16.5.0-with-RefOnly-prefix.patch | 189 ++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch new file mode 100644 index 000000000..d76584b50 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch @@ -0,0 +1,189 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Tue, 19 Oct 2021 16:57:47 +0000 +Subject: [PATCH] force Microsoft.Build to 16.5.0 with RefOnly prefix + +--- + eng/Versions.props | 15 +++++++++------ + .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 4 ++-- + ...soft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- + .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- + ...sis.LanguageServerIndexFormat.Generator.csproj | 2 +- + src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 4 ++-- + src/Tools/IdeBenchmarks/IdeBenchmarks.csproj | 2 +- + .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 4 ++-- + ...crosoft.CodeAnalysis.Workspaces.MSBuild.csproj | 6 +++--- + ...deAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- + 10 files changed, 28 insertions(+), 25 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index e835ef04d52..0eb674c462e 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -38,7 +38,7 @@ + 5.0.0-preview.1.20112.8 + 17.0.5133-g7b8c8bd49d + 17.0.0-previews-4-31709-430 +- 16.5.0 ++ 16.5.0 + ++ $(RefOnlyMicrosoftBuildPackagesVersion) ++ $(RefOnlyMicrosoftBuildPackagesVersion) ++ 1.2.6 ++ $(RefOnlyMicrosoftBuildPackagesVersion) ++ $(RefOnlyMicrosoftBuildPackagesVersion) + 6.0.0-preview.0.15 + 16.10.23 + + +- ++ + +- ++ + + + +diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +index 3bd6d6398e3..76d0dc36da1 100644 +--- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj ++++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +@@ -24,9 +24,9 @@ + + + +- +- +- ++ ++ ++ + + + +diff --git a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj +index 3d0c6e993c0..06773c65e8d 100644 +--- a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj ++++ b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj +@@ -27,8 +27,8 @@ + + + +- +- ++ ++ + + + From 6a1d84abb15ffa226efe37f7435ee26b359f8ddd Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 19 Oct 2021 14:57:10 -0500 Subject: [PATCH 081/164] Update to Roslyn version of patch. --- ...e-powered-source-build-patches-55823.patch | 27 ++++++++ ...ion-check-for-source-build-scenarios.patch | 27 -------- ...sktop-artifacts-that-don-t-exist-in-.patch | 65 ------------------- 3 files changed, 27 insertions(+), 92 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch new file mode 100644 index 000000000..6afcfa6db --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch @@ -0,0 +1,27 @@ +From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Tue, 19 Oct 2021 11:39:32 -0500 +Subject: [PATCH] Apply arcade-powered source-build patches (#55823) + +* Don't include desktop artifacts that don't exist in source-build. +Source-build doesn't have these artifacts available, even when we eventually will build desktop TFMs, because Roslyn is one of the first builds in source-build. Instead Roslyn is picking up reference packages that don't have the `lib` directory which is causing a build failure. This disables the attempt to grab these desktop artifacts so source-build just skips them instead. +--- + .../DesktopCompilerArtifacts.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets +index c8b87ab6958..107ff051b51 100644 +--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets ++++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets +@@ -20,7 +20,7 @@ + VS training data to the assemblies they produce. + --> + +- ++ + + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch deleted file mode 100644 index 350692304..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch +++ /dev/null @@ -1,27 +0,0 @@ -From eb67cc234b0073d8b210c3ae42b5efe481bd0900 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 20 Jul 2021 09:41:52 -0500 -Subject: [PATCH 1/2] Patch out version check for source-build scenarios. - -The immediate cause for removing this was that NuGet is not yet built at this point in the source-build process. Roslyn tries to use a reference package to run this task but fails (the usual "reference packages cannot be used at runtime" error). Additionally, this is not really a valid check in source-build - we give each repo the SDK and MSBuild that we expect it to use, and want to override its opinions about what it should be using. - ---- - eng/targets/Imports.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets -index 15b067deb04..303b10c40cd 100644 ---- a/eng/targets/Imports.targets -+++ b/eng/targets/Imports.targets -@@ -159,7 +159,7 @@ - - - -- -+ - - - --- -2.18.0 - diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch deleted file mode 100644 index cd22d08b5..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a235579b23a9aaf3f30202a69e92b93f7c569107 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 20 Jul 2021 14:20:14 -0500 -Subject: [PATCH 2/2] Don't include desktop artifacts that don't exist in - source-build. - -This fixes a bad intersection of a couple of things going on in the source-build Roslyn build. -- Roslyn.Extensions project that builds before this normally will restore a net46 version of System.Numerics.Vectors, but it sets it to CopyLocal and is building for net472, so this net46 DLL is output to the net472 folder. -- We don't build Roslyn.Extensions for net472 for other reasons, so we are missing this DLL but not the output from that project (we just get the .NET Core folders). -- DesktopCompilerArtifacts tries to specifically call out the System.Numerics.Vectors (and some other) DLLs because they are treated differently (NGEN is not supported for them). -- So the missing DLL, instead of just being ignored because of a wildcard, comes up as error trying to build these packages. -- We want full-framework Roslyn artifacts downstream but we don't ever run the fullfx Roslyn compiler, so we need these packages but not the CopyLocal fullfx DLLs. - -So we keep the net472 build for these but remove the specifically-called out artifacts that we don't need. - ---- - .../Microsoft.Net.Compilers.Toolset.Package.csproj | 4 ++-- - .../Microsoft.Net.Compilers.Package.csproj | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj -index 9e646ebab5b..7b598978fd1 100644 ---- a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj -+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj -@@ -23,7 +23,7 @@ - - $(NoWarn);NU5100;NU5128 - -- <_DependsOn Condition="'$(TargetFramework)' == 'net472'">InitializeDesktopCompilerArtifacts -+ <_DependsOn Condition="'$(TargetFramework)' == 'net472' and '$(DotNetBuildFromSource)' != 'true'">InitializeDesktopCompilerArtifacts - <_DependsOn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">InitializeCoreClrCompilerArtifacts - - -@@ -57,6 +57,6 @@ - - - -- -+ - - -diff --git a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj -index 05f74e26ce6..c33e557c249 100644 ---- a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj -+++ b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj -@@ -31,13 +31,13 @@ - - - -- <_File Include="@(DesktopCompilerArtifact)" TargetDir="tools"/> -- <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tools"/> -+ <_File Include="@(DesktopCompilerArtifact)" TargetDir="tools" Condition="'$(DotNetBuildFromSource)' != 'true'" /> -+ <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tools" Condition="'$(DotNetBuildFromSource)' != 'true'" /> - <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" TargetDir="build" /> - - - - - -- -+ - --- -2.18.0 - From df28f0a90202a0d1bbf5b83767fa0598a7d0d382 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 20:52:10 +0000 Subject: [PATCH 082/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21519.1 -> To Version 6.0.0-alpha.1.21519.3 --- 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 deba3495f..0eed6470c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - 61bcc16159e7008aa0e918788502695cf1ee1c23 + 2e91309efcdfddcdd34520f8e2ad90ce28f830c5 From 15aa160465e212789084613a0530743581ae1e41 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Tue, 19 Oct 2021 21:22:47 +0000 Subject: [PATCH 083/164] add description to roslyn Microsoft.Build patch --- ...orce-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch index d76584b50..59c21bd29 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch @@ -3,6 +3,12 @@ From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:57:47 +0000 Subject: [PATCH] force Microsoft.Build to 16.5.0 with RefOnly prefix +PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 + +By default, the projects reference Microsoft.Build 16.5.0, which has netcoreapp2.1 and net472 support. The new 17.0.0-... +version built during source-build only has net6.0. This causes Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj to fail. +Adding 16.5.0 to SBRP and dodging the override by renaming each package version property is the safe way to fix it. + --- eng/Versions.props | 15 +++++++++------ .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 4 ++-- From 83689bbca813a7fbcda47877337a3c7a8dd9dfb0 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Tue, 19 Oct 2021 21:38:10 +0000 Subject: [PATCH 084/164] squash roslyn patches --- ...ld-more-projects-during-source-build.patch | 44 +++--------------- ...e-src-Dependencies-from-source-build.patch | 45 ------------------- ...Build-to-16.5.0-with-RefOnly-prefix.patch} | 0 3 files changed, 5 insertions(+), 84 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch rename src/SourceBuild/tarball/patches/roslyn/{0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch => 0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch} (100%) diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch index 4cd594d3d..fb40b3383 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch @@ -13,18 +13,12 @@ PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 --- eng/SourceBuild.props | 2 +- .../Core/Tests}/Directory.Build.props | 0 - .../CodeAnalysis.Debugging}/Directory.Build.props | 0 - src/Dependencies/Microsoft.NetFX20/Directory.Build.props | 6 ++++++ - src/Dependencies/PooledObjects/Directory.Build.props | 6 ++++++ src/Features/LanguageServer/Directory.Build.props | 6 ++++++ src/Features/Lsif/Directory.Build.props | 6 ++++++ src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 2 -- - 9 files changed, 31 insertions(+), 3 deletions(-) - rename src/{Dependencies => CodeStyle/Core/Tests}/Directory.Build.props (100%) - rename src/{Features => Dependencies/CodeAnalysis.Debugging}/Directory.Build.props (100%) - create mode 100644 src/Dependencies/Microsoft.NetFX20/Directory.Build.props - create mode 100644 src/Dependencies/PooledObjects/Directory.Build.props + 6 files changed, 19 insertions(+), 3 deletions(-) + rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props create mode 100644 src/NuGet/VisualStudio/Directory.Build.props @@ -42,38 +36,10 @@ index 182f8a9cdb1..92e316a4744 100644 -diff --git a/src/Dependencies/Directory.Build.props b/src/CodeStyle/Core/Tests/Directory.Build.props -similarity index 100% -rename from src/Dependencies/Directory.Build.props -rename to src/CodeStyle/Core/Tests/Directory.Build.props -diff --git a/src/Features/Directory.Build.props b/src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props +diff --git a/src/Features/Directory.Build.props b/src/CodeStyle/Core/Tests/Directory.Build.props similarity index 100% rename from src/Features/Directory.Build.props -rename to src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props -diff --git a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Dependencies/PooledObjects/Directory.Build.props b/src/Dependencies/PooledObjects/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Dependencies/PooledObjects/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ +rename to src/CodeStyle/Core/Tests/Directory.Build.props diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props new file mode 100644 index 00000000000..6eef643958f @@ -111,7 +77,7 @@ index 00000000000..6eef643958f + + diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -index 3bd6d6398e3..2edf2da6d1a 100644 +index 76d0dc36da1..a65fc35f1c3 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj @@ -7,8 +7,6 @@ diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch deleted file mode 100644 index 0d7e959a3..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 15 Oct 2021 02:41:32 -0500 -Subject: [PATCH] Exclude src/Dependencies from source-build - -This makes source-build stop producing the Microsoft.CodeAnalysis.Collections package. Downstream repos (MSBuild) can't safely use a source-built version. - -PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 ---- - .../{CodeAnalysis.Debugging => }/Directory.Build.props | 0 - src/Dependencies/Microsoft.NetFX20/Directory.Build.props | 6 ------ - src/Dependencies/PooledObjects/Directory.Build.props | 6 ------ - 3 files changed, 12 deletions(-) - rename src/Dependencies/{CodeAnalysis.Debugging => }/Directory.Build.props (100%) - delete mode 100644 src/Dependencies/Microsoft.NetFX20/Directory.Build.props - delete mode 100644 src/Dependencies/PooledObjects/Directory.Build.props - -diff --git a/src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props b/src/Dependencies/Directory.Build.props -similarity index 100% -rename from src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props -rename to src/Dependencies/Directory.Build.props -diff --git a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props -deleted file mode 100644 -index 6eef643958f..00000000000 ---- a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props -+++ /dev/null -@@ -1,6 +0,0 @@ -- -- -- -- true -- -- -diff --git a/src/Dependencies/PooledObjects/Directory.Build.props b/src/Dependencies/PooledObjects/Directory.Build.props -deleted file mode 100644 -index 6eef643958f..00000000000 ---- a/src/Dependencies/PooledObjects/Directory.Build.props -+++ /dev/null -@@ -1,6 +0,0 @@ -- -- -- -- true -- -- diff --git a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch similarity index 100% rename from src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch rename to src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch From fa57d106cc37c59a4fd498b616a73ba56534e0bc Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Wed, 20 Oct 2021 00:35:53 +0000 Subject: [PATCH 085/164] don't build Microsoft.CodeAnalysis.Features* in source-build --- ...ld-more-projects-during-source-build.patch | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch index fb40b3383..4ff812d6e 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch @@ -9,18 +9,24 @@ projects and exclude a few projects that shouldn't be in source-build. The newly included projects are used by downstream repos. -PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 +See https://github.com/dotnet/roslyn/pull/57165 --- eng/SourceBuild.props | 2 +- .../Core/Tests}/Directory.Build.props | 0 + src/Features/CSharp/Portable/Directory.Build.props | 6 ++++++ + src/Features/Core/Portable/Directory.Build.props | 6 ++++++ src/Features/LanguageServer/Directory.Build.props | 6 ++++++ src/Features/Lsif/Directory.Build.props | 6 ++++++ + src/Features/VisualBasic/Portable/Directory.Build.props | 6 ++++++ src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 2 -- - 6 files changed, 19 insertions(+), 3 deletions(-) + 9 files changed, 37 insertions(+), 3 deletions(-) rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) + create mode 100644 src/Features/CSharp/Portable/Directory.Build.props + create mode 100644 src/Features/Core/Portable/Directory.Build.props create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props + create mode 100644 src/Features/VisualBasic/Portable/Directory.Build.props create mode 100644 src/NuGet/VisualStudio/Directory.Build.props diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props @@ -40,6 +46,30 @@ diff --git a/src/Features/Directory.Build.props b/src/CodeStyle/Core/Tests/Direc similarity index 100% rename from src/Features/Directory.Build.props rename to src/CodeStyle/Core/Tests/Directory.Build.props +diff --git a/src/Features/CSharp/Portable/Directory.Build.props b/src/Features/CSharp/Portable/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/CSharp/Portable/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Features/Core/Portable/Directory.Build.props b/src/Features/Core/Portable/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/Core/Portable/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props new file mode 100644 index 00000000000..6eef643958f @@ -64,6 +94,18 @@ index 00000000000..6eef643958f + true + + +diff --git a/src/Features/VisualBasic/Portable/Directory.Build.props b/src/Features/VisualBasic/Portable/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/VisualBasic/Portable/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props new file mode 100644 index 00000000000..6eef643958f From 2cf457ef3877b73bbb9855fa072d96ba83b6b54a Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 19 Oct 2021 19:39:45 -0500 Subject: [PATCH 086/164] Remove compiler project apphosts in source-build --- .../tarball/content/repos/fsharp.proj | 6 + ...apphost-for-fsi-fsc-for-source-build.patch | 35 +++++ ...t-pack-prebuilts-during-source-build.patch | 127 ++++++++++++++++++ ...st-build-of-csi-vbi-for-source-build.patch | 35 +++++ 4 files changed, 203 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/fsharp/0002-Remove-apphost-pack-prebuilts-during-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index b77de5f30..a03a69fc5 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -4,6 +4,12 @@ $(StandardSourceBuildArgs) $(BuildCommandArgs) /p:TreatWarningsAsErrors=false + + $(BuildCommandArgs) --sourcebuild $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch new file mode 100644 index 000000000..2e078b165 --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 19 Oct 2021 16:11:51 -0500 +Subject: [PATCH] Disable apphost for 'fsi', 'fsc' for source-build + +Creating an apphost for a net5.0 project while building with a net6.0 SDK downloads the apphost pack as a prebuilt. Stopping the project from creating the apphost removes the prebuilt for source-build. +--- + src/fsharp/fsc/fsc.fsproj | 1 + + src/fsharp/fsi/fsi.fsproj | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj +index 7fa31fc21..04025c297 100644 +--- a/src/fsharp/fsc/fsc.fsproj ++++ b/src/fsharp/fsc/fsc.fsproj +@@ -12,6 +12,7 @@ + $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 + true + true ++ false + + + +diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj +index 9fd9b1333..eace6c166 100644 +--- a/src/fsharp/fsi/fsi.fsproj ++++ b/src/fsharp/fsi/fsi.fsproj +@@ -13,6 +13,7 @@ + fsi.res + true + true ++ false + + + diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-Remove-apphost-pack-prebuilts-during-source-build.patch b/src/SourceBuild/tarball/patches/fsharp/0002-Remove-apphost-pack-prebuilts-during-source-build.patch new file mode 100644 index 000000000..e88e10cea --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0002-Remove-apphost-pack-prebuilts-during-source-build.patch @@ -0,0 +1,127 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 19 Oct 2021 19:34:11 -0500 +Subject: [PATCH] Remove apphost pack prebuilts during source-build + +Add a check to eng/build.sh to avoid running the bootstrapping twice: once in the outer build and again in the inner build. + +Sets UseAppHost=false during source-build for the projects that build during bootstrapping. Pass the DotNetBuildFromSource property through the environment in eng/SourceBuild.props so it takes effect. +--- + eng/SourceBuild.props | 2 +- + eng/build.sh | 51 ++++++++++--------- + .../AssemblyCheck/AssemblyCheck.fsproj | 1 + + src/buildtools/fslex/fslex.fsproj | 1 + + src/buildtools/fsyacc/fsyacc.fsproj | 1 + + 5 files changed, 32 insertions(+), 24 deletions(-) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 22c929f28..903ee00d3 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -41,7 +41,7 @@ + ++ EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" /> + + + +diff --git a/eng/build.sh b/eng/build.sh +index 9a2aa0083..6af422237 100755 +--- a/eng/build.sh ++++ b/eng/build.sh +@@ -240,29 +240,34 @@ function BuildSolution { + node_reuse=false + + # build bootstrap tools +- bootstrap_config=Proto +- bootstrap_dir=$artifacts_dir/Bootstrap +- if [[ "$force_bootstrap" == true ]]; then +- rm -fr $bootstrap_dir +- fi +- if [ ! -f "$bootstrap_dir/fslex.dll" ]; then +- BuildMessage="Error building tools" +- MSBuild "$repo_root/src/buildtools/buildtools.proj" \ +- /restore \ +- /p:Configuration=$bootstrap_config +- +- mkdir -p "$bootstrap_dir" +- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex +- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc +- fi +- if [ ! -f "$bootstrap_dir/fsc.exe" ]; then +- BuildMessage="Error building bootstrap" +- MSBuild "$repo_root/proto.proj" \ +- /restore \ +- /p:Configuration=$bootstrap_config \ +- +- +- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc ++ # source_build=true means we are currently in the outer/wrapper source-build, ++ # and building bootstrap needs to wait. The source-build targets will run this ++ # script again without setting source_build=true when it is done setting up ++ # the build environment. See 'eng/SourceBuild.props'. ++ if [[ "$source_build" != true ]]; then ++ bootstrap_config=Proto ++ bootstrap_dir=$artifacts_dir/Bootstrap ++ if [[ "$force_bootstrap" == true ]]; then ++ rm -fr $bootstrap_dir ++ fi ++ if [ ! -f "$bootstrap_dir/fslex.dll" ]; then ++ BuildMessage="Error building tools" ++ MSBuild "$repo_root/src/buildtools/buildtools.proj" \ ++ /restore \ ++ /p:Configuration=$bootstrap_config ++ ++ mkdir -p "$bootstrap_dir" ++ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex ++ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc ++ fi ++ if [ ! -f "$bootstrap_dir/fsc.exe" ]; then ++ BuildMessage="Error building bootstrap" ++ MSBuild "$repo_root/proto.proj" \ ++ /restore \ ++ /p:Configuration=$bootstrap_config ++ ++ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc ++ fi + fi + + if [[ "$skip_build" != true ]]; then +diff --git a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj +index 464b6ef78..5c78bbe6d 100644 +--- a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj ++++ b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj +@@ -4,6 +4,7 @@ + Exe + net5.0 + true ++ false + + + +diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fsproj +index 1959ce59c..3d63bf6bf 100644 +--- a/src/buildtools/fslex/fslex.fsproj ++++ b/src/buildtools/fslex/fslex.fsproj +@@ -5,6 +5,7 @@ + net5.0 + INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) + true ++ false + + + +diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj +index 5d1b7141f..63b63c5de 100644 +--- a/src/buildtools/fsyacc/fsyacc.fsproj ++++ b/src/buildtools/fsyacc/fsyacc.fsproj +@@ -5,6 +5,7 @@ + net5.0 + INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) + true ++ false + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch new file mode 100644 index 000000000..528517fb8 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 19 Oct 2021 19:38:52 -0500 +Subject: [PATCH] Disable apphost build of 'csi', 'vbi' for source-build + +Creating an apphost for a netcoreapp3.1 project uses the apphost pack as a prebuilt. Stopping these projects from creating the apphost removes the prebuilt for source-build. +--- + src/Interactive/csi/csi.csproj | 1 + + src/Interactive/vbi/vbi.vbproj | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj +index 3970bb4e9ea..e96beb550d2 100644 +--- a/src/Interactive/csi/csi.csproj ++++ b/src/Interactive/csi/csi.csproj +@@ -6,6 +6,7 @@ + Exe + CSharpInteractive + netcoreapp3.1;net472 ++ false + + + +diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj +index 5bbdf7f03a7..5f732d71534 100644 +--- a/src/Interactive/vbi/vbi.vbproj ++++ b/src/Interactive/vbi/vbi.vbproj +@@ -6,6 +6,7 @@ + Exe + Sub Main + netcoreapp3.1;net472 ++ false + + + From d64125fa04e22dbc8ddbcab40d7df49071c81b43 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 20 Oct 2021 01:01:37 +0000 Subject: [PATCH 087/164] Update source-build prebuilts and previous source-build --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7b702ae3f..322423cb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,8 +159,8 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.25 - 0.1.0-6.0.100-32 + 0.1.0-6.0.100-bootstrap.26 + 0.1.0-6.0.100-33 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 2f07670e1..c1d4785c9 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -22,6 +22,6 @@ 0.1.0-6.0.100- - 32 + 33 From 27329680a2722b600805d8413be5559ba96fa207 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 19 Oct 2021 20:08:10 -0500 Subject: [PATCH 088/164] Updates to patch comment --- ...ply-arcade-powered-source-build-patches-55823.patch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch index 6afcfa6db..8e3884438 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch @@ -3,8 +3,14 @@ From: Chris Rummel Date: Tue, 19 Oct 2021 11:39:32 -0500 Subject: [PATCH] Apply arcade-powered source-build patches (#55823) -* Don't include desktop artifacts that don't exist in source-build. -Source-build doesn't have these artifacts available, even when we eventually will build desktop TFMs, because Roslyn is one of the first builds in source-build. Instead Roslyn is picking up reference packages that don't have the `lib` directory which is causing a build failure. This disables the attempt to grab these desktop artifacts so source-build just skips them instead. +Don't include desktop artifacts that don't exist in source-build. +Source-build doesn't have these artifacts available, even when we eventually will +build desktop TFMs, because Roslyn is one of the first builds in source-build. +Instead Roslyn is picking up reference packages that don't have the `lib` directory +which is causing a build failure. This disables the attempt to grab these desktop +artifacts so source-build just skips them instead. + +Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823 --- .../DesktopCompilerArtifacts.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From cb356a0814d0e248f025e083f6249be8eacf7756 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Oct 2021 02:27:12 +0000 Subject: [PATCH 089/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21519.1 -> To Version 6.0.0-alpha.1.21519.4 --- 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 0eed6470c..5eac2159b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/source-build-reference-packages - 2e91309efcdfddcdd34520f8e2ad90ce28f830c5 + 2e0273e0bcdc70087adf893795a323f191c93dcc From 63174a7e711fcb2a8e260abd2689ba8705531d6d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Oct 2021 22:57:37 -0700 Subject: [PATCH 090/164] Restore the windowsdesktop feed --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 96b9503b5..d00c93170 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + From 6e31861fea31ab8be6c3eaeff853457e619dcc0b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 20 Oct 2021 15:00:05 +0000 Subject: [PATCH 091/164] Eliminate linker prebuilts --- ...t.DotNet.ApiCompat-from-source-build.patch | 24 +++++++++++++++++++ ...t.NETFramework.ReferenceAssemblies-f.patch | 23 ++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch diff --git a/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch b/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch new file mode 100644 index 000000000..48bf63e70 --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Wed, 20 Oct 2021 14:44:36 +0000 +Subject: [PATCH] Exclude Microsoft.DotNet.ApiCompat from source-build + +Backport PR: https://github.com/dotnet/linker/pull/2326 +--- + eng/Tools.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Tools.props b/eng/Tools.props +index 494d208..7c32ad5 100644 +--- a/eng/Tools.props ++++ b/eng/Tools.props +@@ -2,7 +2,7 @@ + + + +- ++ + + + +\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch b/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch new file mode 100644 index 000000000..8458c20e5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Wed, 20 Oct 2021 14:38:14 +0000 +Subject: [PATCH 1/2] Upgrade Microsoft.NETFramework.ReferenceAssemblies from + 1.0.0 to 1.0.2 + +Backport PR: https://github.com/dotnet/linker/pull/2326 +--- + src/ILLink.Tasks/ILLink.Tasks.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj +index 0ecf5d1..7501ecb 100644 +--- a/src/ILLink.Tasks/ILLink.Tasks.csproj ++++ b/src/ILLink.Tasks/ILLink.Tasks.csproj +@@ -53,6 +53,6 @@ + + + +- ++ + + From 83818e80387294b84c295d7a3427a902eb48853b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Oct 2021 09:14:05 -0700 Subject: [PATCH 092/164] [release/6.0.1xx] Update dependencies from dotnet/arcade (#12457) * Update dependencies from https://github.com/dotnet/arcade build 20211019.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21515.3 -> To Version 6.0.0-beta.21519.3 * Resolve source-build patch conflicts * Restore the windowsdesktop feed Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 12 +-- eng/Versions.props | 2 +- global.json | 4 +- ...DotNet.Build.Tasks.Workloads-for-net.patch | 19 +--- ...rkloadDefinition-breaking-API-change.patch | 25 ------ .../0008-Bootstrapping-workaround.patch | 10 +-- ...rade-newtonsoft-dependency-to-13.0.1.patch | 86 ------------------- 7 files changed, 15 insertions(+), 143 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch delete mode 100644 src/SourceBuild/tarball/patches/arcade/0010-Upgrade-newtonsoft-dependency-to-13.0.1.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eac2159b..f1e9d8137 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 322423cb0..15f2052b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21515.3 + 6.0.0-beta.21519.3 diff --git a/global.json b/global.json index f01235654..4f5a20ba8 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.21515.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21515.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3" } } diff --git a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch index f14acf094..b1cdb03da 100644 --- a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch +++ b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch @@ -5,8 +5,7 @@ Subject: [PATCH] Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0 --- .../src/Microsoft.DotNet.Build.Tasks.Workloads.csproj | 1 + - .../src/VisualStudioComponent.cs | 4 ++++ - 2 files changed, 5 insertions(+) + 1 files changed, 1 insertions(+) diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj index ae34705a..bda5d581 100644 @@ -20,22 +19,6 @@ index ae34705a..bda5d581 100644 true Latest true -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs -index ee7e9d6d..b69b6823 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs -@@ -247,7 +247,11 @@ public TaskItem Generate(string projectPath) - // processing direct pack dependencies - if (workload.Extends?.Count() > 0) - { -+#if NET6_0 -+ foreach (WorkloadId dependency in workload.Extends) -+#else - foreach (WorkloadDefinitionId dependency in workload.Extends) -+#endif - { - // Component dependencies, aka. workload extensions only have minimum version dependencies. - component.AddDependency($"{Utils.ToSafeId(dependency.ToString())}", new Version("1.0.0.0"), maxVersion: null); -- 2.29.2 diff --git a/src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch b/src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch deleted file mode 100644 index acb46223f..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4577f60202649281d2c96c4d8b67d331b7e71c35 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 10 Sep 2021 13:52:54 +0000 -Subject: [PATCH] Respond to WorkloadDefinition breaking API change - -See https://github.com/dotnet/arcade/issues/7880 for details ---- - .../src/GenerateWorkloadMsis.cs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -index 50340821..a65453f2 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -@@ -121,6 +121,7 @@ private IEnumerable GetWorkloadPacks() - // platform includes Windows - var workloads = manifests.SelectMany(m => m.Workloads). - Select(w => w.Value). -+ OfType(). - Where(wd => (wd.Platforms == null) || wd.Platforms.Any(p => p.StartsWith("win"))); - - var packIds = workloads.Where(w => w.Packs != null).SelectMany(w => w.Packs).Distinct(); --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch index 6aba415a7..cfb166328 100644 --- a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch +++ b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch @@ -13,20 +13,20 @@ Temporary workaround until source-build is built with recent source-built. 1 file changed, 4 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props -index 960eb6c9..fa87aaac 100644 +index 37feef5..c5aee85 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,6 +18,10 @@ false - + + + $(NoWarn);NU1603 + + - - -- 9.0.1 -- -- - - -- - - - -diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj -index 5de33cd0..fbe08347 100644 ---- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj -+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj -@@ -11,6 +11,8 @@ - - - -+ -+ - - - -diff --git a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj -index 7d9fb9a1..193648cb 100644 ---- a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj -+++ b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj -@@ -7,6 +7,8 @@ - - - -+ -+ - - - From 68be5005fdaa07acab0dcf3a37c28530b0fda7ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Oct 2021 16:17:59 +0000 Subject: [PATCH 093/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21519.4 -> To Version 6.0.0-alpha.1.21520.1 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index d00c93170..96b9503b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1e9d8137..5c71c7441 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/source-build-reference-packages - 2e0273e0bcdc70087adf893795a323f191c93dcc + 685f324b0f240daae4a0266373265dd95a5978ac From 757ac5dd9f94fdcc56f132ace2ae354f94ecadae Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Wed, 20 Oct 2021 12:04:25 -0500 Subject: [PATCH 094/164] Flow version of Microsoft.CodeAnalysis.Common in roslyn (#12461) --- src/SourceBuild/tarball/content/repos/roslyn.proj | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 7a8980227..9a6efe331 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -19,6 +19,19 @@ $(ProjectDirectory)global.json + + + + + From 51a09f7e5cce6b5ad7593841c9f2918daa4a9d1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Oct 2021 17:52:00 +0000 Subject: [PATCH 095/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21519.4 -> To Version 6.0.0-alpha.1.21520.2 --- 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 5c71c7441..71a0fe867 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/source-build-reference-packages - 685f324b0f240daae4a0266373265dd95a5978ac + d0bccb31e2e86a5a727f2dbf86dd825d895a0741 From dca28b2c5213d27bd218377e53cd06b1a93566e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Oct 2021 18:30:45 +0000 Subject: [PATCH 096/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12451) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21519.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21519.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.0.0-beta.21518.8 to 12.0.0-beta.21519.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21518.8 to 6.0.1-beta.21519.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 6.0.100-1.21519.4 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21515.3 to 4.0.0-6.21519.19 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21515.2 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk) - Revert removed feed - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b - Resolve source-build patches - Merge branch 'darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b - Resolve source-build patch conflicts --- NuGet.config | 2 +- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 24 +++---- ...d-performance-test-from-source-build.patch | 34 --------- ...sion-changes-to-support-source-build.patch | 44 ------------ ...oject-changes-to-eliminate-prebuilts.patch | 30 -------- .../0001-Fix-humanizer-assembly-version.patch | 23 ------ 7 files changed, 49 insertions(+), 180 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch delete mode 100644 src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch diff --git a/NuGet.config b/NuGet.config index d00c93170..714c7a75c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1e9d8137..cf87d9137 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 - + https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 - + https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 https://github.com/dotnet/test-templates @@ -103,31 +103,31 @@ https://github.com/dotnet/templating e380623de8e689cd7209ffe0881b744413e3e0d6 - + https://github.com/dotnet/sdk - 18232f27b6b1408d0a7095f79d264a8f356338e5 + 4d19f430e05e0c0771b6abf86be9bf137f2cc242 - + https://github.com/dotnet/sdk - 18232f27b6b1408d0a7095f79d264a8f356338e5 + 4d19f430e05e0c0771b6abf86be9bf137f2cc242 - + https://github.com/dotnet/winforms - e73e15755db6f219e05030ca650debd5b5df8e4c + 080dcacb82db540cc26e5bf9882c6af9320ba535 - + https://github.com/dotnet/wpf - d37c1f5613110dbcd3d735e2723bb8b610acc5cd + eee7eff2c7837b56fdb7f313540de74bc1b41a41 - + https://github.com/dotnet/fsharp - 10a05c1adde29cbb7ffebf35b6c9612b789beba3 + 727a6abda5bb3276f3e8dd918b721c5d21464aac - + https://github.com/dotnet/fsharp - 10a05c1adde29cbb7ffebf35b6c9612b789beba3 + 727a6abda5bb3276f3e8dd918b721c5d21464aac @@ -135,15 +135,15 @@ 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 - + https://github.com/dotnet/linker - d51cc207fac85547787bbba83f54f69d8e72e9f5 + d0662ed8db919642177ddfd06a1c33895a69015f linker - + https://github.com/dotnet/roslyn - 95b7a0198f8c805b367f17e4639020ec21c16705 + 3a0930fe6990248c848db2f1e323d7dd2052005b @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk 73c8cd3619efc79364fef5fa81989f9e0dd2147b - + https://github.com/dotnet/source-build - 03462c6b31f9c97d4fb0b9bcca7355b81c7fde76 + 10d0f7e94aa45889155c312f51cfc01bf326b853 diff --git a/eng/Versions.props b/eng/Versions.props index 9ada49b94..9892aab77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21518.9 + 6.0.0-rtm.21519.4 - 6.0.0-rtm.21518.14 + 6.0.0-rtm.21519.8 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 0.2.0 - 6.0.100-rtm.21519.2 - 6.0.100-rtm.21519.2 + 6.0.100-rtm.21520.1 + 6.0.100-rtm.21520.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.0-rtm.21518.16 - 6.0.0-rtm.21518.16 + 6.0.0-rtm.21519.11 + 6.0.0-rtm.21519.11 6.0.0 6.0.0 diff --git a/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch b/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch deleted file mode 100644 index 58f729c98..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Thu, 14 Oct 2021 01:15:37 +0000 -Subject: [PATCH] Exclude unit and performance test from source-build - ---- - perf/dotnet-format.Performance.csproj | 1 + - tests/dotnet-format.UnitTests.csproj | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj -index dd4c95e..c96e8b8 100644 ---- a/perf/dotnet-format.Performance.csproj -+++ b/perf/dotnet-format.Performance.csproj -@@ -14,6 +14,7 @@ - - - LatestMajor -+ true - - - -diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj -index 06dbbb4..f566d6a 100644 ---- a/tests/dotnet-format.UnitTests.csproj -+++ b/tests/dotnet-format.UnitTests.csproj -@@ -12,6 +12,7 @@ - - 6.0.0-preview.7.21317.1 - LatestMajor -+ true - - - diff --git a/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch b/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch deleted file mode 100644 index 33535cae1..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Thu, 14 Oct 2021 10:35:52 +0000 -Subject: [PATCH] Package version changes to support source-build - ---- - Directory.Packages.props | 3 +-- - eng/Versions.props | 2 ++ - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 57c2735..6b628c2 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -2,7 +2,6 @@ - - - -- 16.11.0 - 5.0.0 - - 6.0.0-preview.4.221 -@@ -15,7 +14,7 @@ - - - -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 7a39a9c..5270ea4 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -13,6 +13,8 @@ - true - - -+ 16.11.0 -+ 3.3.2 - - 4.0.0-6.21515.3 - diff --git a/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch b/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch deleted file mode 100644 index c1e097eeb..000000000 --- a/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "msimons@microsoft.com" -Date: Tue, 19 Oct 2021 14:32:25 +0000 -Subject: [PATCH] Project changes to eliminate prebuilts - ---- - src/dotnet-format.csproj | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj -index dbc94b8..994e539 100644 ---- a/src/dotnet-format.csproj -+++ b/src/dotnet-format.csproj -@@ -19,7 +19,6 @@ - true - - -- 6.0.0-preview.7.21317.1 - LatestMajor - - true -@@ -29,7 +28,7 @@ - These identifiers are for generating the shim'd core executables for signing. Not all options - from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context. - --> -- win-x64;win-x86;osx-x64 -+ win-x64;win-x86;osx-x64 - - - diff --git a/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch b/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch deleted file mode 100644 index 763c5f3b2..000000000 --- a/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "msimons@microsoft.com" -Date: Tue, 19 Oct 2021 18:59:23 +0000 -Subject: [PATCH] Fix humanizer assembly version - -Patch for https://github.com/dotnet/source-build/pull/2539 ---- - .../humanizer/0001-Fix-building-in-a-source-build-context.patch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch -index 8d31028..7a5e5f3 100644 ---- a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch -+++ b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch -@@ -24,7 +24,7 @@ index 842a373..e018285 100644 - netstandard1.0 - Mehdi Khalili, Oren Novotny - https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE --+ 2.2.0 -++ 2.2.0 - https://github.com/Humanizr/Humanizer - 2.12 - A micro-framework that turns your normal strings, type names, enum fields, date fields ETC into a human friendly format From 5f76b4d101bd92d7592135274994b8ed58ea1f78 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 20 Oct 2021 19:00:31 +0000 Subject: [PATCH 097/164] Update source-build prebuilts and previous source-built --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9892aab77..8df587ed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,8 +159,8 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.26 - 0.1.0-6.0.100-33 + 0.1.0-6.0.100-bootstrap.27 + 0.1.0-6.0.100-34 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index c1d4785c9..d745e47f1 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -22,6 +22,6 @@ 0.1.0-6.0.100- - 33 + 34 From a4299145418757cca6e7df7ad05a5f97352a00b6 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Wed, 20 Oct 2021 19:13:20 +0000 Subject: [PATCH 098/164] build Microsoft.CodeAnalysis.Features* in roslyn --- ...ld-more-projects-during-source-build.patch | 46 +------------------ 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch index 4ff812d6e..321db7037 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch @@ -13,20 +13,14 @@ See https://github.com/dotnet/roslyn/pull/57165 --- eng/SourceBuild.props | 2 +- .../Core/Tests}/Directory.Build.props | 0 - src/Features/CSharp/Portable/Directory.Build.props | 6 ++++++ - src/Features/Core/Portable/Directory.Build.props | 6 ++++++ src/Features/LanguageServer/Directory.Build.props | 6 ++++++ src/Features/Lsif/Directory.Build.props | 6 ++++++ - src/Features/VisualBasic/Portable/Directory.Build.props | 6 ++++++ src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 2 -- - 9 files changed, 37 insertions(+), 3 deletions(-) + 6 files changed, 19 insertions(+), 3 deletions(-) rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) - create mode 100644 src/Features/CSharp/Portable/Directory.Build.props - create mode 100644 src/Features/Core/Portable/Directory.Build.props create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props - create mode 100644 src/Features/VisualBasic/Portable/Directory.Build.props create mode 100644 src/NuGet/VisualStudio/Directory.Build.props diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props @@ -46,30 +40,6 @@ diff --git a/src/Features/Directory.Build.props b/src/CodeStyle/Core/Tests/Direc similarity index 100% rename from src/Features/Directory.Build.props rename to src/CodeStyle/Core/Tests/Directory.Build.props -diff --git a/src/Features/CSharp/Portable/Directory.Build.props b/src/Features/CSharp/Portable/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/CSharp/Portable/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Features/Core/Portable/Directory.Build.props b/src/Features/Core/Portable/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/Core/Portable/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props new file mode 100644 index 00000000000..6eef643958f @@ -94,18 +64,6 @@ index 00000000000..6eef643958f + true + + -diff --git a/src/Features/VisualBasic/Portable/Directory.Build.props b/src/Features/VisualBasic/Portable/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/VisualBasic/Portable/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props new file mode 100644 index 00000000000..6eef643958f @@ -119,7 +77,7 @@ index 00000000000..6eef643958f + + diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -index 76d0dc36da1..a65fc35f1c3 100644 +index 3bd6d6398e3..2edf2da6d1a 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj @@ -7,8 +7,6 @@ From 01b2e9438d7581c0220f22c18ae50055c7c6de8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Oct 2021 19:39:57 +0000 Subject: [PATCH 099/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21519.4 -> To Version 6.0.0-alpha.1.21520.3 --- 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 71a0fe867..9e7faf05d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/source-build-reference-packages - d0bccb31e2e86a5a727f2dbf86dd825d895a0741 + d662881202d3555752f5eab4dd0c2a63dffdefc0 From b14e9a8e770e80d80d04a7c57bd8eed25007a9e1 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 20 Oct 2021 21:00:33 +0000 Subject: [PATCH 100/164] Add roslyn-analyzer as format dependency --- src/SourceBuild/tarball/content/repos/format.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repos/format.proj index 280856ab2..21734d18d 100644 --- a/src/SourceBuild/tarball/content/repos/format.proj +++ b/src/SourceBuild/tarball/content/repos/format.proj @@ -10,8 +10,9 @@ - + + From d2e491a787b07f5c20df2dd8bb78f086fa9e7b3e Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 20 Oct 2021 21:59:04 +0000 Subject: [PATCH 101/164] Build msbuild for net472 and remove depdency on VS --- ...-all-TFMs-for-source-build-to-suppor.patch | 32 +++++ ...y-on-MS.VS.Setup.Configuration.Inter.patch | 115 ++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch create mode 100644 src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch new file mode 100644 index 000000000..046864705 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch @@ -0,0 +1,32 @@ +From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 20 Oct 2021 15:19:29 -0500 +Subject: [PATCH] Restore building all TFMs for source-build to support NuGet + to support templating. + +--- + src/Directory.Build.props | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/Directory.Build.props b/src/Directory.Build.props +index b0e233194..7e0c7d8c8 100644 +--- a/src/Directory.Build.props ++++ b/src/Directory.Build.props +@@ -27,13 +27,12 @@ + + + $(FullFrameworkTFM);netstandard2.0 +- netstandard2.0 + $(FullFrameworkTFM) + AnyCPU + + + net6.0 +- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) ++ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) + $(FullFrameworkTFM) + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch new file mode 100644 index 000000000..92e3c8113 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -0,0 +1,115 @@ +From a75f4b17c3595079f69ea00041182368adea14c9 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 20 Oct 2021 21:49:51 +0000 +Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop + +--- + eng/Packages.props | 3 --- + src/Build/Microsoft.Build.csproj | 4 +++- + src/Directory.BeforeCommon.targets | 2 +- + src/Samples/Directory.Build.props | 1 + + src/Samples/Directory.Build.targets | 2 +- + src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- + src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- + 7 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/eng/Packages.props b/eng/Packages.props +index 2de607c5d..1668addc9 100644 +--- a/eng/Packages.props ++++ b/eng/Packages.props +@@ -46,9 +46,6 @@ + + + +- +- +- + + + +diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj +index d08e337c5..3b173aee5 100644 +--- a/src/Build/Microsoft.Build.csproj ++++ b/src/Build/Microsoft.Build.csproj +@@ -38,8 +38,10 @@ + + + +- ++ + ++ ++ + + + +diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets +index 913c97b12..320bffa56 100644 +--- a/src/Directory.BeforeCommon.targets ++++ b/src/Directory.BeforeCommon.targets +@@ -99,7 +99,7 @@ + $(DefineConstants);FEATURE_DEBUGGER + $(DefineConstants);FEATURE_WIN32_REGISTRY + $(DefineConstants);FEATURE_WORKINGSET +- $(DefineConstants);FEATURE_VISUALSTUDIOSETUP ++ $(DefineConstants);FEATURE_VISUALSTUDIOSETUP + $(DefineConstants);FEATURE_MSCOREE + + +diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props +index 6b9d6cd9f..317ef14a6 100644 +--- a/src/Samples/Directory.Build.props ++++ b/src/Samples/Directory.Build.props +@@ -8,6 +8,7 @@ + false + + false ++ true + + + +diff --git a/src/Samples/Directory.Build.targets b/src/Samples/Directory.Build.targets +index 78b52aab8..db80eff4d 100644 +--- a/src/Samples/Directory.Build.targets ++++ b/src/Samples/Directory.Build.targets +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj +index d8f81bf99..3a5514094 100644 +--- a/src/Tasks/Microsoft.Build.Tasks.csproj ++++ b/src/Tasks/Microsoft.Build.Tasks.csproj +@@ -999,8 +999,10 @@ + + + +- ++ + ++ ++ + + + +diff --git a/src/Utilities/Microsoft.Build.Utilities.csproj b/src/Utilities/Microsoft.Build.Utilities.csproj +index 09634e723..72d838d9d 100644 +--- a/src/Utilities/Microsoft.Build.Utilities.csproj ++++ b/src/Utilities/Microsoft.Build.Utilities.csproj +@@ -25,7 +25,7 @@ + + + +- ++ + + + +-- +2.31.1 + From 2bca7f450a7a5065b201a99e373f5142e22a32f4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 20 Oct 2021 15:00:49 -0700 Subject: [PATCH 102/164] Revert "[release/6.0.1xx] Switch to stable RTM branding" (#12470) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9892aab77..5e1eaff6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From 388ed26a0c268feaf726f85854fd0ed4010535cf Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 20 Oct 2021 16:19:15 -0500 Subject: [PATCH 103/164] Fix patch removing aspnetcore apphost pack prebuilt --- ...-pack-prebuilt-usage-in-source-build.patch | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch index 224850434..bae957621 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0006-Fix-AppHost-pack-prebuilt-usage-in-source-build.patch @@ -1,41 +1,50 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Davis Goodin -Date: Mon, 18 Oct 2021 18:45:16 -0500 +Date: Wed, 20 Oct 2021 16:17:54 -0500 Subject: [PATCH] Fix AppHost pack prebuilt usage in source-build This avoids downloading a prebuilt apphost pack. Upstream PR: https://github.com/dotnet/aspnetcore/pull/37672 --- - Directory.Build.props | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) + Directory.Build.props | 14 ++++++++++++-- + .../src/Microsoft.AspNetCore.App.Ref.csproj | 1 + + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index dc1f355411..e2dea35567 100644 +index 204df64da7..7280c12748 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -197,9 +197,21 @@ - +@@ -198,8 +198,18 @@ -- $(RepoRoot).dotnet\ + $(RepoRoot).dotnet\ - - $(LocalDotNetRoot)packs\ + -+ $(RepoRoot).dotnet\ -+ $(LocalDotNetRoot)packs\ ++ $(LocalDotNetRoot)packs\ +diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj +index 0cb7503c04..3a0832ee21 100644 +--- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj ++++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj +@@ -211,6 +211,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + From 375383b5faf3723327e9db3819653da710ed137c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 00:55:46 +0000 Subject: [PATCH 104/164] Refactor patches to build additional projects --- ...dd-Features-projects-to-SourceBuild.patch} | 240 +++++++++++++----- ...-powered-source-build-patches-55823.patch} | 0 ...ld-more-projects-during-source-build.patch | 91 ------- 3 files changed, 178 insertions(+), 153 deletions(-) rename src/SourceBuild/tarball/patches/roslyn/{0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch => 0001-Add-Features-projects-to-SourceBuild.patch} (55%) rename src/SourceBuild/tarball/patches/roslyn/{0001-Apply-arcade-powered-source-build-patches-55823.patch => 0002-Apply-arcade-powered-source-build-patches-55823.patch} (100%) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch similarity index 55% rename from src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch rename to src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index 59c21bd29..77ea3ffe0 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -1,29 +1,49 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Tue, 19 Oct 2021 16:57:47 +0000 -Subject: [PATCH] force Microsoft.Build to 16.5.0 with RefOnly prefix - -PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 - -By default, the projects reference Microsoft.Build 16.5.0, which has netcoreapp2.1 and net472 support. The new 17.0.0-... -version built during source-build only has net6.0. This causes Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj to fail. -Adding 16.5.0 to SBRP and dodging the override by renaming each package version property is the safe way to fix it. +From: Joey Robichaud +Date: Wed, 20 Oct 2021 13:40:38 -0700 +Subject: [PATCH] Add Features projects to SourceBuild +For additional details see https://github.com/dotnet/roslyn/issues/57270 +Patch created from: https://github.com/dotnet/roslyn/pull/57277 --- - eng/Versions.props | 15 +++++++++------ - .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 4 ++-- - ...soft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- - .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - ...sis.LanguageServerIndexFormat.Generator.csproj | 2 +- - src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 4 ++-- - src/Tools/IdeBenchmarks/IdeBenchmarks.csproj | 2 +- - .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 4 ++-- - ...crosoft.CodeAnalysis.Workspaces.MSBuild.csproj | 6 +++--- - ...deAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 10 files changed, 28 insertions(+), 25 deletions(-) + eng/SourceBuild.props | 2 +- + eng/Versions.props | 13 ++++++++----- + .../Core/Tests}/Directory.Build.props | 0 + .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- + ...rosoft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- + .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- + src/Dependencies/Directory.Build.props | 3 --- + .../Microsoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ + .../Portable/Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- + src/Features/LanguageServer/Directory.Build.props | 6 ++++++ + src/Features/Lsif/Directory.Build.props | 6 ++++++ + ...crosoft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ + src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ + src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- + .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- + ...Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- + ...CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- + 17 files changed, 60 insertions(+), 29 deletions(-) + rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) + create mode 100644 src/Features/LanguageServer/Directory.Build.props + create mode 100644 src/Features/Lsif/Directory.Build.props + create mode 100644 src/NuGet/VisualStudio/Directory.Build.props +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 182f8a9cdb1..92e316a4744 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -11,7 +11,7 @@ + --> + + +- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln" ++ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" + + + diff --git a/eng/Versions.props b/eng/Versions.props -index e835ef04d52..0eb674c462e 100644 +index e835ef04d52..d432c9a6a96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ @@ -41,7 +61,7 @@ index e835ef04d52..0eb674c462e 100644 6.1.0.5902 - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) -- 1.2.6 + 1.2.6 - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) + + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) -+ 1.2.6 + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) 6.0.0-preview.0.15 16.10.23 + $(NoWarn);CA1819 +- ++ + + true + Microsoft.CodeAnalysis.Build.Tasks @@ -51,8 +51,8 @@ @@ -104,68 +136,152 @@ index 3644afb8c2f..ed4259ec61b 100644 -diff --git a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj -index 80e7b11f9ea..8e1cb47fb98 100644 ---- a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj -+++ b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj -@@ -42,7 +42,7 @@ - - - -- -+ - - +diff --git a/src/Dependencies/Directory.Build.props b/src/Dependencies/Directory.Build.props +index 6eef643958f..12d9ad073ec 100644 +--- a/src/Dependencies/Directory.Build.props ++++ b/src/Dependencies/Directory.Build.props +@@ -1,6 +1,3 @@ + + +- +- true +- + +diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +index a82a820316c..9dac307c856 100644 +--- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj ++++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +@@ -60,6 +60,11 @@ + InternalUtilities\LambdaUtilities.cs + ++ ++ ++ ++ ++ + + + +diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +index 1af351cc77b..943443c55bc 100644 +--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj ++++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +@@ -7,7 +7,7 @@ + netcoreapp3.1;netstandard2.0 + full + true +- ++ + + true + +@@ -129,7 +129,13 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/LanguageServer/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Features/Lsif/Directory.Build.props b/src/Features/Lsif/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/Lsif/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +index ac8c80c68fb..d17a5d84802 100644 +--- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj ++++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +@@ -55,6 +55,10 @@ + InternalUtilities\LambdaUtilities.vb + + ++ ++ ++ ++ + + + +diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/NuGet/VisualStudio/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj -index 6e1cbe46285..c0826b08af6 100644 +index 6e1cbe46285..8ca3cbb28f0 100644 --- a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj +++ b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj -@@ -23,8 +23,8 @@ +@@ -23,7 +23,7 @@ - -- + -+ + - -diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -index b6ab0e38e59..34e6a5f22fe 100644 ---- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -+++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -@@ -12,7 +12,7 @@ - - - -- -+ - - - diff --git a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj -index 305f94cba17..7e156fc302d 100644 +index 305f94cba17..e2373f8a3d6 100644 --- a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj +++ b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj -@@ -29,9 +29,9 @@ +@@ -29,7 +29,7 @@ - + -- -+ + - - diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -index 3bd6d6398e3..76d0dc36da1 100644 +index 3bd6d6398e3..a65fc35f1c3 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -@@ -24,9 +24,9 @@ +@@ -7,8 +7,6 @@ + true + netcoreapp3.1;net472 + $(DefineConstants);WORKSPACE_MSBUILD +- true +- + + true + +@@ -24,9 +22,9 @@ diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch similarity index 100% rename from src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch rename to src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch deleted file mode 100644 index 321db7037..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Thu, 14 Oct 2021 18:24:18 -0500 -Subject: [PATCH] Build more projects during source-build - -Use Roslyn.sln, not Compilers.sln, to build more projects during -source-build. Update ExcludeFromSourceBuild properties to include more -projects and exclude a few projects that shouldn't be in source-build. - -The newly included projects are used by downstream repos. - -See https://github.com/dotnet/roslyn/pull/57165 ---- - eng/SourceBuild.props | 2 +- - .../Core/Tests}/Directory.Build.props | 0 - src/Features/LanguageServer/Directory.Build.props | 6 ++++++ - src/Features/Lsif/Directory.Build.props | 6 ++++++ - src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ - .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 2 -- - 6 files changed, 19 insertions(+), 3 deletions(-) - rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) - create mode 100644 src/Features/LanguageServer/Directory.Build.props - create mode 100644 src/Features/Lsif/Directory.Build.props - create mode 100644 src/NuGet/VisualStudio/Directory.Build.props - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 182f8a9cdb1..92e316a4744 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -11,7 +11,7 @@ - --> - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln" -+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" - - - -diff --git a/src/Features/Directory.Build.props b/src/CodeStyle/Core/Tests/Directory.Build.props -similarity index 100% -rename from src/Features/Directory.Build.props -rename to src/CodeStyle/Core/Tests/Directory.Build.props -diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/LanguageServer/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Features/Lsif/Directory.Build.props b/src/Features/Lsif/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/Lsif/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/NuGet/VisualStudio/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -index 3bd6d6398e3..2edf2da6d1a 100644 ---- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -+++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -@@ -7,8 +7,6 @@ - true - netcoreapp3.1;net472 - $(DefineConstants);WORKSPACE_MSBUILD -- true -- - - true - From 16d51bd2aaa643515adb3e8ca6741a347ca3fa19 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 03:14:32 +0000 Subject: [PATCH 105/164] Patch edits --- ...Add-Features-projects-to-SourceBuild.patch | 104 ++++++++++++------ 1 file changed, 70 insertions(+), 34 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index 77ea3ffe0..e2f3e2782 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -3,27 +3,26 @@ From: Joey Robichaud Date: Wed, 20 Oct 2021 13:40:38 -0700 Subject: [PATCH] Add Features projects to SourceBuild -For additional details see https://github.com/dotnet/roslyn/issues/57270 -Patch created from: https://github.com/dotnet/roslyn/pull/57277 --- - eng/SourceBuild.props | 2 +- - eng/Versions.props | 13 ++++++++----- - .../Core/Tests}/Directory.Build.props | 0 - .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- - ...rosoft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- - .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - src/Dependencies/Directory.Build.props | 3 --- - .../Microsoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ - .../Portable/Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- - src/Features/LanguageServer/Directory.Build.props | 6 ++++++ - src/Features/Lsif/Directory.Build.props | 6 ++++++ - ...crosoft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ - src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ - src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- - .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- - ...Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- - ...CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 17 files changed, 60 insertions(+), 29 deletions(-) + eng/SourceBuild.props | 2 +- + eng/Versions.props | 17 ++++++++++++----- + .../Core/Tests}/Directory.Build.props | 0 + .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- + ...ft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- + .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- + ...soft.CodeAnalysis.Collections.Package.csproj | 1 + + ...icrosoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ + .../Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- + .../LanguageServer/Directory.Build.props | 6 ++++++ + src/Features/Lsif/Directory.Build.props | 6 ++++++ + ...oft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ + src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ + src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- + src/Tools/BuildBoss/ProjectCheckerUtil.cs | 7 ++++--- + .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- + ...osoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- + ...Analysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- + 18 files changed, 69 insertions(+), 29 deletions(-) rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props @@ -43,7 +42,7 @@ index 182f8a9cdb1..92e316a4744 100644 diff --git a/eng/Versions.props b/eng/Versions.props -index e835ef04d52..d432c9a6a96 100644 +index e835ef04d52..34cab5c4755 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ @@ -55,7 +54,7 @@ index e835ef04d52..d432c9a6a96 100644 + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) @@ -136,17 +139,18 @@ index 3644afb8c2f..ed4259ec61b 100644 -diff --git a/src/Dependencies/Directory.Build.props b/src/Dependencies/Directory.Build.props -index 6eef643958f..12d9ad073ec 100644 ---- a/src/Dependencies/Directory.Build.props -+++ b/src/Dependencies/Directory.Build.props -@@ -1,6 +1,3 @@ - - -- -- true -- - +diff --git a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj +index 22cab2f5f03..cfc79989175 100644 +--- a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj ++++ b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj +@@ -7,6 +7,7 @@ + none + false + true ++ false + + + true diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index a82a820316c..9dac307c856 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj @@ -255,6 +259,38 @@ index 6e1cbe46285..8ca3cbb28f0 100644 +diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs +index e571afede4a..0cb613b77a6 100644 +--- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs ++++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs +@@ -157,6 +157,7 @@ private IEnumerable GetAllowedPackageReferenceVersions(PackageReference + var name = packageReference.Name.Replace(".", "").Replace("-", ""); + yield return $"$({name}Version)"; + yield return $"$({name}FixedVersion)"; ++ yield return $"$(RefOnly{name}Version)"; + } + } + +@@ -234,8 +235,8 @@ private bool CheckProjectReferencesComplete(TextWriter textWriter, IEnumerable

                              +- /// Unit test projects should not reference each other. In order for unit tests to be run / F5 they must be +- /// modeled as deployment projects. Having Unit Tests reference each other hurts that because it ends up ++ /// Unit test projects should not reference each other. In order for unit tests to be run / F5 they must be ++ /// modeled as deployment projects. Having Unit Tests reference each other hurts that because it ends up + /// putting two copies of the unit test DLL into the UnitTest folder: + /// + /// 1. UnitTests\Current\TheUnitTest\TheUnitTest.dll +@@ -244,7 +245,7 @@ private bool CheckProjectReferencesComplete(TextWriter textWriter, IEnumerable

                              Date: Thu, 21 Oct 2021 03:20:26 +0000 Subject: [PATCH 106/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21520.3 -> To Version 6.0.0-alpha.1.21520.4 --- 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 1c3c7e347..359fbd82f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/source-build-reference-packages - d662881202d3555752f5eab4dd0c2a63dffdefc0 + fae61cb00365695985fcd11d5a07f30caed1554d From 544f720d0c6ce0150741e73e6f49e4e4ab401e89 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 04:32:21 +0000 Subject: [PATCH 107/164] Edits per code review --- ...-building-all-TFMs-for-source-build.patch} | 6 ++++-- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 19 ++++--------------- 2 files changed, 8 insertions(+), 17 deletions(-) rename src/SourceBuild/tarball/patches/msbuild/{0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch => 0003-Restore-building-all-TFMs-for-source-build.patch} (90%) diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch similarity index 90% rename from src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch rename to src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch index 046864705..ddb0688ae 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch @@ -1,9 +1,11 @@ From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 20 Oct 2021 15:19:29 -0500 -Subject: [PATCH] Restore building all TFMs for source-build to support NuGet - to support templating. +Subject: [PATCH] Restore building all TFMs for source-build +Required for omnisharp, nuget-client, templating + +Background Issue: https://github.com/dotnet/source-build/issues/2542 --- src/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 92e3c8113..6ca89df7d 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -3,15 +3,17 @@ From: dseefeld Date: Wed, 20 Oct 2021 21:49:51 +0000 Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop +Removes prebuilts. + +Background Issue: https://github.com/dotnet/source-build/issues/2542 --- eng/Packages.props | 3 --- src/Build/Microsoft.Build.csproj | 4 +++- src/Directory.BeforeCommon.targets | 2 +- src/Samples/Directory.Build.props | 1 + - src/Samples/Directory.Build.targets | 2 +- src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- - 7 files changed, 10 insertions(+), 8 deletions(-) + 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/eng/Packages.props b/eng/Packages.props index 2de607c5d..1668addc9 100644 @@ -68,19 +70,6 @@ index 6b9d6cd9f..317ef14a6 100644 -diff --git a/src/Samples/Directory.Build.targets b/src/Samples/Directory.Build.targets -index 78b52aab8..db80eff4d 100644 ---- a/src/Samples/Directory.Build.targets -+++ b/src/Samples/Directory.Build.targets -@@ -2,7 +2,7 @@ - - - -- -+ - - - diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj index d8f81bf99..3a5514094 100644 --- a/src/Tasks/Microsoft.Build.Tasks.csproj From f165d9f83a13aca7dd1953006707173a221cf84b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Oct 2021 06:48:43 +0000 Subject: [PATCH 108/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21520.4 -> To Version 6.0.0-alpha.1.21520.5 --- 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 359fbd82f..01b9b9fdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/source-build-reference-packages - fae61cb00365695985fcd11d5a07f30caed1554d + b0333b75bee589b899ff863c587f1345e69e1292 From 023e0d7186f402997054cb045a8682774835a1eb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 12:26:21 +0000 Subject: [PATCH 109/164] Update to not include CA.Collection package in source-build --- ...001-Add-Features-projects-to-SourceBuild.patch | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index e2f3e2782..3a783fa63 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -10,7 +10,6 @@ Subject: [PATCH] Add Features projects to SourceBuild .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- ...ft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - ...soft.CodeAnalysis.Collections.Package.csproj | 1 + ...icrosoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ .../Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- .../LanguageServer/Directory.Build.props | 6 ++++++ @@ -22,7 +21,7 @@ Subject: [PATCH] Add Features projects to SourceBuild .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- ...osoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- ...Analysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 18 files changed, 69 insertions(+), 29 deletions(-) + 17 files changed, 68 insertions(+), 29 deletions(-) rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props @@ -139,18 +138,6 @@ index 3644afb8c2f..ed4259ec61b 100644 -diff --git a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj -index 22cab2f5f03..cfc79989175 100644 ---- a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj -+++ b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj -@@ -7,6 +7,7 @@ - none - false - true -+ false - - - true diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index a82a820316c..9dac307c856 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj From 08fc0161cbccba524cfc1d97bc3c802d2dbddacb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 12:32:30 +0000 Subject: [PATCH 110/164] Update source-build prebuilts and previous source-build --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c368e9410..c4350ccef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,8 +159,8 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.27 - 0.1.0-6.0.100-34 + 0.1.0-6.0.100-bootstrap.28 + 0.1.0-6.0.100-35 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index d745e47f1..3ce422150 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -22,6 +22,6 @@ 0.1.0-6.0.100- - 34 + 35 From f0fe35160370e729979581d05fd1ed9356011fa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 06:22:35 -0700 Subject: [PATCH 111/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12473) * Update dependencies from https://github.com/dotnet/sdk build 20211020.26 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.26 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Update dependencies from https://github.com/dotnet/sdk build 20211020.31 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.31 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211021.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.1 * Update dependencies from https://github.com/dotnet/sdk build 20211021.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100-rtm.21521.2 * Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211021.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons --- NuGet.config | 11 ++- eng/Version.Details.xml | 96 +++++++++---------- eng/Versions.props | 44 ++++----- ...eting-pack-build-during-source-build.patch | 61 ------------ 4 files changed, 80 insertions(+), 132 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch diff --git a/NuGet.config b/NuGet.config index 714c7a75c..1e3cdca5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,17 @@ + + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01b9b9fdf..3141338fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 - + https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 - + https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - e380623de8e689cd7209ffe0881b744413e3e0d6 + afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/templating - e380623de8e689cd7209ffe0881b744413e3e0d6 + afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/templating - e380623de8e689cd7209ffe0881b744413e3e0d6 + afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - 4d19f430e05e0c0771b6abf86be9bf137f2cc242 + a7f1f2fadcb9c9564618602f76ae8df54e24ca5a - + https://github.com/dotnet/sdk - 4d19f430e05e0c0771b6abf86be9bf137f2cc242 + a7f1f2fadcb9c9564618602f76ae8df54e24ca5a - + https://github.com/dotnet/winforms - 080dcacb82db540cc26e5bf9882c6af9320ba535 + a4e643851b62969e46b9a208f9d32dfde6c93b95 - + https://github.com/dotnet/wpf - eee7eff2c7837b56fdb7f313540de74bc1b41a41 + 7dba431f76d513ae009c58a2c588e7be5ac2dd45 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 73c8cd3619efc79364fef5fa81989f9e0dd2147b + 7b2c3228bec174e2ef12bc189e9c176eafd24334 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c368e9410..fda225b62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21519.4 + 6.0.0-rtm.21520.13 - 6.0.0-rtm.21519.8 + 6.0.0-rtm.21520.13 - 6.0.100-rtm.21519.1 + 6.0.100-rtm.21521.1 @@ -44,42 +44,42 @@ - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 + 6.0.0 + 6.0.0 + 6.0.0-rtm.21521.1 + 6.0.0-rtm.21521.1 + 6.0.0-rtm.21521.1 + 6.0.0-rtm.21521.1 0.2.0 - 6.0.100-rtm.21520.1 - 6.0.100-rtm.21520.1 + 6.0.100-rtm.21521.3 + 6.0.100-rtm.21521.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21518.12 + 6.0.0 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 + 6.0.0-rtm.21520.9 + 6.0.0-rtm.21520.9 + 6.0.0 + 6.0.0 + 6.0.0 + 6.0.0 2.1.0 - 6.0.0-rtm.21519.11 - 6.0.0-rtm.21519.11 + 6.0.0-rtm.21520.17 + 6.0.0-rtm.21520.17 6.0.0 6.0.0 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21519.1 + 6.0.100-rtm.21521.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -171,7 +171,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rtm.21514.1 + 6.0.0 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch deleted file mode 100644 index a39dd0021..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Mon, 18 Oct 2021 14:25:29 -0500 -Subject: [PATCH] Enable targeting pack build during source-build - -For prebuilt removal: https://github.com/dotnet/source-build/issues/2506 - -Upstream PR to main: https://github.com/dotnet/aspnetcore/pull/37652 ---- - Directory.Build.props | 1 - - Directory.Build.targets | 4 ++-- - .../CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj | 7 +++++++ - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 204df64da7..77045590cd 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -142,7 +142,6 @@ - aspnetcore-targeting-pack - - -- false - false - true -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 6e30c30881..1f1616124b 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -1,10 +1,10 @@ -  - - -- -+ - - true -+ Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(MSBuildProjectName)' != '$(TargetingPackName)' and '$(IsAnalyzersProject)' != 'true'">true - - -diff --git a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj -index d70178504e..02bad93889 100644 ---- a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj -+++ b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj -@@ -2,6 +2,13 @@ - - CSharp CodeFixes for ASP.NET Core. - false -+ -+ true - false - netstandard2.0 - false From d87673683cd85a4f4f4c7edd65630374434e2ce4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 21 Oct 2021 08:04:41 -0700 Subject: [PATCH 112/164] Repoint source-build dependencies for runtime and aspnet --- 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 3141338fd..f4f20eec8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -20,7 +20,6 @@ https://github.com/dotnet/runtime 6f41165853278914d1a28d7f325ebe04ab78ac07 - https://github.com/dotnet/runtime @@ -33,6 +32,7 @@ https://github.com/dotnet/runtime 6f41165853278914d1a28d7f325ebe04ab78ac07 + https://github.com/dotnet/runtime @@ -63,11 +63,11 @@ https://github.com/dotnet/aspnetcore 20de863bd37ad521b7a3bd6056186da5e8a7a2ef + https://github.com/dotnet/aspnetcore 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - https://github.com/dotnet/aspnetcore From 00a9212068f4b048655e1107c25a85fb37df4f6d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 21 Oct 2021 08:08:10 -0700 Subject: [PATCH 113/164] touch sb dir --- src/SourceBuild/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/README.md b/src/SourceBuild/README.md index cb90757a6..625e25a0f 100644 --- a/src/SourceBuild/README.md +++ b/src/SourceBuild/README.md @@ -6,7 +6,7 @@ to build .NET from source. For more information, see [dotnet/source-build](https://github.com/dotnet/source-build). -## Local development workflow +## Local development workflow These are the steps used by some members of the .NET source-build team to create a tarball and build it on a local machine as part of the development cycle: From b0217294ed73d295f42b379766e127f9d176529f Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 21 Oct 2021 17:19:38 +0000 Subject: [PATCH 114/164] aspnetcore stable version workaround --- eng/Version.Details.xml | 2 +- src/SourceBuild/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4f20eec8..5cdb23f74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,7 +63,7 @@ https://github.com/dotnet/aspnetcore 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore diff --git a/src/SourceBuild/README.md b/src/SourceBuild/README.md index 625e25a0f..cb90757a6 100644 --- a/src/SourceBuild/README.md +++ b/src/SourceBuild/README.md @@ -6,7 +6,7 @@ to build .NET from source. For more information, see [dotnet/source-build](https://github.com/dotnet/source-build). -## Local development workflow +## Local development workflow These are the steps used by some members of the .NET source-build team to create a tarball and build it on a local machine as part of the development cycle: From 4674b50a341a3f9856821af4cab29ef900deb0e2 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 21 Oct 2021 12:49:15 -0500 Subject: [PATCH 115/164] Polish patch files: squash and add links --- ...apphost-for-fsi-fsc-for-source-build.patch | 35 ------------- ...n-downlevel-frameworks-during-sourc.patch} | 50 +++++++++++++++++-- ...st-build-of-csi-vbi-for-source-build.patch | 8 ++- 3 files changed, 52 insertions(+), 41 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch rename src/SourceBuild/tarball/patches/fsharp/{0002-Remove-apphost-pack-prebuilts-during-source-build.patch => 0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch} (69%) diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch deleted file mode 100644 index 2e078b165..000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-for-fsi-fsc-for-source-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 19 Oct 2021 16:11:51 -0500 -Subject: [PATCH] Disable apphost for 'fsi', 'fsc' for source-build - -Creating an apphost for a net5.0 project while building with a net6.0 SDK downloads the apphost pack as a prebuilt. Stopping the project from creating the apphost removes the prebuilt for source-build. ---- - src/fsharp/fsc/fsc.fsproj | 1 + - src/fsharp/fsi/fsi.fsproj | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj -index 7fa31fc21..04025c297 100644 ---- a/src/fsharp/fsc/fsc.fsproj -+++ b/src/fsharp/fsc/fsc.fsproj -@@ -12,6 +12,7 @@ - $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 - true - true -+ false - - - -diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj -index 9fd9b1333..eace6c166 100644 ---- a/src/fsharp/fsi/fsi.fsproj -+++ b/src/fsharp/fsi/fsi.fsproj -@@ -13,6 +13,7 @@ - fsi.res - true - true -+ false - - - diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-Remove-apphost-pack-prebuilts-during-source-build.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch similarity index 69% rename from src/SourceBuild/tarball/patches/fsharp/0002-Remove-apphost-pack-prebuilts-during-source-build.patch rename to src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch index e88e10cea..d9a483852 100644 --- a/src/SourceBuild/tarball/patches/fsharp/0002-Remove-apphost-pack-prebuilts-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch @@ -1,18 +1,34 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Davis Goodin -Date: Tue, 19 Oct 2021 19:34:11 -0500 -Subject: [PATCH] Remove apphost pack prebuilts during source-build +Date: Tue, 19 Oct 2021 16:11:51 -0500 +Subject: [PATCH] Disable apphost on downlevel frameworks during source-build -Add a check to eng/build.sh to avoid running the bootstrapping twice: once in the outer build and again in the inner build. +During source-build, disable apphost build for 'fsi' and 'fsc', and +'fsyacc', 'fslex', and 'AssemblyCheck' during the bootstrap build. -Sets UseAppHost=false during source-build for the projects that build during bootstrapping. Pass the DotNetBuildFromSource property through the environment in eng/SourceBuild.props so it takes effect. +Creating an apphost for a net5.0 project while building with a net6.0 +SDK downloads the apphost pack as a prebuilt. Stopping the projects from +creating the apphost removes the prebuilt for source-build. + +To make disabling the apphost work in the bootstrapping build, add a +check to eng/build.sh to skip the bootstrap build if we're currently +running the "outer" source-build. That gives source-build the ability to +run bootstrapping on its own terms. Now, when eng/SourceBuild.props runs +bootstrapping, it can pass the DotNetBuildFromSource property through +the environment so it takes effect. + +See: https://github.com/dotnet/fsharp/issues/12282 + +PR: https://github.com/dotnet/fsharp/pull/12286 --- eng/SourceBuild.props | 2 +- eng/build.sh | 51 ++++++++++--------- .../AssemblyCheck/AssemblyCheck.fsproj | 1 + src/buildtools/fslex/fslex.fsproj | 1 + src/buildtools/fsyacc/fsyacc.fsproj | 1 + - 5 files changed, 32 insertions(+), 24 deletions(-) + src/fsharp/fsc/fsc.fsproj | 1 + + src/fsharp/fsi/fsi.fsproj | 1 + + 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 22c929f28..903ee00d3 100644 @@ -125,3 +141,27 @@ index 5d1b7141f..63b63c5de 100644 +diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj +index 7fa31fc21..04025c297 100644 +--- a/src/fsharp/fsc/fsc.fsproj ++++ b/src/fsharp/fsc/fsc.fsproj +@@ -12,6 +12,7 @@ + $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 + true + true ++ false + + + +diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj +index 9fd9b1333..eace6c166 100644 +--- a/src/fsharp/fsi/fsi.fsproj ++++ b/src/fsharp/fsi/fsi.fsproj +@@ -13,6 +13,7 @@ + fsi.res + true + true ++ false + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch index 528517fb8..f94119820 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch @@ -3,7 +3,13 @@ From: Davis Goodin Date: Tue, 19 Oct 2021 19:38:52 -0500 Subject: [PATCH] Disable apphost build of 'csi', 'vbi' for source-build -Creating an apphost for a netcoreapp3.1 project uses the apphost pack as a prebuilt. Stopping these projects from creating the apphost removes the prebuilt for source-build. +Creating an apphost for a netcoreapp3.1 project uses the apphost pack as a +prebuilt. Stopping these projects from creating the apphost removes the prebuilt +for source-build. + +See: https://github.com/dotnet/roslyn/issues/57233 + +PR: https://github.com/dotnet/roslyn/pull/57306 --- src/Interactive/csi/csi.csproj | 1 + src/Interactive/vbi/vbi.vbproj | 1 + From 228b577bf469285e83b35362c9a63d4ee060013f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:57:08 +0000 Subject: [PATCH 116/164] Update dependencies from https://github.com/dotnet/sdk build 20211021.8 (#12480) [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 5cdb23f74..c767e27e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - a7f1f2fadcb9c9564618602f76ae8df54e24ca5a + a4161aeba7fb98361d48de38d9f1b4e384de0d04 - + https://github.com/dotnet/sdk - a7f1f2fadcb9c9564618602f76ae8df54e24ca5a + a4161aeba7fb98361d48de38d9f1b4e384de0d04 diff --git a/eng/Versions.props b/eng/Versions.props index fcddaed32..a9e507c1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21521.3 - 6.0.100-rtm.21521.3 + 6.0.100-rtm.21521.8 + 6.0.100-rtm.21521.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e2d434f9a2560dcdeb914a6f60ac7683df6c7ed Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 19:38:00 +0000 Subject: [PATCH 117/164] Workaround missing smoke-test prereqs --- src/SourceBuild/tarball/content/smoke-test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index 61a6bf106..5adebbe2f 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -330,11 +330,13 @@ function runWebTests() { doCommand C# mvc "$@" new restore build run multi-rid-publish doCommand C# webapi "$@" new restore build multi-rid-publish doCommand C# razor "$@" new restore build run multi-rid-publish - doCommand C# blazorwasm "$@" new restore build run publish + # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 + # doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish doCommand F# web "$@" new restore build run multi-rid-publish - doCommand F# mvc "$@" new restore build run multi-rid-publish + # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 + # doCommand F# mvc "$@" new restore build run multi-rid-publish doCommand F# webapi "$@" new restore build run multi-rid-publish } @@ -518,6 +520,7 @@ function runXmlDocTests() { System.Xml.Serialization.xml System.Xml.xml System.Xml.XmlDocument.xml + WindowsBase.xml ) aspnetcoreappIgnoreList=( From 2736213c6828f6d8c12920a9a7178dd960d5a664 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 21 Oct 2021 13:26:34 -0700 Subject: [PATCH 118/164] Revert "Revert "[release/6.0.1xx] Switch to stable RTM branding"" (#12471) * Revert "Revert "[release/6.0.1xx] Switch to stable RTM branding" (#12470)" This reverts commit 2bca7f450a7a5065b201a99e373f5142e22a32f4. * Workaround F# failures in tests * No need for feed --- eng/Versions.props | 2 +- test/EndToEnd/ProjectBuildTests.cs | 7 +++++++ test/SdkTests/SdkTests.csproj | 6 ------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a9e507c1e..a24d151f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 4a9f97435..e3377ef9e 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -412,6 +412,13 @@ namespace EndToEnd.Tests { buildArgs += $" --framework {framework}"; } + + // Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved. + if (language == "F#") + { + buildArgs += $" /p:_NETCoreSdkIsPreview=true"; + } + string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index d29c94b0e..2674c0f5a 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -162,12 +162,6 @@ - - - - - - ]]> From 374f8b5faa148c0303c3d0a5d5d75c168c3220ac Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:24:30 +0000 Subject: [PATCH 119/164] add patch for lifting versions of roslyn prebuilts --- ...Microsoft.CodeAnalysis.Common-depend.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch new file mode 100644 index 000000000..2f0a10ecd --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Thu, 21 Oct 2021 23:15:23 +0000 +Subject: [PATCH] lift version of Microsoft.CodeAnalysis.Common dependencies to + previously source built versions + +--- + .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +index 7eae8afa275..a50822a6aeb 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +@@ -27,5 +27,9 @@ + + + ++ ++ ++ ++ + + +\ No newline at end of file From 2903842db2a23c864ac24427ff8fe54f384279a0 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:33:08 +0000 Subject: [PATCH 120/164] add ExtraPackageVersionPropsPackageInfo to force roslyn prebuilts to previously source built versions --- src/SourceBuild/tarball/content/repos/roslyn.proj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 9a6efe331..6aeeebdf2 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -30,6 +30,10 @@ need to support VS. --> + + + + From a2c7b5b27746526eab5d4512a29ff446ec633114 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:47:27 +0000 Subject: [PATCH 121/164] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211021.1 (#12484) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 3 +++ eng/Version.Details.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1e3cdca5b..02f225e31 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,18 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c767e27e7..200b92b0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/source-build-reference-packages - b0333b75bee589b899ff863c587f1345e69e1292 + fc184172bf8144f7c91a7bc0226b7d90c5821576 From ffcb72fbdcf90786df221603c2c244689fdc425b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 22 Oct 2021 02:56:26 +0000 Subject: [PATCH 122/164] Update source-build prebuilts and previous source-build --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a24d151f8..eed8f9f2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,8 +159,8 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.28 - 0.1.0-6.0.100-35 + 0.1.0-6.0.100-bootstrap.29 + 0.1.0-6.0.100-36 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 3ce422150..4701139f6 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -22,6 +22,6 @@ 0.1.0-6.0.100- - 35 + 36 From cfa552637def4ebd9b714a491786752c07f32cb8 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 20 Oct 2021 15:20:30 -0500 Subject: [PATCH 123/164] wip: just enable themissing NuGet and MSBuild TFMs --- ...-all-TFMs-for-source-build-to-suppor.patch | 32 +++++++++++++++++++ .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 4 +-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch new file mode 100644 index 000000000..046864705 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch @@ -0,0 +1,32 @@ +From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 20 Oct 2021 15:19:29 -0500 +Subject: [PATCH] Restore building all TFMs for source-build to support NuGet + to support templating. + +--- + src/Directory.Build.props | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/Directory.Build.props b/src/Directory.Build.props +index b0e233194..7e0c7d8c8 100644 +--- a/src/Directory.Build.props ++++ b/src/Directory.Build.props +@@ -27,13 +27,12 @@ + + + $(FullFrameworkTFM);netstandard2.0 +- netstandard2.0 + $(FullFrameworkTFM) + AnyCPU + + + net6.0 +- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) ++ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) + $(FullFrameworkTFM) + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 6be953ae4..217b2cb43 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -17,11 +17,11 @@ index 80433ed60..8acc4e0bb 100644 v4.7.2 net472 - netcoreapp2.1 -+ net6.0 ++ netcoreapp2.1;net6.0 netcoreapp5.0 $(DotNetBuildFromSource) - netstandard2.0 -+ net6.0 ++ netstandard2.0;net6.0 $(NETFXTargetFramework);$(NETCoreTargetFramework) $(NETCoreTargetFramework) - $(TargetFrameworksExe);netcoreapp5.0 From 34ee4c4fffdb5a995a89c903fce27054c18163c2 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 10:22:27 -0500 Subject: [PATCH 124/164] Delete templating patch and just use netstandard2.0 in NuGet. --- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 2 +- .../templating/0001-pin-nuget-versions.patch | 30 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 217b2cb43..dd1c4b260 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -17,7 +17,7 @@ index 80433ed60..8acc4e0bb 100644 v4.7.2 net472 - netcoreapp2.1 -+ netcoreapp2.1;net6.0 ++ net6.0 netcoreapp5.0 $(DotNetBuildFromSource) - netstandard2.0 diff --git a/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch b/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch deleted file mode 100644 index a78c3d97f..000000000 --- a/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c0ec49b887cae58bb860a18982115c5910f29821 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 14 Sep 2021 22:54:01 +0000 -Subject: [PATCH] pin nuget versions - -Temporary fix for https://github.com/dotnet/source-build/issues/2455 to unblock source-build ---- - Directory.Build.targets | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 0dc99916..7c45fda3 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -12,9 +12,9 @@ - - - -- -- -- -+ -+ -+ - - - --- -2.29.2 - From aab9a8b3a66edf0d35ff4dedcd086f1260641a89 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 12:10:14 -0500 Subject: [PATCH 125/164] A few projects didn't use the project-wide variables for determining TFMs. --- ...se-PublicApiAnalyzer-on-source-build.patch | 9 ++- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 68 ++++++++++++++++--- ...-Microsoft.Web.Xdt-System.ComponentM.patch | 8 +-- ...anges-to-support-ArPow-from-tarball.patch} | 10 +-- ...patch => 0005-Upgrade-to-.NET-6-SDK.patch} | 10 +-- ...works-for-netstandard-as-well-for-V.patch} | 11 +-- ...ild.Tasks.Pack-source-build-support.patch} | 12 ++-- ...Extensions.CommandLineUtils-referen.patch} | 11 +-- 8 files changed, 97 insertions(+), 42 deletions(-) rename src/SourceBuild/tarball/patches/nuget-client/{0005-Build-script-changes-to-support-ArPow-from-tarball.patch => 0004-Build-script-changes-to-support-ArPow-from-tarball.patch} (94%) rename src/SourceBuild/tarball/patches/nuget-client/{0006-Upgrade-to-.NET-6-SDK.patch => 0005-Upgrade-to-.NET-6-SDK.patch} (96%) rename src/SourceBuild/tarball/patches/nuget-client/{0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch => 0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch} (72%) rename src/SourceBuild/tarball/patches/nuget-client/{0008-NuGet.Build.Tasks.Pack-source-build-support.patch => 0007-NuGet.Build.Tasks.Pack-source-build-support.patch} (83%) rename src/SourceBuild/tarball/patches/nuget-client/{0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch => 0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch} (92%) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch index 1cb91f3d3..8ab3267b2 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch @@ -1,17 +1,16 @@ -From 335f32e48fd5604cdb1340ec04d6503a3e43d783 Mon Sep 17 00:00:00 2001 +From 198d70708016e5406e0d525567ca58962e222399 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:09:35 +0000 -Subject: [PATCH] Don't use PublicApiAnalyzer on source-build +Subject: [PATCH 1/8] Don't use PublicApiAnalyzer on source-build CSC : warning AD0001: Analyzer 'Microsoft.CodeAnalysis.PublicApiAnalyzers.DeclarePublicApiAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. CSC : error CS2001: Source file '/repos/installer2/artifacts/tarball/src/nuget-client.7363366401b43f4ea250394db8dad3707e9a9636/src/NuGet.Core/NuGet.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt' could not be found. - --- build/common.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/common.targets b/build/common.targets -index 2c387f576..cf5a70c62 100644 +index 7a353ebf8..6fd5bd260 100644 --- a/build/common.targets +++ b/build/common.targets @@ -65,6 +65,11 @@ @@ -27,5 +26,5 @@ index 2c387f576..cf5a70c62 100644 true -- -2.29.2 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index dd1c4b260..c63ce0ccb 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,15 +1,19 @@ -From e0e1d72dfa8881244a76c3dbcc63aa73c05546f4 Mon Sep 17 00:00:00 2001 +From 98fd2091519fa4c6d9ab850eaea92700b00803dc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 -Subject: [PATCH] Update netcoreapp TFMs to 6.0 +Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 --- - build/common.project.props | 10 +++++----- - build/common.targets | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) + build/common.project.props | 10 +++++----- + build/common.targets | 2 +- + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - + .../NuGet.Configuration/NuGet.Configuration.csproj | 1 - + .../NuGet.Frameworks/NuGet.Frameworks.csproj | 1 - + .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - + 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build/common.project.props b/build/common.project.props -index 80433ed60..8acc4e0bb 100644 +index e2e3c0c11..000702f58 100644 --- a/build/common.project.props +++ b/build/common.project.props @@ -13,17 +13,17 @@ @@ -36,7 +40,7 @@ index 80433ed60..8acc4e0bb 100644 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ $(RepositoryRootDirectory)build\ diff --git a/build/common.targets b/build/common.targets -index cf5a70c62..8827686a7 100644 +index 6fd5bd260..3de830b25 100644 --- a/build/common.targets +++ b/build/common.targets @@ -6,7 +6,7 @@ @@ -48,6 +52,54 @@ index cf5a70c62..8827686a7 100644 $(DefineConstants);IS_CORECLR true +diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +index e30a079eb..c2b8fe241 100644 +--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj ++++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +@@ -5,7 +5,6 @@ + + Common utilities and interfaces for all NuGet libraries. + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + $(NoWarn);CS1591;CS1574 + true +diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +index bbc5ba480..fc4d42502 100644 +--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj ++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +@@ -6,7 +6,6 @@ + NuGet's configuration settings implementation. + $(NoWarn);CS1591 + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + true + true +diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +index 65f261dc1..f29551741 100644 +--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj ++++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +@@ -5,7 +5,6 @@ + + NuGet's understanding of target frameworks. + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net40 + + $(NoWarn);CS1591;CS1574;CS1573 + true +diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +index 180293944..8498664b9 100644 +--- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj ++++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +@@ -4,7 +4,6 @@ + + + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + NuGet's implementation of Semantic Versioning. + semver;semantic versioning -- -2.29.2 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch index 714b0ea00..6fdfe9478 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch @@ -1,7 +1,7 @@ -From fecc40e502197e65804177b2aec49a7a5422ed6e Mon Sep 17 00:00:00 2001 +From abf05bf4b06ab5d47372d166b7bb6c2c6bb4e6a2 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 10 Dec 2020 16:17:55 -0600 -Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & +Subject: [PATCH 3/8] Use source-built Microsoft.Web.Xdt & System.ComponentModel.Composition --- @@ -9,7 +9,7 @@ Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index 6f72ac3fd..8317f3903 100644 +index 614a0ca68..ab0064b66 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -15,6 +15,12 @@ @@ -39,5 +39,5 @@ index 6f72ac3fd..8317f3903 100644 The Microsoft.VisualStudio.SDK metapackage brings in System.Threading.Tasks.Dataflow 4.11.1 (assembly version 4.9.5.0). However, our MSBuild integration tests use Microsoft.Build 16.8.0, which requires System.Threading.Tasks.Dataflow 4.9.0 (assembly version 4.9.3.0). -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch b/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch similarity index 94% rename from src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch rename to src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch index df670d2df..6ae95d42f 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch @@ -1,7 +1,7 @@ -From 9e35a4d319f3288a50bdaf5b32661764761aa0e9 Mon Sep 17 00:00:00 2001 +From c77a8c754381600ec891c5601b2c5cd9c8945d26 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 10:59:36 -0500 -Subject: [PATCH 4/5] Build script changes to support ArPow from tarball. +Subject: [PATCH 4/8] Build script changes to support ArPow from tarball. --- eng/source-build/build.sh | 27 +++++++++++++++++++++++++-- @@ -9,7 +9,7 @@ Subject: [PATCH 4/5] Build script changes to support ArPow from tarball. 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh -index 3bb69b2b0..aaff8ef0f 100755 +index 3bb69b2b0..ee1221d56 100755 --- a/eng/source-build/build.sh +++ b/eng/source-build/build.sh @@ -13,6 +13,25 @@ while [[ -h $source ]]; do @@ -54,7 +54,7 @@ index 3bb69b2b0..aaff8ef0f 100755 -"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" +"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args diff --git a/eng/source-build/source-build.proj b/eng/source-build/source-build.proj -index 6f90f9793..91ea2d032 100644 +index 72058ac88..cbdd6d819 100644 --- a/eng/source-build/source-build.proj +++ b/eng/source-build/source-build.proj @@ -4,6 +4,8 @@ @@ -84,5 +84,5 @@ index 6f90f9793..91ea2d032 100644 /> -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch b/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch similarity index 96% rename from src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch rename to src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch index 43697b0f5..a55fd9878 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch @@ -1,7 +1,7 @@ -From d3c633ad00408b2b6122b70d9a152d1ab79c8378 Mon Sep 17 00:00:00 2001 +From 2df1980c2c657c364bf86f35830396f9d1b6e5c9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 11:01:04 -0500 -Subject: [PATCH 2/2] Upgrade to .NET 6 SDK. +Subject: [PATCH 5/8] Upgrade to .NET 6 SDK. --- .../NuGet.Commands/SignCommand/CertificateProvider.cs | 4 ++-- @@ -94,10 +94,10 @@ index 7c9595268..1ca751850 100644 #else object result; diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -index 67a1726b6..0534e936e 100644 +index c7bcb54bb..30d86fcc9 100644 --- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -@@ -81,7 +81,7 @@ public class HttpRetryHandler : IHttpRetryHandler +@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader) headerStopwatch = new Stopwatch(); stopwatches.Add(headerStopwatch); } @@ -120,5 +120,5 @@ index b9ab58ce7..ebf738e52 100644 new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), out stopwatches)) -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch b/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch similarity index 72% rename from src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch rename to src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch index b193f1b24..cbc7fc79e 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch @@ -1,14 +1,15 @@ -From 612f18bace3320572dc69b3ee56c0d942c29331f Mon Sep 17 00:00:00 2001 +From 5f983c2b8c038e86096be2d518ce49208a5fd430 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 20 Aug 2021 15:30:52 -0500 -Subject: [PATCH] Build NuGet.Frameworks for netstandard as well for VSTest. +Subject: [PATCH 6/8] Build NuGet.Frameworks for netstandard as well for + VSTest. --- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index 65f261dc1..ed81ecf24 100644 +index f29551741..a89b516c6 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,7 @@ @@ -17,9 +18,9 @@ index 65f261dc1..ed81ecf24 100644 NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) + $(TargetFrameworksLibrary);netstandard2.0 - $(TargetFrameworks);net40 $(NoWarn);CS1591;CS1574;CS1573 + true -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch similarity index 83% rename from src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch rename to src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch index fb84712c1..06cb112cf 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch @@ -1,14 +1,14 @@ -From d0596ee04233142bbaa9b3587f2c8b3a0bd82f8f Mon Sep 17 00:00:00 2001 +From f5d3b8b8c189df9bf1644a9e26b3c6b57e353e84 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 27 Aug 2021 01:52:56 +0000 -Subject: [PATCH] NuGet.Build.Tasks.Pack source-build support +Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support --- - .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f11dd752b..c7425dbe8 100644 +index f11dd752b..1be4f8952 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -180,13 +180,16 @@ @@ -31,5 +31,5 @@ index f11dd752b..c7425dbe8 100644 -- -2.29.2 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch b/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch similarity index 92% rename from src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch rename to src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch index 99ab03f60..464c0bf2f 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch @@ -1,7 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 4af707e198a2531f45ae56566cb49fd796070c59 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 21 Jul 2021 17:33:03 -0500 -Subject: [PATCH] Update Microsoft.Extensions.CommandLineUtils reference +Subject: [PATCH 8/8] Update Microsoft.Extensions.CommandLineUtils reference Microsoft.Extensions.CommandLineUtils is obsolete and no longer being built. Because of this it can't be source-built. Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. @@ -11,7 +11,7 @@ Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index 614a0ca68..f6be9619e 100644 +index ab0064b66..534f26ae3 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -8,6 +8,7 @@ @@ -22,7 +22,7 @@ index 614a0ca68..f6be9619e 100644 -@@ -31,7 +32,7 @@ +@@ -37,7 +38,7 @@ @@ -44,3 +44,6 @@ index 21015c00a..e306cdee4 100644 +-- +2.31.1 + From 2823ea21fb3dbc210d793258fdefb2defae2feda Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 14:48:13 -0500 Subject: [PATCH 126/164] Introduce temporary dependency from templating on NuGet to ensure it picks up the new fixed packages. --- .../tarball/content/repos/templating.proj | 2 ++ ...-all-TFMs-for-source-build-to-suppor.patch | 32 ------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch diff --git a/src/SourceBuild/tarball/content/repos/templating.proj b/src/SourceBuild/tarball/content/repos/templating.proj index be7f3414d..5c6eb4014 100644 --- a/src/SourceBuild/tarball/content/repos/templating.proj +++ b/src/SourceBuild/tarball/content/repos/templating.proj @@ -16,6 +16,8 @@ + + diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch deleted file mode 100644 index 046864705..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 20 Oct 2021 15:19:29 -0500 -Subject: [PATCH] Restore building all TFMs for source-build to support NuGet - to support templating. - ---- - src/Directory.Build.props | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/Directory.Build.props b/src/Directory.Build.props -index b0e233194..7e0c7d8c8 100644 ---- a/src/Directory.Build.props -+++ b/src/Directory.Build.props -@@ -27,13 +27,12 @@ - - - $(FullFrameworkTFM);netstandard2.0 -- netstandard2.0 - $(FullFrameworkTFM) - AnyCPU - - - net6.0 -- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) -+ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) - $(FullFrameworkTFM) - - --- -2.31.1 - From cb5ef3f9e2e52855c356e56b62343ce5f50e8253 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 16:30:37 -0500 Subject: [PATCH 127/164] NuGet also depends on XDT - add netstandard2.0 there. --- ...-for-netstandard2.0-to-support-NuGet.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch diff --git a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch new file mode 100644 index 000000000..de9bbee75 --- /dev/null +++ b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch @@ -0,0 +1,25 @@ +From e5fa6b10f5e4bcb14e3930e4eeae7181765529ee Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 21 Oct 2021 16:29:32 -0500 +Subject: [PATCH] Also build for netstandard2.0 to support NuGet. + +--- + .../Microsoft.Web.XmlTransform.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj +index 7cb81d1..f272d7f 100644 +--- a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj ++++ b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj +@@ -3,7 +3,7 @@ + + + +- netstandard2.1 ++ netstandard2.0;netstandard2.1 + AnyCPU + true + false +-- +2.31.1 + From dde04b27b17e87c60b726760148f58fe437818ae Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 19:36:07 -0500 Subject: [PATCH 128/164] Have to fix some conditionals for multiple netstandards. --- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index c63ce0ccb..f0c80212a 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,4 +1,4 @@ -From 98fd2091519fa4c6d9ab850eaea92700b00803dc Mon Sep 17 00:00:00 2001 +From bb17144917b0e242214a10467507db5f987e3af8 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 @@ -6,11 +6,13 @@ Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 --- build/common.project.props | 10 +++++----- build/common.targets | 2 +- + .../NuGet.Build.Tasks.Pack.csproj | 2 +- src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - - .../NuGet.Configuration/NuGet.Configuration.csproj | 1 - + .../NuGet.Configuration/NuGet.Configuration.csproj | 3 +-- .../NuGet.Frameworks/NuGet.Frameworks.csproj | 1 - + .../NuGet.PackageManagement.csproj | 2 +- .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - - 6 files changed, 6 insertions(+), 10 deletions(-) + 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build/common.project.props b/build/common.project.props index e2e3c0c11..000702f58 100644 @@ -52,6 +54,19 @@ index 6fd5bd260..3de830b25 100644 $(DefineConstants);IS_CORECLR true +diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +index f11dd752b..babf5bbef 100644 +--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj ++++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +@@ -177,7 +177,7 @@ + + ilmerge\ + Desktop/ +- CoreCLR/ ++ CoreCLR/ + + + diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj index e30a079eb..c2b8fe241 100644 --- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj @@ -65,7 +80,7 @@ index e30a079eb..c2b8fe241 100644 $(NoWarn);CS1591;CS1574 true diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..fc4d42502 100644 +index bbc5ba480..b1d16aa51 100644 --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj @@ -6,7 +6,6 @@ @@ -76,6 +91,15 @@ index bbc5ba480..fc4d42502 100644 true true +@@ -29,7 +28,7 @@ + + + +- ++ + + + diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj index 65f261dc1..f29551741 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -88,6 +112,19 @@ index 65f261dc1..f29551741 100644 $(NoWarn);CS1591;CS1574;CS1573 true +diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +index dfbfcaa8d..7de38de78 100644 +--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj ++++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +@@ -35,7 +35,7 @@ + + + +- ++ + + + diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj index 180293944..8498664b9 100644 --- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj From de12f87965b794e3738b09730032735e791d0824 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 19:36:39 -0500 Subject: [PATCH 129/164] Patch resolution --- .../0007-NuGet.Build.Tasks.Pack-source-build-support.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch index 06cb112cf..ebefdb611 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch @@ -1,4 +1,4 @@ -From f5d3b8b8c189df9bf1644a9e26b3c6b57e353e84 Mon Sep 17 00:00:00 2001 +From e4fcd14ceca14d4b1995b4244e33923eef7b9f55 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 27 Aug 2021 01:52:56 +0000 Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support @@ -8,11 +8,11 @@ Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f11dd752b..1be4f8952 100644 +index babf5bbef..769406b67 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -180,13 +180,16 @@ - CoreCLR/ + CoreCLR/ - From 77b70c9c64d184047170491a562baae3bcb1cf2d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 21:58:56 -0500 Subject: [PATCH 130/164] Actually only do this for netstandard. --- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 14 +++++++------- ...Get.Build.Tasks.Pack-source-build-support.patch | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index f0c80212a..7d4ddd34b 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,4 +1,4 @@ -From bb17144917b0e242214a10467507db5f987e3af8 Mon Sep 17 00:00:00 2001 +From aed379060eb37815d1eebd1cb5232d5a0cc931bc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 @@ -55,7 +55,7 @@ index 6fd5bd260..3de830b25 100644 true diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f11dd752b..babf5bbef 100644 +index f11dd752b..d4f11aad5 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -177,7 +177,7 @@ @@ -63,7 +63,7 @@ index f11dd752b..babf5bbef 100644 ilmerge\ Desktop/ - CoreCLR/ -+ CoreCLR/ ++ CoreCLR/ @@ -80,7 +80,7 @@ index e30a079eb..c2b8fe241 100644 $(NoWarn);CS1591;CS1574 true diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..b1d16aa51 100644 +index bbc5ba480..be230f29b 100644 --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj @@ -6,7 +6,6 @@ @@ -96,7 +96,7 @@ index bbc5ba480..b1d16aa51 100644 - -+ ++ @@ -113,7 +113,7 @@ index 65f261dc1..f29551741 100644 $(NoWarn);CS1591;CS1574;CS1573 true diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index dfbfcaa8d..7de38de78 100644 +index dfbfcaa8d..bfca46bec 100644 --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj @@ -35,7 +35,7 @@ @@ -121,7 +121,7 @@ index dfbfcaa8d..7de38de78 100644 - -+ ++ diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch index ebefdb611..76cb439b4 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch @@ -1,4 +1,4 @@ -From e4fcd14ceca14d4b1995b4244e33923eef7b9f55 Mon Sep 17 00:00:00 2001 +From 36e519a13431f36cd30e44a91d3b4f81c6753528 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 27 Aug 2021 01:52:56 +0000 Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support @@ -8,11 +8,11 @@ Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index babf5bbef..769406b67 100644 +index d4f11aad5..f4d083e52 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -180,13 +180,16 @@ - CoreCLR/ + CoreCLR/ - From 7ae99ce59f8729427e9e0b307b99c8fd20ddf2fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 05:34:48 +0000 Subject: [PATCH 131/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12482) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.0.0-beta.21519.2 to 12.0.0-beta.21521.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21519.2 to 6.0.1-beta.21521.3 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21515-03 to 17.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.0 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) - edit sourcebuild metadata for stable versioning - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-90ae2a78-bcca-4d8e-aedf-7eaa99dfc9bf --- NuGet.config | 11 ++++---- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++------ 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 02f225e31..2a9f9487a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,16 @@ - - + - - + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 200b92b0d..385f31672 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 - + https://github.com/dotnet/runtime - 6f41165853278914d1a28d7f325ebe04ab78ac07 + de751593a53e9ccaffef2420ad3d74727cad47aa https://github.com/dotnet/runtime - 6f41165853278914d1a28d7f325ebe04ab78ac07 + de751593a53e9ccaffef2420ad3d74727cad47aa - + https://github.com/dotnet/runtime - 6f41165853278914d1a28d7f325ebe04ab78ac07 + de751593a53e9ccaffef2420ad3d74727cad47aa https://github.com/dotnet/runtime - 6f41165853278914d1a28d7f325ebe04ab78ac07 + de751593a53e9ccaffef2420ad3d74727cad47aa https://github.com/dotnet/runtime - 6f41165853278914d1a28d7f325ebe04ab78ac07 + de751593a53e9ccaffef2420ad3d74727cad47aa https://github.com/dotnet/runtime - 6f41165853278914d1a28d7f325ebe04ab78ac07 + de751593a53e9ccaffef2420ad3d74727cad47aa @@ -50,32 +50,32 @@ https://github.com/dotnet/runtime - 6f41165853278914d1a28d7f325ebe04ab78ac07 + de751593a53e9ccaffef2420ad3d74727cad47aa https://github.com/dotnet/aspnetcore - 20de863bd37ad521b7a3bd6056186da5e8a7a2ef + 10d0417d59f65234147e6e550dbd165d1c5da7ae - + https://github.com/dotnet/aspnetcore - 20de863bd37ad521b7a3bd6056186da5e8a7a2ef + 10d0417d59f65234147e6e550dbd165d1c5da7ae https://github.com/dotnet/aspnetcore - 20de863bd37ad521b7a3bd6056186da5e8a7a2ef + 10d0417d59f65234147e6e550dbd165d1c5da7ae - + https://github.com/dotnet/aspnetcore - 20de863bd37ad521b7a3bd6056186da5e8a7a2ef + 10d0417d59f65234147e6e550dbd165d1c5da7ae - + https://github.com/dotnet/aspnetcore - 20de863bd37ad521b7a3bd6056186da5e8a7a2ef + 10d0417d59f65234147e6e550dbd165d1c5da7ae - + https://github.com/dotnet/aspnetcore - 20de863bd37ad521b7a3bd6056186da5e8a7a2ef + 10d0417d59f65234147e6e550dbd165d1c5da7ae https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - a4161aeba7fb98361d48de38d9f1b4e384de0d04 + cee79d8f1c7518768b4d5862b97ad542014514b4 - + https://github.com/dotnet/sdk - a4161aeba7fb98361d48de38d9f1b4e384de0d04 + cee79d8f1c7518768b4d5862b97ad542014514b4 @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 7dba431f76d513ae009c58a2c588e7be5ac2dd45 - + https://github.com/dotnet/fsharp - 727a6abda5bb3276f3e8dd918b721c5d21464aac + 4bfc2b74e5d31242e5a050f44cacdfe8fc2a2b83 - + https://github.com/dotnet/fsharp - 727a6abda5bb3276f3e8dd918b721c5d21464aac + 4bfc2b74e5d31242e5a050f44cacdfe8fc2a2b83 @@ -146,10 +146,10 @@ 3a0930fe6990248c848db2f1e323d7dd2052005b - + https://github.com/dotnet/msbuild - d66a44095cd460a3031541cc05310bccab17a9e4 - + c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + https://github.com/nuget/nuget.client @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 7b2c3228bec174e2ef12bc189e9c176eafd24334 + 1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index a24d151f8..8f6b61306 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.0 6.0.0 - 6.0.0-rtm.21521.1 - 6.0.0-rtm.21521.1 - 6.0.0-rtm.21521.1 - 6.0.0-rtm.21521.1 + 6.0.0-rtm.21521.5 + 6.0.0-rtm.21521.5 + 6.0.0-rtm.21521.5 + 6.0.0-rtm.21521.5 0.2.0 - 6.0.100-rtm.21521.8 - 6.0.100-rtm.21521.8 + 6.0.100-rtm.21521.14 + 6.0.100-rtm.21521.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.0-rtm.21520.9 - 6.0.0-rtm.21520.9 + 6.0.0-rtm.21521.6 + 6.0.0-rtm.21521.6 6.0.0 6.0.0 6.0.0 From 1e7dbb727ad078cdcb162d020cee4d462eff6736 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 06:10:31 +0000 Subject: [PATCH 132/164] Update dependencies from https://github.com/dotnet/sdk build 20211021.15 (#12489) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21520.13 to 6.0.0-rtm.21521.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21520.13 to 6.0.0-rtm.21521.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 5 ++--- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2a9f9487a..13f8ad16e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,8 +19,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 385f31672..51a4fb103 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 + 0a46384ae3655536552fc4990897655cbe5b940f - + https://github.com/dotnet/windowsdesktop - fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 + 0a46384ae3655536552fc4990897655cbe5b940f - + https://github.com/dotnet/windowsdesktop - fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 + 0a46384ae3655536552fc4990897655cbe5b940f https://github.com/dotnet/windowsdesktop - fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 + 0a46384ae3655536552fc4990897655cbe5b940f https://github.com/dotnet/runtime @@ -54,28 +54,28 @@ https://github.com/dotnet/aspnetcore - 10d0417d59f65234147e6e550dbd165d1c5da7ae + 7a869ccb57d3710db4d0173db27483f51f89e2ba - + https://github.com/dotnet/aspnetcore - 10d0417d59f65234147e6e550dbd165d1c5da7ae + 7a869ccb57d3710db4d0173db27483f51f89e2ba https://github.com/dotnet/aspnetcore - 10d0417d59f65234147e6e550dbd165d1c5da7ae + 7a869ccb57d3710db4d0173db27483f51f89e2ba - + https://github.com/dotnet/aspnetcore - 10d0417d59f65234147e6e550dbd165d1c5da7ae + 7a869ccb57d3710db4d0173db27483f51f89e2ba - + https://github.com/dotnet/aspnetcore - 10d0417d59f65234147e6e550dbd165d1c5da7ae + 7a869ccb57d3710db4d0173db27483f51f89e2ba - + https://github.com/dotnet/aspnetcore - 10d0417d59f65234147e6e550dbd165d1c5da7ae + 7a869ccb57d3710db4d0173db27483f51f89e2ba https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - cee79d8f1c7518768b4d5862b97ad542014514b4 + c2229303e8f30260ed7d2c202ad9dc1ade48fbb6 - + https://github.com/dotnet/sdk - cee79d8f1c7518768b4d5862b97ad542014514b4 + c2229303e8f30260ed7d2c202ad9dc1ade48fbb6 - + https://github.com/dotnet/winforms - a4e643851b62969e46b9a208f9d32dfde6c93b95 + 66cbb0e67e4838d008906d7372be0cf249793832 - + https://github.com/dotnet/wpf - 7dba431f76d513ae009c58a2c588e7be5ac2dd45 + 2a42b946fcf83be513e48659ac06bf445849cae2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8f6b61306..c312dcc5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21520.13 + 6.0.0-rtm.21521.6 - 6.0.0-rtm.21520.13 + 6.0.0-rtm.21521.7 @@ -46,18 +46,18 @@ 6.0.0 6.0.0 - 6.0.0-rtm.21521.5 - 6.0.0-rtm.21521.5 - 6.0.0-rtm.21521.5 - 6.0.0-rtm.21521.5 + 6.0.0-rtm.21521.9 + 6.0.0-rtm.21521.9 + 6.0.0-rtm.21521.9 + 6.0.0-rtm.21521.9 0.2.0 - 6.0.100-rtm.21521.14 - 6.0.100-rtm.21521.14 + 6.0.100-rtm.21521.15 + 6.0.100-rtm.21521.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.0-rtm.21520.17 - 6.0.0-rtm.21520.17 + 6.0.0-rtm.21521.5 + 6.0.0-rtm.21521.5 6.0.0 6.0.0 From c29087f7a2a8bc73b755ed419c666a9af88b25c0 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 02:11:37 -0500 Subject: [PATCH 133/164] These also apply for net6.0. --- .../nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 7d4ddd34b..202bda09a 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -96,7 +96,7 @@ index bbc5ba480..be230f29b 100644 - -+ ++ @@ -121,7 +121,7 @@ index dfbfcaa8d..bfca46bec 100644 - -+ ++ From 2b005f34912846a6a6436b370a81aedda22b711c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:05:35 +0000 Subject: [PATCH 134/164] Update dependencies from https://github.com/dotnet/sdk build 20211021.16 (#12490) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13f8ad16e..3651cba32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51a4fb103..8e3759fe8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://github.com/dotnet/aspnetcore - 7a869ccb57d3710db4d0173db27483f51f89e2ba + d67b17cc26d19b5d0d045cf4379d92ca9dd02417 - + https://github.com/dotnet/aspnetcore - 7a869ccb57d3710db4d0173db27483f51f89e2ba + d67b17cc26d19b5d0d045cf4379d92ca9dd02417 https://github.com/dotnet/aspnetcore - 7a869ccb57d3710db4d0173db27483f51f89e2ba + d67b17cc26d19b5d0d045cf4379d92ca9dd02417 - + https://github.com/dotnet/aspnetcore - 7a869ccb57d3710db4d0173db27483f51f89e2ba + d67b17cc26d19b5d0d045cf4379d92ca9dd02417 - + https://github.com/dotnet/aspnetcore - 7a869ccb57d3710db4d0173db27483f51f89e2ba + d67b17cc26d19b5d0d045cf4379d92ca9dd02417 - + https://github.com/dotnet/aspnetcore - 7a869ccb57d3710db4d0173db27483f51f89e2ba + d67b17cc26d19b5d0d045cf4379d92ca9dd02417 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - c2229303e8f30260ed7d2c202ad9dc1ade48fbb6 + ce3ad410b159ec307a9e86fcd254061fb49639be - + https://github.com/dotnet/sdk - c2229303e8f30260ed7d2c202ad9dc1ade48fbb6 + ce3ad410b159ec307a9e86fcd254061fb49639be diff --git a/eng/Versions.props b/eng/Versions.props index c312dcc5c..4d2be450b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.0 6.0.0 - 6.0.0-rtm.21521.9 - 6.0.0-rtm.21521.9 - 6.0.0-rtm.21521.9 - 6.0.0-rtm.21521.9 + 6.0.0-rtm.21521.10 + 6.0.0-rtm.21521.10 + 6.0.0-rtm.21521.10 + 6.0.0-rtm.21521.10 0.2.0 - 6.0.100-rtm.21521.15 - 6.0.100-rtm.21521.15 + 6.0.100-rtm.21521.16 + 6.0.100-rtm.21521.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 298effbfccb4f53c52379df79b87d83269ea8d19 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 09:54:00 -0500 Subject: [PATCH 135/164] Workaround for F# smoke-tests. --- src/SourceBuild/tarball/content/smoke-test.sh | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index 5adebbe2f..e6b6e5ae6 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -247,21 +247,39 @@ function doCommand() { wait $! echo " terminated with exit code $?" | tee -a "$logFile" elif [ "$1" == "multi-rid-publish" ]; then - runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" - } + if [ "$lang" == "F#" ]; then + # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 + runPublishScenarios() { + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" /p:_NETCoreSdkIsPreview=true + } + else + runPublishScenarios() { + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" + } + fi if [ "$projectOutput" == "true" ]; then runPublishScenarios | tee -a "$logFile" else runPublishScenarios >> "$logFile" 2>&1 fi else - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" + if [ "$lang" == "F#" ]; then + # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 + if [ "$projectOutput" == "true" ]; then + "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true | tee -a "$logFile" + else + "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true >> "$logFile" 2>&1 + fi else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 + if [ "$projectOutput" == "true" ]; then + "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" + else + "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 + fi fi fi if [ $? -eq 0 ]; then @@ -305,7 +323,8 @@ function runAllTests() { doCommand VB xunit new restore test doCommand VB mstest new restore test - doCommand F# console new restore build run multi-rid-publish + # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 + doCommand F# console new restore build multi-rid-publish doCommand F# classlib new restore build multi-rid-publish doCommand F# xunit new restore test doCommand F# mstest new restore test @@ -334,10 +353,12 @@ function runWebTests() { # doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish - doCommand F# web "$@" new restore build run multi-rid-publish + # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 + doCommand F# web "$@" new restore build multi-rid-publish # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 # doCommand F# mvc "$@" new restore build run multi-rid-publish - doCommand F# webapi "$@" new restore build run multi-rid-publish + # "run" was also removed from this set, same issue: https://github.com/dotnet/source-build/issues/2554 + doCommand F# webapi "$@" new restore build multi-rid-publish } function runXmlDocTests() { From 4fcb26a608e7f0ef0bbaf92482e0dce3f4578169 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 09:58:19 -0500 Subject: [PATCH 136/164] Fix sloppy patching. --- ...-Don-t-use-PublicApiAnalyzer-on-source-build.patch | 9 +++++---- ...ce-built-Microsoft.Web.Xdt-System.ComponentM.patch | 8 ++++---- ...cript-changes-to-support-ArPow-from-tarball.patch} | 10 +++++----- ...T-6-SDK.patch => 0006-Upgrade-to-.NET-6-SDK.patch} | 10 +++++----- ...et.Frameworks-for-netstandard-as-well-for-V.patch} | 11 +++++------ ...NuGet.Build.Tasks.Pack-source-build-support.patch} | 0 ...osoft.Extensions.CommandLineUtils-reference.patch} | 11 ++++------- 7 files changed, 28 insertions(+), 31 deletions(-) rename src/SourceBuild/tarball/patches/nuget-client/{0004-Build-script-changes-to-support-ArPow-from-tarball.patch => 0005-Build-script-changes-to-support-ArPow-from-tarball.patch} (94%) rename src/SourceBuild/tarball/patches/nuget-client/{0005-Upgrade-to-.NET-6-SDK.patch => 0006-Upgrade-to-.NET-6-SDK.patch} (96%) rename src/SourceBuild/tarball/patches/nuget-client/{0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch => 0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch} (72%) rename src/SourceBuild/tarball/patches/nuget-client/{0007-NuGet.Build.Tasks.Pack-source-build-support.patch => 0008-NuGet.Build.Tasks.Pack-source-build-support.patch} (100%) rename src/SourceBuild/tarball/patches/nuget-client/{0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch => 0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch} (92%) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch index 8ab3267b2..1cb91f3d3 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch @@ -1,16 +1,17 @@ -From 198d70708016e5406e0d525567ca58962e222399 Mon Sep 17 00:00:00 2001 +From 335f32e48fd5604cdb1340ec04d6503a3e43d783 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:09:35 +0000 -Subject: [PATCH 1/8] Don't use PublicApiAnalyzer on source-build +Subject: [PATCH] Don't use PublicApiAnalyzer on source-build CSC : warning AD0001: Analyzer 'Microsoft.CodeAnalysis.PublicApiAnalyzers.DeclarePublicApiAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. CSC : error CS2001: Source file '/repos/installer2/artifacts/tarball/src/nuget-client.7363366401b43f4ea250394db8dad3707e9a9636/src/NuGet.Core/NuGet.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt' could not be found. + --- build/common.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/common.targets b/build/common.targets -index 7a353ebf8..6fd5bd260 100644 +index 2c387f576..cf5a70c62 100644 --- a/build/common.targets +++ b/build/common.targets @@ -65,6 +65,11 @@ @@ -26,5 +27,5 @@ index 7a353ebf8..6fd5bd260 100644 true -- -2.31.1 +2.29.2 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch index 6fdfe9478..714b0ea00 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch @@ -1,7 +1,7 @@ -From abf05bf4b06ab5d47372d166b7bb6c2c6bb4e6a2 Mon Sep 17 00:00:00 2001 +From fecc40e502197e65804177b2aec49a7a5422ed6e Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 10 Dec 2020 16:17:55 -0600 -Subject: [PATCH 3/8] Use source-built Microsoft.Web.Xdt & +Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & System.ComponentModel.Composition --- @@ -9,7 +9,7 @@ Subject: [PATCH 3/8] Use source-built Microsoft.Web.Xdt & 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index 614a0ca68..ab0064b66 100644 +index 6f72ac3fd..8317f3903 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -15,6 +15,12 @@ @@ -39,5 +39,5 @@ index 614a0ca68..ab0064b66 100644 The Microsoft.VisualStudio.SDK metapackage brings in System.Threading.Tasks.Dataflow 4.11.1 (assembly version 4.9.5.0). However, our MSBuild integration tests use Microsoft.Build 16.8.0, which requires System.Threading.Tasks.Dataflow 4.9.0 (assembly version 4.9.3.0). -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch b/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch similarity index 94% rename from src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch rename to src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch index 6ae95d42f..df670d2df 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch @@ -1,7 +1,7 @@ -From c77a8c754381600ec891c5601b2c5cd9c8945d26 Mon Sep 17 00:00:00 2001 +From 9e35a4d319f3288a50bdaf5b32661764761aa0e9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 10:59:36 -0500 -Subject: [PATCH 4/8] Build script changes to support ArPow from tarball. +Subject: [PATCH 4/5] Build script changes to support ArPow from tarball. --- eng/source-build/build.sh | 27 +++++++++++++++++++++++++-- @@ -9,7 +9,7 @@ Subject: [PATCH 4/8] Build script changes to support ArPow from tarball. 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh -index 3bb69b2b0..ee1221d56 100755 +index 3bb69b2b0..aaff8ef0f 100755 --- a/eng/source-build/build.sh +++ b/eng/source-build/build.sh @@ -13,6 +13,25 @@ while [[ -h $source ]]; do @@ -54,7 +54,7 @@ index 3bb69b2b0..ee1221d56 100755 -"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" +"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args diff --git a/eng/source-build/source-build.proj b/eng/source-build/source-build.proj -index 72058ac88..cbdd6d819 100644 +index 6f90f9793..91ea2d032 100644 --- a/eng/source-build/source-build.proj +++ b/eng/source-build/source-build.proj @@ -4,6 +4,8 @@ @@ -84,5 +84,5 @@ index 72058ac88..cbdd6d819 100644 /> -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch b/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch similarity index 96% rename from src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch rename to src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch index a55fd9878..43697b0f5 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch @@ -1,7 +1,7 @@ -From 2df1980c2c657c364bf86f35830396f9d1b6e5c9 Mon Sep 17 00:00:00 2001 +From d3c633ad00408b2b6122b70d9a152d1ab79c8378 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 11:01:04 -0500 -Subject: [PATCH 5/8] Upgrade to .NET 6 SDK. +Subject: [PATCH 2/2] Upgrade to .NET 6 SDK. --- .../NuGet.Commands/SignCommand/CertificateProvider.cs | 4 ++-- @@ -94,10 +94,10 @@ index 7c9595268..1ca751850 100644 #else object result; diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -index c7bcb54bb..30d86fcc9 100644 +index 67a1726b6..0534e936e 100644 --- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader) +@@ -81,7 +81,7 @@ public class HttpRetryHandler : IHttpRetryHandler headerStopwatch = new Stopwatch(); stopwatches.Add(headerStopwatch); } @@ -120,5 +120,5 @@ index b9ab58ce7..ebf738e52 100644 new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), out stopwatches)) -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch similarity index 72% rename from src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch rename to src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch index cbc7fc79e..b193f1b24 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch @@ -1,15 +1,14 @@ -From 5f983c2b8c038e86096be2d518ce49208a5fd430 Mon Sep 17 00:00:00 2001 +From 612f18bace3320572dc69b3ee56c0d942c29331f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 20 Aug 2021 15:30:52 -0500 -Subject: [PATCH 6/8] Build NuGet.Frameworks for netstandard as well for - VSTest. +Subject: [PATCH] Build NuGet.Frameworks for netstandard as well for VSTest. --- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index f29551741..a89b516c6 100644 +index 65f261dc1..ed81ecf24 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,7 @@ @@ -18,9 +17,9 @@ index f29551741..a89b516c6 100644 NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) + $(TargetFrameworksLibrary);netstandard2.0 + $(TargetFrameworks);net40 $(NoWarn);CS1591;CS1574;CS1573 - true -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch similarity index 100% rename from src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch rename to src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch b/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch similarity index 92% rename from src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch rename to src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch index 464c0bf2f..99ab03f60 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch @@ -1,7 +1,7 @@ -From 4af707e198a2531f45ae56566cb49fd796070c59 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 21 Jul 2021 17:33:03 -0500 -Subject: [PATCH 8/8] Update Microsoft.Extensions.CommandLineUtils reference +Subject: [PATCH] Update Microsoft.Extensions.CommandLineUtils reference Microsoft.Extensions.CommandLineUtils is obsolete and no longer being built. Because of this it can't be source-built. Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. @@ -11,7 +11,7 @@ Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index ab0064b66..534f26ae3 100644 +index 614a0ca68..f6be9619e 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -8,6 +8,7 @@ @@ -22,7 +22,7 @@ index ab0064b66..534f26ae3 100644 -@@ -37,7 +38,7 @@ +@@ -31,7 +32,7 @@ @@ -44,6 +44,3 @@ index 21015c00a..e306cdee4 100644 --- -2.31.1 - From f951587509d9010101aa3d9c63abbc00c8acac5c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 09:58:54 -0500 Subject: [PATCH 137/164] This really does rely on NuGet. --- src/SourceBuild/tarball/content/repos/templating.proj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/templating.proj b/src/SourceBuild/tarball/content/repos/templating.proj index 5c6eb4014..7cc53299c 100644 --- a/src/SourceBuild/tarball/content/repos/templating.proj +++ b/src/SourceBuild/tarball/content/repos/templating.proj @@ -15,9 +15,8 @@ - - + From ed6eb2db8e74085166f4732738d16d67063e27aa Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 10:19:59 -0500 Subject: [PATCH 138/164] Fix patch conflict. --- ...Get.Frameworks-for-netstandard-as-well-for-V.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch index b193f1b24..f2845572c 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch @@ -1,14 +1,15 @@ -From 612f18bace3320572dc69b3ee56c0d942c29331f Mon Sep 17 00:00:00 2001 +From be9f7f1415250433578ed6aa36da13a4442aff8f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 20 Aug 2021 15:30:52 -0500 -Subject: [PATCH] Build NuGet.Frameworks for netstandard as well for VSTest. +Subject: [PATCH 6/8] Build NuGet.Frameworks for netstandard as well for + VSTest. --- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index 65f261dc1..ed81ecf24 100644 +index f29551741..a89b516c6 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,7 @@ @@ -17,9 +18,9 @@ index 65f261dc1..ed81ecf24 100644 NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) + $(TargetFrameworksLibrary);netstandard2.0 - $(TargetFrameworks);net40 $(NoWarn);CS1591;CS1574;CS1573 + true -- -2.18.0 +2.31.1 From 7f468fe5e66b37f1a35d989fa263a79e2b0212c5 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 10:21:51 -0500 Subject: [PATCH 139/164] Add patch issues to the patches. --- .../0003-Restore-building-all-TFMs-for-source-build.patch | 1 + .../nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch | 8 +++++--- ...1-Also-build-for-netstandard2.0-to-support-NuGet.patch | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch index ddb0688ae..04c684a0d 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Restore building all TFMs for source-build Required for omnisharp, nuget-client, templating Background Issue: https://github.com/dotnet/source-build/issues/2542 +Patch removal issue: https://github.com/dotnet/source-build/issues/2556 --- src/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 202bda09a..2400ef3e6 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,8 +1,10 @@ -From aed379060eb37815d1eebd1cb5232d5a0cc931bc Mon Sep 17 00:00:00 2001 +From de74c87d3f9364be1f3bdba43844c8de92704757 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 +Patch removal is tracked by https://github.com/dotnet/source-build/issues/2555. + --- build/common.project.props | 10 +++++----- build/common.targets | 2 +- @@ -80,7 +82,7 @@ index e30a079eb..c2b8fe241 100644 $(NoWarn);CS1591;CS1574 true diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..be230f29b 100644 +index bbc5ba480..18b597c74 100644 --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj @@ -6,7 +6,6 @@ @@ -113,7 +115,7 @@ index 65f261dc1..f29551741 100644 $(NoWarn);CS1591;CS1574;CS1573 true diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index dfbfcaa8d..bfca46bec 100644 +index dfbfcaa8d..a6bb51d6b 100644 --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj @@ -35,7 +35,7 @@ diff --git a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch index de9bbee75..1194e09a5 100644 --- a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch +++ b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch @@ -3,6 +3,8 @@ From: Chris Rummel Date: Thu, 21 Oct 2021 16:29:32 -0500 Subject: [PATCH] Also build for netstandard2.0 to support NuGet. +Patch removal is tracked by https://github.com/dotnet/source-build/issues/2557. + --- .../Microsoft.Web.XmlTransform.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From 7828a7f0f073a6d59e04ddd970d16383a4dbab75 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 22 Oct 2021 09:57:48 -0700 Subject: [PATCH 140/164] Temporarily revert implicit versions to produce new stage0 (#12492) --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 15cc06f7c..db5626c5f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - 21 - 12 + 20 + 11 From 3e0a3b5b49caccf931d1437303fa1993561043f2 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 22 Oct 2021 12:55:26 -0500 Subject: [PATCH 141/164] dotnet/format: Fix ref-only extensions package usage at runtime --- src/SourceBuild/tarball/content/repos/format.proj | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repos/format.proj index 21734d18d..59cd432ce 100644 --- a/src/SourceBuild/tarball/content/repos/format.proj +++ b/src/SourceBuild/tarball/content/repos/format.proj @@ -9,6 +9,20 @@ false + + + + + + From e71e33d9cdcea32481301373edd6d366a1d24448 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 22 Oct 2021 13:16:07 -0500 Subject: [PATCH 142/164] Add reference to dotnet/format issue --- src/SourceBuild/tarball/content/repos/format.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repos/format.proj index 59cd432ce..cc5dae3f7 100644 --- a/src/SourceBuild/tarball/content/repos/format.proj +++ b/src/SourceBuild/tarball/content/repos/format.proj @@ -18,6 +18,8 @@ Pick an arbitrary representative package to pass in as MicrosoftExtensionsVersion so it uses the source-built version from the PVP. + + See https://github.com/dotnet/format/issues/1400 --> From 1dca86a6488be4cbd663cdf9973343ecfcb7d0fb Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 22 Oct 2021 13:27:36 -0500 Subject: [PATCH 143/164] Use a patch to fix up the dependency property --- .../tarball/content/repos/format.proj | 16 ------ .../0001-Fix-MicrosoftExtensionsVersion.patch | 50 +++++++++++++++++++ 2 files changed, 50 insertions(+), 16 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repos/format.proj index cc5dae3f7..21734d18d 100644 --- a/src/SourceBuild/tarball/content/repos/format.proj +++ b/src/SourceBuild/tarball/content/repos/format.proj @@ -9,22 +9,6 @@ false - - - - - - diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch new file mode 100644 index 000000000..7c09ff2db --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -0,0 +1,50 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 22 Oct 2021 13:26:33 -0500 +Subject: [PATCH] Fix MicrosoftExtensionsVersion + +Move it to eng/Versions.props to make it overridable, and rename it to match an actual package ID. + +See https://github.com/dotnet/format/issues/1400 +--- + Directory.Packages.props | 7 +++---- + eng/Versions.props | 1 + + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 6b628c2..9b579ea 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -2,7 +2,6 @@ + + + +- 5.0.0 + + 6.0.0-preview.4.221 + +@@ -25,9 +24,9 @@ + + + +- +- +- ++ ++ ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index b1990aa..f6ddbbd 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -15,6 +15,7 @@ + + 16.11.0 + 3.3.2 ++ 5.0.0 + + 4.0.0-6.21515.3 + From 24f68585c33672b4848cd6b7c8df73e243ec4b89 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 21 Oct 2021 17:39:47 -0500 Subject: [PATCH 144/164] Prepare source-build for prebuiltless build --- eng/Versions.props | 13 +++++++++++++ .../Arcade/tools/SourceBuildArcadeTarball.targets | 4 +++- src/SourceBuild/tarball/content/build.proj | 3 ++- .../tarball/content/tools-local/init-build.proj | 9 ++++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2cc105534..9a3d37288 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,6 +159,19 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 + 0.1.0-6.0.100-bootstrap.29 0.1.0-6.0.100-36 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 7203b401b..c970f04cc 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -292,7 +292,9 @@ - + + AfterTargets="Build" + Condition="Exists('$(ResultingPrebuiltPackagesDir)')"> $(PrivateSourceBuiltPrebuiltsPackageVersionPrefix)$([MSBuild]::Add($(PrivateSourceBuiltPrebuiltsPackageVersionSuffix), 1)) diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 3835e019c..ee7a1bdb8 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -46,7 +46,14 @@ WorkingDirectory="$(PrebuiltSourceBuiltPackagesPath)" Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' == ''" /> - + + + + From c46dcb7fca280f33a23050cb275de8bb60d57037 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 21 Oct 2021 18:14:47 -0500 Subject: [PATCH 145/164] Fix empty SourceBuiltPrebuiltsTarballFile batch behavior --- src/SourceBuild/tarball/content/tools-local/init-build.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index ee7a1bdb8..c5494dedd 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -54,7 +54,8 @@ + WorkingDirectory="$(PrebuiltPackagesPath)" + Condition="'@(SourceBuiltPrebuiltsTarballFile)' != ''" /> From 17feead1afcdd9dab8d039babf806fc18bb3c6a2 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 22 Oct 2021 14:10:15 -0500 Subject: [PATCH 146/164] Remove PrivateSourceBuiltPrebuiltsPackageVersion: no prebuilts used --- eng/Versions.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9a3d37288..8c25cd8b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,7 +173,6 @@ necessary, and this property is removed from the file. --> 0.1.0-6.0.100-bootstrap.29 - 0.1.0-6.0.100-36 From 563bb4b721a76d97f4567cbb3462b30d21b51346 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 22 Oct 2021 14:17:35 -0500 Subject: [PATCH 147/164] Skip building prebuilt tarball if directory exists but is empty --- src/SourceBuild/tarball/content/build.proj | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 80e6fd939..3a43b32ab 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -134,8 +134,21 @@ + DependsOnTargets=" + CheckIfPrebuiltsExistToPack; + CreatePrebuiltsTarballIfPrebuiltsExist"/> + + + + + + + + + + $(PrivateSourceBuiltPrebuiltsPackageVersionPrefix)$([MSBuild]::Add($(PrivateSourceBuiltPrebuiltsPackageVersionSuffix), 1)) $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(TarballFileVersion).tar.gz From 8ebb6a415b494f1d87f50a9ff3de653d88bd8333 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 22 Oct 2021 12:33:41 -0700 Subject: [PATCH 148/164] Revert "Temporarily revert implicit versions to produce new stage0 (#12492)" (#12495) This reverts commit 7828a7f0f073a6d59e04ddd970d16383a4dbab75. --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index db5626c5f..15cc06f7c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - 20 - 11 + 21 + 12 From ff55f86ed6e196f9d16980059e3252e47e1d682a Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 22 Oct 2021 15:03:38 -0500 Subject: [PATCH 149/164] Fix nullability source compatibility after upgrade --- .../0001-Fix-MicrosoftExtensionsVersion.patch | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7c09ff2db..7c19d6a40 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -3,13 +3,18 @@ From: Davis Goodin Date: Fri, 22 Oct 2021 13:26:33 -0500 Subject: [PATCH] Fix MicrosoftExtensionsVersion -Move it to eng/Versions.props to make it overridable, and rename it to match an actual package ID. +Move it to eng/Versions.props to make it overridable, and rename it to match an +actual package ID. + +Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be +source-compatible with the 6.0 version of these packages. See https://github.com/dotnet/format/issues/1400 --- - Directory.Packages.props | 7 +++---- - eng/Versions.props | 1 + - 2 files changed, 4 insertions(+), 4 deletions(-) + Directory.Packages.props | 7 +++---- + eng/Versions.props | 1 + + src/Logging/SimpleConsoleLogger.cs | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 6b628c2..9b579ea 100644 @@ -48,3 +53,16 @@ index b1990aa..f6ddbbd 100644 4.0.0-6.21515.3 +diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs +index c361f84..fd8015c 100644 +--- a/src/Logging/SimpleConsoleLogger.cs ++++ b/src/Logging/SimpleConsoleLogger.cs +@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging + _minimalErrorLevel = minimalErrorLevel; + } + +- public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) ++ public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) + { + if (!IsEnabled(logLevel)) + { From 321cc8b49acc0cd6e8535238ad8a6656001e8401 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 21:05:39 +0000 Subject: [PATCH 150/164] Update dependencies from https://github.com/dotnet/sdk build 20211022.8 (#12496) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.0.0-release-20210923-02 to 17.0.0 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e3759fe8..6eeab53c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - ce3ad410b159ec307a9e86fcd254061fb49639be + ea90e25c5a831aa31fed455cb204b019544ee835 - + https://github.com/dotnet/sdk - ce3ad410b159ec307a9e86fcd254061fb49639be + ea90e25c5a831aa31fed455cb204b019544ee835 @@ -130,7 +130,7 @@ 4bfc2b74e5d31242e5a050f44cacdfe8fc2a2b83 - + https://github.com/microsoft/vstest 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 diff --git a/eng/Versions.props b/eng/Versions.props index 8c25cd8b8..998a343a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21521.16 - 6.0.100-rtm.21521.16 + 6.0.100-rtm.21522.8 + 6.0.100-rtm.21522.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-release-20210923-02 + 17.0.0 From 2f9ea75be566e45437af76841ba2d488e4514bbc Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 22 Oct 2021 16:07:54 -0500 Subject: [PATCH 151/164] Build Microsoft.NET.Build.Tasks for netfx --- ...e-building-all-TFMs-for-source-build.patch | 21 ++++- ...-Microsoft.NET.Build.Tasks-for-netfx.patch | 76 +++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch index 04c684a0d..da26d2cb7 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch @@ -3,14 +3,29 @@ From: Chris Rummel Date: Wed, 20 Oct 2021 15:19:29 -0500 Subject: [PATCH] Restore building all TFMs for source-build -Required for omnisharp, nuget-client, templating +Required for omnisharp, nuget-client, templating, sdk Background Issue: https://github.com/dotnet/source-build/issues/2542 Patch removal issue: https://github.com/dotnet/source-build/issues/2556 --- - src/Directory.Build.props | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/Build/Microsoft.Build.csproj | 3 +-- + src/Directory.Build.props | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj +index f75408633..8dc86355a 100644 +--- a/src/Build/Microsoft.Build.csproj ++++ b/src/Build/Microsoft.Build.csproj +@@ -4,8 +4,7 @@ + + + +- net6.0 +- $(FullFrameworkTFM);net6.0 ++ $(FullFrameworkTFM);net6.0 + $(RuntimeOutputTargetFrameworks) + Microsoft.Build + Microsoft.Build diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b0e233194..7e0c7d8c8 100644 --- a/src/Directory.Build.props diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch b/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch new file mode 100644 index 000000000..2ccf89e9e --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch @@ -0,0 +1,76 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric Erhardt +Date: Fri, 22 Oct 2021 20:48:25 +0000 +Subject: [PATCH] Build Microsoft.NET.Build.Tasks for netfx + +Required for omnisharp to work with a source-built .NET SDK. + +Patch removal issue: https://github.com/dotnet/sdk/issues/22281 +--- + .../Microsoft.DotNet.Compatibility.csproj | 1 - + .../Microsoft.DotNet.PackageValidation.csproj | 7 ++++++- + .../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 - + .../Microsoft.NET.Build.Tasks.csproj | 1 - + 4 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj +index 92624be845..f9f8e46329 100644 +--- a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj ++++ b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj +@@ -2,7 +2,6 @@ + + + net6.0;net472 +- net6.0 + true + true + Open +diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +index 7a8b648652..4f820adb72 100644 +--- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj ++++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +@@ -2,7 +2,6 @@ + + + net6.0;net472 +- net6.0 + Open + + +@@ -15,6 +14,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj +index 13ada82225..280fbdc83e 100644 +--- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj ++++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj +@@ -16,7 +16,6 @@ + Library + Microsoft.NET.Build.Tasks + $(SdkTargetFramework);net472 +- $(SdkTargetFramework) + + + +diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +index 604ef43bf2..bce39c67d4 100644 +--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj ++++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +@@ -13,7 +13,6 @@ + The MSBuild targets and properties for building .NET Core projects. + Library + $(SdkTargetFramework);net472 +- $(SdkTargetFramework) + annotations + + From 1639aa0eb9c06dc9803b4e034d842f2ffc8ef085 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 22:47:44 +0000 Subject: [PATCH 152/164] Update dependencies from https://github.com/dotnet/sdk build 20211022.10 (#12498) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21522.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21522.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21521.6 to 6.0.0-rtm.21522.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21521.7 to 6.0.0-rtm.21522.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3651cba32..896cfacca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eeab53c4..1800c4c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - 0a46384ae3655536552fc4990897655cbe5b940f + d7c81e8f2baee9be046718a2c977b6ce225b5fca - + https://github.com/dotnet/windowsdesktop - 0a46384ae3655536552fc4990897655cbe5b940f + d7c81e8f2baee9be046718a2c977b6ce225b5fca - + https://github.com/dotnet/windowsdesktop - 0a46384ae3655536552fc4990897655cbe5b940f + d7c81e8f2baee9be046718a2c977b6ce225b5fca https://github.com/dotnet/windowsdesktop - 0a46384ae3655536552fc4990897655cbe5b940f + d7c81e8f2baee9be046718a2c977b6ce225b5fca https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - ea90e25c5a831aa31fed455cb204b019544ee835 + a7c88c78eed48e6889df60b7d9b1f03f2e7b0833 - + https://github.com/dotnet/sdk - ea90e25c5a831aa31fed455cb204b019544ee835 + a7c88c78eed48e6889df60b7d9b1f03f2e7b0833 - + https://github.com/dotnet/winforms - 66cbb0e67e4838d008906d7372be0cf249793832 + b86c1518825c9a3c6d720466a7b4cc9ed6f3c9bc - + https://github.com/dotnet/wpf - 2a42b946fcf83be513e48659ac06bf445849cae2 + 521865989ee4b5498da5305f7f82b721c1df0b03 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 998a343a7..d1fd17426 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21521.6 + 6.0.0-rtm.21522.1 - 6.0.0-rtm.21521.7 + 6.0.0-rtm.21522.2 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21522.8 - 6.0.100-rtm.21522.8 + 6.0.100-rtm.21522.10 + 6.0.100-rtm.21522.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.0-rtm.21521.5 - 6.0.0-rtm.21521.5 + 6.0.0-rtm.21522.2 + 6.0.0-rtm.21522.2 6.0.0 6.0.0 From bfb2a9e0dfa61b208d617bff85a4f16a546abd90 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Sat, 23 Oct 2021 01:37:21 +0000 Subject: [PATCH 153/164] Fix roslyn to build with boostrapped build --- ...05-Build-a-subset-of-roslyn-projects.patch | 146 ++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch new file mode 100644 index 000000000..275d6dcec --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch @@ -0,0 +1,146 @@ +From 110fc28ea7c17d57bbd5ce8ed3fc4e2b0274c5b3 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 22 Oct 2021 22:17:37 +0000 +Subject: [PATCH] Build a subset of roslyn projects + +Some projects use Microsoft.NET.Sdk.WindowsDesktop sdk +which cannot be built using a boostrapped source-build +sdk, since WindowsDesktop is not supported. These cannot +be ignored using ExcludeFromSourceBuild because the project +still needs to be loaded and the sdk cannot be found. + +See https://github.com/dotnet/roslyn/issues/57342 +--- + Roslyn.SourceBuild.slnf | 105 ++++++++++++++++++++++++++++++++++++++++ + eng/SourceBuild.props | 2 +- + 2 files changed, 106 insertions(+), 1 deletion(-) + create mode 100644 Roslyn.SourceBuild.slnf + +diff --git a/Roslyn.SourceBuild.slnf b/Roslyn.SourceBuild.slnf +new file mode 100644 +index 00000000000..e6f8eb315bf +--- /dev/null ++++ b/Roslyn.SourceBuild.slnf +@@ -0,0 +1,105 @@ ++{ ++ "solution": { ++ "path": "Roslyn.sln", ++ "projects": [ ++ "src\\Deployment\\RoslynDeployment.csproj", ++ "src\\Compilers\\Core\\Portable\\Microsoft.CodeAnalysis.csproj", ++ "src\\Compilers\\Server\\VBCSCompiler\\VBCSCompiler.csproj", ++ "src\\Compilers\\CSharp\\csc\\csc.csproj", ++ "src\\Compilers\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.csproj", ++ "src\\Compilers\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.vbproj", ++ "src\\Workspaces\\Core\\Portable\\Microsoft.CodeAnalysis.Workspaces.csproj", ++ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\BoundTreeGenerator\\CompilersBoundTreeGenerator.csproj", ++ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpErrorFactsGenerator\\CSharpErrorFactsGenerator.csproj", ++ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpSyntaxGenerator\\CSharpSyntaxGenerator.csproj", ++ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicSyntaxGenerator\\VisualBasicSyntaxGenerator.vbproj", ++ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicErrorFactsGenerator\\VisualBasicErrorFactsGenerator.vbproj", ++ "src\\Workspaces\\Core\\Desktop\\Microsoft.CodeAnalysis.Workspaces.Desktop.csproj", ++ "src\\Workspaces\\Core\\MSBuild\\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj", ++ "src\\Workspaces\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj", ++ "src\\Workspaces\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj", ++ "src\\Features\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj", ++ "src\\Features\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Features.csproj", ++ "src\\Features\\Core\\Portable\\Microsoft.CodeAnalysis.Features.csproj", ++ "src\\Scripting\\VisualBasic\\Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj", ++ "src\\Scripting\\Core\\Microsoft.CodeAnalysis.Scripting.csproj", ++ "src\\Scripting\\CSharp\\Microsoft.CodeAnalysis.CSharp.Scripting.csproj", ++ "src\\ExpressionEvaluator\\Package\\ExpressionEvaluatorPackage.csproj", ++ "src\\ExpressionEvaluator\\CSharp\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj", ++ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj", ++ "src\\ExpressionEvaluator\\Core\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.ExpressionCompiler.csproj", ++ "src\\Compilers\\Core\\AnalyzerDriver\\AnalyzerDriver.shproj", ++ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\BasicResultProvider.shproj", ++ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\NetFX20\\BasicResultProvider.NetFX20.vbproj", ++ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj", ++ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\CSharpResultProvider.shproj", ++ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\NetFX20\\CSharpResultProvider.NetFX20.csproj", ++ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj", ++ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\ResultProvider.shproj", ++ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\NetFX20\\ResultProvider.NetFX20.csproj", ++ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.ResultProvider.csproj", ++ "src\\Compilers\\VisualBasic\\vbc\\vbc.csproj", ++ "src\\Compilers\\VisualBasic\\BasicAnalyzerDriver\\BasicAnalyzerDriver.shproj", ++ "src\\Compilers\\CSharp\\CSharpAnalyzerDriver\\CSharpAnalyzerDriver.shproj", ++ "src\\Compilers\\Core\\CommandLine\\CommandLine.shproj", ++ "src\\Compilers\\Extension\\Roslyn.Compilers.Extension.csproj", ++ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.shproj", ++ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.shproj", ++ "src\\Workspaces\\Remote\\Core\\Microsoft.CodeAnalysis.Remote.Workspaces.csproj", ++ "src\\Workspaces\\Remote\\ServiceHub\\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj", ++ "src\\Compilers\\Core\\MSBuildTask\\Microsoft.Build.Tasks.CodeAnalysis.csproj", ++ "src\\Tools\\BuildBoss\\BuildBoss.csproj", ++ "src\\ExpressionEvaluator\\Core\\Source\\FunctionResolver\\Microsoft.CodeAnalysis.FunctionResolver.csproj", ++ "src\\CodeStyle\\Core\\Analyzers\\Microsoft.CodeAnalysis.CodeStyle.csproj", ++ "src\\CodeStyle\\Core\\CodeFixes\\Microsoft.CodeAnalysis.CodeStyle.Fixes.csproj", ++ "src\\CodeStyle\\CSharp\\Analyzers\\Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj", ++ "src\\CodeStyle\\CSharp\\CodeFixes\\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj", ++ "src\\CodeStyle\\VisualBasic\\Analyzers\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.vbproj", ++ "src\\CodeStyle\\VisualBasic\\CodeFixes\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj", ++ "src\\Tools\\AnalyzerRunner\\AnalyzerRunner.csproj", ++ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.Package.csproj", ++ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.Package.csproj", ++ "src\\NuGet\\Microsoft.Net.Compilers\\Microsoft.Net.Compilers.Package.csproj", ++ "src\\NuGet\\Microsoft.NETCore.Compilers\\Microsoft.NETCore.Compilers.Package.csproj", ++ "src\\NuGet\\Microsoft.CodeAnalysis.Compilers.Package.csproj", ++ "src\\NuGet\\Microsoft.CodeAnalysis.Scripting.Package.csproj", ++ "src\\NuGet\\Microsoft.CodeAnalysis.EditorFeatures.Package.csproj", ++ "src\\NuGet\\Microsoft.CodeAnalysis.Package.csproj", ++ "src\\Setup\\DevDivVsix\\CompilersPackage\\Microsoft.CodeAnalysis.Compilers.Setup.csproj", ++ "src\\Setup\\Installer\\Installer.Package.csproj", ++ "src\\Setup\\DevDivInsertionFiles\\DevDivInsertionFiles.csproj", ++ "src\\Tools\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj", ++ "src\\Tools\\ExternalAccess\\Razor\\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj", ++ "src\\NuGet\\Microsoft.Net.Compilers.Toolset\\Microsoft.Net.Compilers.Toolset.Package.csproj", ++ "src\\Features\\LanguageServer\\Protocol\\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj", ++ "src\\Tools\\ExternalAccess\\Debugger\\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj", ++ "src\\Tools\\ExternalAccess\\Xamarin.Remote\\Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj", ++ "src\\Tools\\ExternalAccess\\Apex\\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj", ++ "src\\Tools\\IdeBenchmarks\\IdeBenchmarks.csproj", ++ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\IOperationGenerator\\CompilersIOperationGenerator.csproj", ++ "src\\Features\\Lsif\\Generator\\Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj", ++ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\Core\\CompilerExtensions.shproj", ++ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\Core\\WorkspaceExtensions.shproj", ++ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\CSharp\\CSharpCompilerExtensions.shproj", ++ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\CSharp\\CSharpWorkspaceExtensions.shproj", ++ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\VisualBasic\\VisualBasicCompilerExtensions.shproj", ++ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\VisualBasic\\VisualBasicWorkspaceExtensions.shproj", ++ "src\\Analyzers\\Core\\Analyzers\\Analyzers.shproj", ++ "src\\Analyzers\\Core\\CodeFixes\\CodeFixes.shproj", ++ "src\\Analyzers\\CSharp\\Analyzers\\CSharpAnalyzers.shproj", ++ "src\\Analyzers\\CSharp\\CodeFixes\\CSharpCodeFixes.shproj", ++ "src\\Analyzers\\VisualBasic\\Analyzers\\VisualBasicAnalyzers.shproj", ++ "src\\Analyzers\\VisualBasic\\CodeFixes\\VisualBasicCodeFixes.shproj", ++ "src\\Tools\\IdeCoreBenchmarks\\IdeCoreBenchmarks.csproj", ++ "src\\Tools\\BuildValidator\\BuildValidator.csproj", ++ "src\\Tools\\BuildActionTelemetryTable\\BuildActionTelemetryTable.csproj", ++ "src\\CodeStyle\\Tools\\CodeStyleConfigFileGenerator.csproj", ++ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.shproj", ++ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.Package.csproj", ++ "src\\Compilers\\Core\\Rebuild\\Microsoft.CodeAnalysis.Rebuild.csproj", ++ "src\\Tools\\ExternalAccess\\OmniSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj", ++ "src\\Tools\\ExternalAccess\\OmniSharp.CSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj", ++ "src\\Workspaces\\Remote\\ServiceHub.CoreComponents\\Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj" ++ ] ++ } ++} +\ No newline at end of file +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 92e316a4744..9905b35467e 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -11,7 +11,7 @@ + --> + + +- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" ++ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" + + + +-- +2.31.1 + From a17784c3acf21025295ead816f5877a522eb66d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Oct 2021 14:11:31 -0700 Subject: [PATCH 154/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12499) * Update dependencies from https://github.com/dotnet/sdk build 20211022.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21522.10 -> To Version 6.0.100-rtm.21522.11 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211023.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21522.10 -> To Version 6.0.100-rtm.21523.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk * Update NuGet.config Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Mitchell --- NuGet.config | 11 +++-- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++------- 3 files changed, 67 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 896cfacca..a78870529 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,10 +16,13 @@ - + + + + - + @@ -34,6 +37,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1800c4c82..8c7b22a63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 @@ -50,32 +50,32 @@ https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 https://github.com/dotnet/test-templates @@ -90,44 +90,44 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - afb8dfb313ad614fb1f13bde72e7c965ad219990 + 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d - + https://github.com/dotnet/templating - afb8dfb313ad614fb1f13bde72e7c965ad219990 + 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d - + https://github.com/dotnet/templating - afb8dfb313ad614fb1f13bde72e7c965ad219990 + 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d - + https://github.com/dotnet/sdk - a7c88c78eed48e6889df60b7d9b1f03f2e7b0833 + 9f05f7d3af55f7ad5928d9ee10a47c14af026489 - + https://github.com/dotnet/sdk - a7c88c78eed48e6889df60b7d9b1f03f2e7b0833 + 9f05f7d3af55f7ad5928d9ee10a47c14af026489 - + https://github.com/dotnet/winforms - b86c1518825c9a3c6d720466a7b4cc9ed6f3c9bc + d43e35d5224f12a335ff1a62d01e86b18a22d657 - + https://github.com/dotnet/wpf - 521865989ee4b5498da5305f7f82b721c1df0b03 + 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 4bfc2b74e5d31242e5a050f44cacdfe8fc2a2b83 + 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/dotnet/fsharp - 4bfc2b74e5d31242e5a050f44cacdfe8fc2a2b83 + 6d626ff0752a77d339f609b4d361787dc9ca93a5 @@ -151,9 +151,9 @@ c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 - + https://github.com/nuget/nuget.client - e3016693e01536996921d613152648d66eb0ce99 + 078701b97eeef2283c1f4605032b5bcf55a80653 diff --git a/eng/Versions.props b/eng/Versions.props index d1fd17426..37f95b580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21522.1 + 6.0.0-rtm.21523.1 - 6.0.0-rtm.21522.2 + 6.0.0-rtm.21523.1 - 6.0.100-rtm.21521.1 + 6.0.100 @@ -46,18 +46,18 @@ 6.0.0 6.0.0 - 6.0.0-rtm.21521.10 - 6.0.0-rtm.21521.10 - 6.0.0-rtm.21521.10 - 6.0.0-rtm.21521.10 + 6.0.0-rtm.21523.2 + 6.0.0-rtm.21523.2 + 6.0.0-rtm.21523.2 + 6.0.0-rtm.21523.2 0.2.0 - 6.0.100-rtm.21522.10 - 6.0.100-rtm.21522.10 + 6.0.100-rtm.21523.3 + 6.0.100-rtm.21523.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.0-rtm.21521.6 - 6.0.0-rtm.21521.6 + 6.0.0-rtm.21522.10 + 6.0.0-rtm.21522.10 6.0.0 6.0.0 6.0.0 @@ -78,8 +78,8 @@ - 6.0.0-rtm.21522.2 - 6.0.0-rtm.21522.2 + 6.0.0-rtm.21523.1 + 6.0.0-rtm.21523.1 6.0.0 6.0.0 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21521.1 + 6.0.100 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 6200cdc765b035bd9fe1eea731d13aedcb0095ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Oct 2021 15:19:00 -0700 Subject: [PATCH 155/164] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12503) * Update dependencies from https://github.com/dotnet/sdk build 20211023.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21523.3 -> To Version 6.0.100-rtm.21523.4 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211023.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21523.3 -> To Version 6.0.100-rtm.21523.5 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 ++-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index a78870529..02cf2ff9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c7b22a63..f787b8af6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://github.com/dotnet/aspnetcore - 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 + 7c57ecbdfee67ad544bd655a757e03145f6122a2 - + https://github.com/dotnet/aspnetcore - 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 + 7c57ecbdfee67ad544bd655a757e03145f6122a2 https://github.com/dotnet/aspnetcore - 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 + 7c57ecbdfee67ad544bd655a757e03145f6122a2 - + https://github.com/dotnet/aspnetcore - 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 + 7c57ecbdfee67ad544bd655a757e03145f6122a2 - + https://github.com/dotnet/aspnetcore - 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 + 7c57ecbdfee67ad544bd655a757e03145f6122a2 - + https://github.com/dotnet/aspnetcore - 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 + 7c57ecbdfee67ad544bd655a757e03145f6122a2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://github.com/dotnet/templating - 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d + 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/templating - 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d + 7d941613047c847c87dc8d243a54fd1a45a47de7 https://github.com/dotnet/templating - 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d + 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 9f05f7d3af55f7ad5928d9ee10a47c14af026489 + f9f0587275fb87230705cd1668fddf14de82182a - + https://github.com/dotnet/sdk - 9f05f7d3af55f7ad5928d9ee10a47c14af026489 + f9f0587275fb87230705cd1668fddf14de82182a @@ -151,7 +151,7 @@ c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 - + https://github.com/nuget/nuget.client 078701b97eeef2283c1f4605032b5bcf55a80653 diff --git a/eng/Versions.props b/eng/Versions.props index 37f95b580..dc31e5517 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.0 6.0.0 - 6.0.0-rtm.21523.2 - 6.0.0-rtm.21523.2 - 6.0.0-rtm.21523.2 - 6.0.0-rtm.21523.2 + 6.0.0-rtm.21523.4 + 6.0.0-rtm.21523.4 + 6.0.0-rtm.21523.4 + 6.0.0-rtm.21523.4 0.2.0 - 6.0.100-rtm.21523.3 - 6.0.100-rtm.21523.3 + 6.0.100-rtm.21523.5 + 6.0.100-rtm.21523.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 172b5673bfa600e270f5347850514f284e36dcab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 24 Oct 2021 09:08:34 -0700 Subject: [PATCH 156/164] Update dependencies from https://github.com/dotnet/sdk build 20211023.6 (#12505) Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21523.5 -> To Version 6.0.100-rtm.21523.6 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.0.0-6.21519.19 -> To Version 4.0.0-6.21521.3 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- 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 f787b8af6..40fc23552 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - f9f0587275fb87230705cd1668fddf14de82182a + d1de2ca70ad890cbbd49b861a5c600468a812ba3 - + https://github.com/dotnet/sdk - f9f0587275fb87230705cd1668fddf14de82182a + d1de2ca70ad890cbbd49b861a5c600468a812ba3 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 3a0930fe6990248c848db2f1e323d7dd2052005b + 5b791f87f5a902491625f28e36ae66986c631f50 diff --git a/eng/Versions.props b/eng/Versions.props index dc31e5517..b4dae842f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21523.5 - 6.0.100-rtm.21523.5 + 6.0.100-rtm.21523.6 + 6.0.100-rtm.21523.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 626c3886e774746919218aa8a718b3429b2bb76d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sun, 24 Oct 2021 09:08:52 -0700 Subject: [PATCH 157/164] [release/6.0.1xx] Remove/Replace NuGet.Client source build patches (#12504) * Remove NuGet.Client source build patches After the latest flow from nuget, I am fairly sure after examining and attempting to apply these patches that they all are no longer necessary. There are some slight diffs (they don't all apply as no-ops), but the code in question appears to be okay on inspection. * Port missing parts of the patch. * Don't remove necessary files in Roslyn patch. Co-authored-by: Chris Rummel --- ...se-PublicApiAnalyzer-on-source-build.patch | 31 -- ...ed-source-build-patches-and-re-patch.patch | 296 ++++++++++++++++++ .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 144 --------- ...-Microsoft.Web.Xdt-System.ComponentM.patch | 43 --- ...hanges-to-support-ArPow-from-tarball.patch | 88 ------ .../0006-Upgrade-to-.NET-6-SDK.patch | 124 -------- ...eworks-for-netstandard-as-well-for-V.patch | 26 -- ...uild.Tasks.Pack-source-build-support.patch | 35 --- ...xtensions.CommandLineUtils-reference.patch | 46 --- ...Add-Features-projects-to-SourceBuild.patch | 127 ++------ 10 files changed, 325 insertions(+), 635 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch deleted file mode 100644 index 1cb91f3d3..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 335f32e48fd5604cdb1340ec04d6503a3e43d783 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Tue, 17 Aug 2021 21:09:35 +0000 -Subject: [PATCH] Don't use PublicApiAnalyzer on source-build - -CSC : warning AD0001: Analyzer 'Microsoft.CodeAnalysis.PublicApiAnalyzers.DeclarePublicApiAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. -CSC : error CS2001: Source file '/repos/installer2/artifacts/tarball/src/nuget-client.7363366401b43f4ea250394db8dad3707e9a9636/src/NuGet.Core/NuGet.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt' could not be found. - ---- - build/common.targets | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build/common.targets b/build/common.targets -index 2c387f576..cf5a70c62 100644 ---- a/build/common.targets -+++ b/build/common.targets -@@ -65,6 +65,11 @@ - - - -+ -+ -+ false -+ -+ - - - true --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch new file mode 100644 index 000000000..34d37ba0b --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -0,0 +1,296 @@ +From 157de59d479f2ed179b9b777eaf2b769871e3bf6 Mon Sep 17 00:00:00 2001 +From: Matt Mitchell +Date: Sat, 23 Oct 2021 16:41:24 -0700 +Subject: [PATCH] Remove uneeded source build patches and re-patch + +--- + build/common.project.props | 16 ++++++---------- + build/packages.targets | 3 ++- + .../NuGet.Build.Tasks.Pack.csproj | 4 ++-- + .../NuGet.CommandLine.XPlat.csproj | 2 +- + .../SignCommand/CertificateProvider.cs | 4 ++-- + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - + .../NuGet.Configuration.csproj | 3 +-- + .../NuGet.Frameworks/NuGet.Frameworks.csproj | 3 +-- + .../NuGet.PackageManagement.csproj | 2 +- + .../Signing/Authoring/SignPackageRequest.cs | 2 ++ + .../NuGet.Packaging/Signing/Cms/NativeUtility.cs | 2 ++ + .../HttpSource/HttpRequestMessageExtensions.cs | 6 +++--- + .../HttpSource/HttpRetryHandler.cs | 2 +- + .../HttpSourceAuthenticationHandler.cs | 2 +- + .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - + 15 files changed, 25 insertions(+), 28 deletions(-) + +diff --git a/build/common.project.props b/build/common.project.props +index 79a935391..65e482b83 100644 +--- a/build/common.project.props ++++ b/build/common.project.props +@@ -10,24 +10,20 @@ + + + +- $(DotNetBuildFromSource) + PackageReference + v4.7.2 + net472 +- netcoreapp2.1 +- net6.0 ++ net6.0 + netcoreapp5.0 +- netstandard2.0 +- net6.0 ++ $(DotNetBuildFromSource) ++ netstandard2.0;net6.0 + $(NETFXTargetFramework);$(NETCoreTargetFramework) + $(NETCoreTargetFramework) +- $(TargetFrameworksExe);netcoreapp5.0 +- $(NETCoreTargetFramework);netcoreapp5.0 +- $(TargetFrameworksExe);net6.0 ++ $(TargetFrameworksExe);net6.0 ++ $(NETCoreTargetFramework);net6.0 + $(NETFXTargetFramework);$(NetStandardVersion) + $(NetStandardVersion) +- $(TargetFrameworksLibrary);netcoreapp5.0 +- $(TargetFrameworksLibrary);net6.0 ++ $(TargetFrameworksLibrary);net6.0 + $(NETFXTargetFramework);netcoreapp5.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ + $(RepositoryRootDirectory)build\ +diff --git a/build/packages.targets b/build/packages.targets +index c11557248..0e7dd7861 100644 +--- a/build/packages.targets ++++ b/build/packages.targets +@@ -10,6 +10,7 @@ + 5.0.0 + 2.14.0-rtm-832 + 17.0.0-beta1-10402-05 ++ 5.0.1-rtm.21063.7 + + + +@@ -33,7 +34,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +index c94acffd8..f4d083e52 100644 +--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj ++++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +@@ -177,7 +177,7 @@ + + ilmerge\ + Desktop/ +- CoreCLR/ ++ CoreCLR/ + + + +@@ -189,7 +189,7 @@ + + $(PackagePathDir) + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +index 21015c00a..e306cdee4 100644 +--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj ++++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +@@ -18,7 +18,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs +index c6ea71243..beac41889 100644 +--- a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs ++++ b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs +@@ -115,7 +115,7 @@ public static async Task GetCertificatesAsync(Certif + + return resultCollection; + } +- ++#pragma warning disable CS1998 + private static async Task LoadCertificateFromFileAsync(CertificateSourceOptions options) + { + X509Certificate2 cert; +@@ -154,7 +154,7 @@ private static async Task LoadCertificateFromFileAsync(Certifi + + return cert; + } +- ++#pragma warning restore CS1998 + private static X509Certificate2Collection LoadCertificateFromStore(CertificateSourceOptions options) + { + X509Certificate2Collection resultCollection = null; +diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +index e30a079eb..c2b8fe241 100644 +--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj ++++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +@@ -5,7 +5,6 @@ + + Common utilities and interfaces for all NuGet libraries. + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + $(NoWarn);CS1591;CS1574 + true +diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +index bbc5ba480..18b597c74 100644 +--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj ++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +@@ -6,7 +6,6 @@ + NuGet's configuration settings implementation. + $(NoWarn);CS1591 + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + true + true +@@ -29,7 +28,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +index b78b1f2ea..a89b516c6 100644 +--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj ++++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +@@ -4,8 +4,7 @@ + + + NuGet's understanding of target frameworks. +- $(TargetFrameworksLibrary);netstandard2.0 +- $(TargetFrameworksLibrary);net40 ++ $(TargetFrameworksLibrary);netstandard2.0 + + $(NoWarn);CS1591;CS1574;CS1573 + true +diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +index dfbfcaa8d..a6bb51d6b 100644 +--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj ++++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +@@ -35,7 +35,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs +index e0cfae99f..ce19f2d6e 100644 +--- a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs ++++ b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs +@@ -98,7 +98,9 @@ protected virtual void Dispose(bool disposing) + Chain?.Dispose(); + + #if IS_SIGNING_SUPPORTED ++#pragma warning disable CA1416 + PrivateKey?.Dispose(); ++#pragma warning restore CA1416 + #endif + } + +diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs +index 565ac60b7..d57e38a65 100644 +--- a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs ++++ b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs +@@ -120,7 +120,9 @@ internal static SignedCms NativeSign(CmsSigner cmsSigner, byte[] data, CngKey pr + + signerInfo.cbSize = (uint)Marshal.SizeOf(signerInfo); + signerInfo.pCertInfo = MarshalUtility.PtrToStructure(cmsSigner.Certificate.Handle).pCertInfo; ++#pragma warning disable CA1416 + signerInfo.hCryptProvOrhNCryptKey = privateKey.Handle.DangerousGetHandle(); ++#pragma warning restore CA1416 + signerInfo.HashAlgorithm.pszObjId = cmsSigner.DigestAlgorithm.Value; + + if (cmsSigner.SignerIdentifierType == SubjectIdentifierType.SubjectKeyIdentifier) +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs +index 7c9595268..1ca751850 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs +@@ -34,7 +34,7 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage request) + clone.Headers.TryAddWithoutValidation(header.Key, header.Value); + } + +-#if NET5_0 ++#if NET5_0 || NET6_0 + var clonedOptions = (IDictionary)clone.Options; + foreach (var option in request.Options) + { +@@ -118,7 +118,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest + throw new ArgumentNullException(nameof(configuration)); + } + +-#if NET5_0 ++#if NET5_0 || NET6_0 + request.Options.Set(new HttpRequestOptionsKey(NuGetConfigurationKey), configuration); + #else + request.Properties[NuGetConfigurationKey] = configuration; +@@ -128,7 +128,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest + private static T GetProperty(this HttpRequestMessage request, string key) + { + +-#if NET5_0 ++#if NET5_0 || NET6_0 + if (request.Options.TryGetValue(new HttpRequestOptionsKey(key), out T result)) + #else + object result; +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +index c7bcb54bb..30d86fcc9 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader) + headerStopwatch = new Stopwatch(); + stopwatches.Add(headerStopwatch); + } +-#if NET5_0 ++#if NET5_0 || NET6_0 + requestMessage.Options.Set(new HttpRequestOptionsKey>(StopwatchPropertyName), stopwatches); + #else + requestMessage.Properties[StopwatchPropertyName] = stopwatches; +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs +index b9ab58ce7..ebf738e52 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs +@@ -98,7 +98,7 @@ protected override async Task SendAsync(HttpRequestMessage + { + List stopwatches = null; + +-#if NET5_0 ++#if NET5_0 || NET6_0 + if (request.Options.TryGetValue( + new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), + out stopwatches)) +diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +index 180293944..8498664b9 100644 +--- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj ++++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +@@ -4,7 +4,6 @@ + + + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + NuGet's implementation of Semantic Versioning. + semver;semantic versioning +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch deleted file mode 100644 index 2400ef3e6..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ /dev/null @@ -1,144 +0,0 @@ -From de74c87d3f9364be1f3bdba43844c8de92704757 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Tue, 17 Aug 2021 21:13:07 +0000 -Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 - -Patch removal is tracked by https://github.com/dotnet/source-build/issues/2555. - ---- - build/common.project.props | 10 +++++----- - build/common.targets | 2 +- - .../NuGet.Build.Tasks.Pack.csproj | 2 +- - src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - - .../NuGet.Configuration/NuGet.Configuration.csproj | 3 +-- - .../NuGet.Frameworks/NuGet.Frameworks.csproj | 1 - - .../NuGet.PackageManagement.csproj | 2 +- - .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - - 8 files changed, 9 insertions(+), 13 deletions(-) - -diff --git a/build/common.project.props b/build/common.project.props -index e2e3c0c11..000702f58 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -13,17 +13,17 @@ - PackageReference - v4.7.2 - net472 -- netcoreapp2.1 -+ net6.0 - netcoreapp5.0 - $(DotNetBuildFromSource) -- netstandard2.0 -+ netstandard2.0;net6.0 - $(NETFXTargetFramework);$(NETCoreTargetFramework) - $(NETCoreTargetFramework) -- $(TargetFrameworksExe);netcoreapp5.0 -- $(NETCoreTargetFramework);netcoreapp5.0 -+ $(TargetFrameworksExe);net6.0 -+ $(NETCoreTargetFramework);net6.0 - $(NETFXTargetFramework);$(NetStandardVersion) - $(NetStandardVersion) -- $(TargetFrameworksLibrary);netcoreapp5.0 -+ $(TargetFrameworksLibrary);net6.0 - $(NETFXTargetFramework);netcoreapp5.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ - $(RepositoryRootDirectory)build\ -diff --git a/build/common.targets b/build/common.targets -index 6fd5bd260..3de830b25 100644 ---- a/build/common.targets -+++ b/build/common.targets -@@ -6,7 +6,7 @@ - true - - -- -+ - $(DefineConstants);IS_CORECLR - true - -diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f11dd752b..d4f11aad5 100644 ---- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -@@ -177,7 +177,7 @@ - - ilmerge\ - Desktop/ -- CoreCLR/ -+ CoreCLR/ - - - -diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj -index e30a079eb..c2b8fe241 100644 ---- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj -+++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj -@@ -5,7 +5,6 @@ - - Common utilities and interfaces for all NuGet libraries. - $(TargetFrameworksLibrary) -- $(TargetFrameworks);net45 - - $(NoWarn);CS1591;CS1574 - true -diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..18b597c74 100644 ---- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -@@ -6,7 +6,6 @@ - NuGet's configuration settings implementation. - $(NoWarn);CS1591 - $(TargetFrameworksLibrary) -- $(TargetFrameworks);net45 - - true - true -@@ -29,7 +28,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index 65f261dc1..f29551741 100644 ---- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -+++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -@@ -5,7 +5,6 @@ - - NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) -- $(TargetFrameworks);net40 - - $(NoWarn);CS1591;CS1574;CS1573 - true -diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index dfbfcaa8d..a6bb51d6b 100644 ---- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -@@ -35,7 +35,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj -index 180293944..8498664b9 100644 ---- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj -+++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj -@@ -4,7 +4,6 @@ - - - $(TargetFrameworksLibrary) -- $(TargetFrameworks);net45 - - NuGet's implementation of Semantic Versioning. - semver;semantic versioning --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch deleted file mode 100644 index 714b0ea00..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fecc40e502197e65804177b2aec49a7a5422ed6e Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Thu, 10 Dec 2020 16:17:55 -0600 -Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & - System.ComponentModel.Composition - ---- - build/packages.targets | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/build/packages.targets b/build/packages.targets -index 6f72ac3fd..8317f3903 100644 ---- a/build/packages.targets -+++ b/build/packages.targets -@@ -15,6 +15,12 @@ - 2.4.1 - - -+ -+ -+ 3.0.0 -+ 4.5.0 -+ -+ - - - -@@ -42,10 +48,10 @@ - - - -- -+ - - -- -+ - -@@ -31,7 +32,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -index 21015c00a..e306cdee4 100644 ---- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -@@ -18,7 +18,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index 3a783fa63..5da9b5bae 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d1fd2aa5e216e49f9da38b0000d006184c540ff2 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 13:40:38 -0700 Subject: [PATCH] Add Features projects to SourceBuild @@ -10,22 +10,20 @@ Subject: [PATCH] Add Features projects to SourceBuild .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- ...ft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - ...icrosoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ - .../Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- - .../LanguageServer/Directory.Build.props | 6 ++++++ - src/Features/Lsif/Directory.Build.props | 6 ++++++ - ...oft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ - src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ + .../Microsoft.CodeAnalysis.Features.csproj | 2 +- + .../{ => LanguageServer}/Directory.Build.props | 0 + src/Features/{ => Lsif}/Directory.Build.props | 0 + .../VisualStudio}/Directory.Build.props | 0 src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- src/Tools/BuildBoss/ProjectCheckerUtil.cs | 7 ++++--- .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- ...osoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- ...Analysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 17 files changed, 68 insertions(+), 29 deletions(-) - rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) - create mode 100644 src/Features/LanguageServer/Directory.Build.props - create mode 100644 src/Features/Lsif/Directory.Build.props - create mode 100644 src/NuGet/VisualStudio/Directory.Build.props + 15 files changed, 34 insertions(+), 28 deletions(-) + copy src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) + copy src/Features/{ => LanguageServer}/Directory.Build.props (100%) + copy src/Features/{ => Lsif}/Directory.Build.props (100%) + rename src/{Features => NuGet/VisualStudio}/Directory.Build.props (100%) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 182f8a9cdb1..92e316a4744 100644 @@ -41,7 +39,7 @@ index 182f8a9cdb1..92e316a4744 100644 diff --git a/eng/Versions.props b/eng/Versions.props -index e835ef04d52..34cab5c4755 100644 +index 679e77c5e19..96b3981a12c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ @@ -78,8 +76,8 @@ index e835ef04d52..34cab5c4755 100644 true -@@ -129,7 +129,13 @@ - - - -- -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/LanguageServer/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Features/Lsif/Directory.Build.props b/src/Features/Lsif/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/Lsif/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj -index ac8c80c68fb..d17a5d84802 100644 ---- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj -+++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj -@@ -55,6 +55,10 @@ - InternalUtilities\LambdaUtilities.vb - - -+ -+ -+ -+ - - - -diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/NuGet/VisualStudio/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ +diff --git a/src/Features/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props +similarity index 100% +copy from src/Features/Directory.Build.props +copy to src/Features/LanguageServer/Directory.Build.props +diff --git a/src/Features/Directory.Build.props b/src/Features/Lsif/Directory.Build.props +similarity index 100% +copy from src/Features/Directory.Build.props +copy to src/Features/Lsif/Directory.Build.props +diff --git a/src/Features/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props +similarity index 100% +rename from src/Features/Directory.Build.props +rename to src/NuGet/VisualStudio/Directory.Build.props diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj index 6e1cbe46285..8ca3cbb28f0 100644 --- a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj @@ -332,3 +260,6 @@ index 3d0c6e993c0..06773c65e8d 100644 +-- +2.31.1 + From 77928ad73e909318602250bdc31521158180fcd0 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 21:14:03 -0500 Subject: [PATCH 158/164] Add patch to build net472 in NuGet to support Omnisharp. --- .../0010-Re-enable-fullfx-TFM-in-NuGet.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch b/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch new file mode 100644 index 000000000..b71f75cb9 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch @@ -0,0 +1,43 @@ +From 7f35d623761748721496abcbae2d6f11d4cf1ca8 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Fri, 22 Oct 2021 21:12:51 -0500 +Subject: [PATCH] Re-enable fullfx TFM in NuGet. + +--- + build/common.project.props | 3 +-- + .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/build/common.project.props b/build/common.project.props +index 000702f58..b29968eaf 100644 +--- a/build/common.project.props ++++ b/build/common.project.props +@@ -18,11 +18,10 @@ + $(DotNetBuildFromSource) + netstandard2.0;net6.0 + $(NETFXTargetFramework);$(NETCoreTargetFramework) +- $(NETCoreTargetFramework) ++ $(NETCoreTargetFramework) + $(TargetFrameworksExe);net6.0 + $(NETCoreTargetFramework);net6.0 + $(NETFXTargetFramework);$(NetStandardVersion) +- $(NetStandardVersion) + $(TargetFrameworksLibrary);net6.0 + $(NETFXTargetFramework);netcoreapp5.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ +diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +index f4d083e52..c4eb79b4c 100644 +--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj ++++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +@@ -176,7 +176,7 @@ + + + ilmerge\ +- Desktop/ ++ Desktop/ + CoreCLR/ + + +-- +2.31.1 + From 6de9c8d89737b05e01d2dcd38117d696e574d5c3 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Mon, 25 Oct 2021 10:23:45 -0400 Subject: [PATCH 159/164] [ArPow] Delete optional files under non-open source licenses These files are not required as part of source-build, and are under non-free licenses. Delete them when building the source-build tarball. Fixes: https://github.com/dotnet/source-build/issues/2359 --- .../Arcade/tools/SourceBuildArcadeTarball.targets | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 7203b401b..beb4c0354 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -246,6 +246,20 @@ + + + + + + + + + + + + From 278e5b5027115d3f5fbad1b2224d38977b7339b7 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 25 Oct 2021 10:11:06 -0500 Subject: [PATCH 160/164] Remove workaround now that NuGet builds fullfx. --- ...-Microsoft.NET.Build.Tasks-for-netfx.patch | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch b/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch index 2ccf89e9e..b128d21f3 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 3540e85a194dda1e5448e0aab3212c8aeb5a1aff Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 22 Oct 2021 20:48:25 +0000 Subject: [PATCH] Build Microsoft.NET.Build.Tasks for netfx @@ -7,11 +7,11 @@ Required for omnisharp to work with a source-built .NET SDK. Patch removal issue: https://github.com/dotnet/sdk/issues/22281 --- - .../Microsoft.DotNet.Compatibility.csproj | 1 - - .../Microsoft.DotNet.PackageValidation.csproj | 7 ++++++- - .../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 - - .../Microsoft.NET.Build.Tasks.csproj | 1 - - 4 files changed, 6 insertions(+), 4 deletions(-) + .../Microsoft.DotNet.Compatibility.csproj | 1 - + .../Microsoft.DotNet.PackageValidation.csproj | 1 - + .../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 - + .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 - + 4 files changed, 4 deletions(-) diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj index 92624be845..f9f8e46329 100644 @@ -26,7 +26,7 @@ index 92624be845..f9f8e46329 100644 true Open diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -index 7a8b648652..4f820adb72 100644 +index 7a8b648652..4241f4577e 100644 --- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj @@ -2,7 +2,6 @@ @@ -37,19 +37,6 @@ index 7a8b648652..4f820adb72 100644 Open -@@ -15,6 +14,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj index 13ada82225..280fbdc83e 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj @@ -74,3 +61,6 @@ index 604ef43bf2..bce39c67d4 100644 annotations +-- +2.31.1 + From 9322ed1261be05362c3fab74370fb56717173473 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Oct 2021 00:02:30 +0000 Subject: [PATCH 161/164] Update dependencies from https://github.com/dotnet/sdk build 20211026.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21523.6 -> To Version 6.0.100-rtm.21526.8 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 13 ++++++++++++- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 02cf2ff9c..2a1230640 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,32 @@ - + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40fc23552..2e1c0ae85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://github.com/dotnet/aspnetcore - 7c57ecbdfee67ad544bd655a757e03145f6122a2 + ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - + https://github.com/dotnet/aspnetcore - 7c57ecbdfee67ad544bd655a757e03145f6122a2 + ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 https://github.com/dotnet/aspnetcore - 7c57ecbdfee67ad544bd655a757e03145f6122a2 + ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - + https://github.com/dotnet/aspnetcore - 7c57ecbdfee67ad544bd655a757e03145f6122a2 + ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - + https://github.com/dotnet/aspnetcore - 7c57ecbdfee67ad544bd655a757e03145f6122a2 + ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - + https://github.com/dotnet/aspnetcore - 7c57ecbdfee67ad544bd655a757e03145f6122a2 + ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - d1de2ca70ad890cbbd49b861a5c600468a812ba3 + 7c936be255ae26caec9f7febf5ab556976b5c2f1 - + https://github.com/dotnet/sdk - d1de2ca70ad890cbbd49b861a5c600468a812ba3 + 7c936be255ae26caec9f7febf5ab556976b5c2f1 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 5b791f87f5a902491625f28e36ae66986c631f50 + c7d6f9fab845ffd943216da465022744e7d35f22 diff --git a/eng/Versions.props b/eng/Versions.props index b4dae842f..a9ab6fbb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.0 6.0.0 - 6.0.0-rtm.21523.4 - 6.0.0-rtm.21523.4 - 6.0.0-rtm.21523.4 - 6.0.0-rtm.21523.4 + 6.0.0-rtm.21526.8 + 6.0.0-rtm.21526.8 + 6.0.0-rtm.21526.8 + 6.0.0-rtm.21526.8 0.2.0 - 6.0.100-rtm.21523.6 - 6.0.100-rtm.21523.6 + 6.0.100-rtm.21526.8 + 6.0.100-rtm.21526.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fd022a39be98d4be424e0513815095b2f5a6b964 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 26 Oct 2021 17:21:57 -0700 Subject: [PATCH 162/164] Remove uneeded roslyn patch (#12531) --- ...Add-Features-projects-to-SourceBuild.patch | 265 ------------------ 1 file changed, 265 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch deleted file mode 100644 index 5da9b5bae..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch +++ /dev/null @@ -1,265 +0,0 @@ -From d1fd2aa5e216e49f9da38b0000d006184c540ff2 Mon Sep 17 00:00:00 2001 -From: Joey Robichaud -Date: Wed, 20 Oct 2021 13:40:38 -0700 -Subject: [PATCH] Add Features projects to SourceBuild - ---- - eng/SourceBuild.props | 2 +- - eng/Versions.props | 17 ++++++++++++----- - .../Core/Tests}/Directory.Build.props | 0 - .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- - ...ft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- - .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - .../Microsoft.CodeAnalysis.Features.csproj | 2 +- - .../{ => LanguageServer}/Directory.Build.props | 0 - src/Features/{ => Lsif}/Directory.Build.props | 0 - .../VisualStudio}/Directory.Build.props | 0 - src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- - src/Tools/BuildBoss/ProjectCheckerUtil.cs | 7 ++++--- - .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- - ...osoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- - ...Analysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 15 files changed, 34 insertions(+), 28 deletions(-) - copy src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) - copy src/Features/{ => LanguageServer}/Directory.Build.props (100%) - copy src/Features/{ => Lsif}/Directory.Build.props (100%) - rename src/{Features => NuGet/VisualStudio}/Directory.Build.props (100%) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 182f8a9cdb1..92e316a4744 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -11,7 +11,7 @@ - --> - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln" -+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 679e77c5e19..96b3981a12c 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -38,7 +38,7 @@ - 5.0.0-preview.1.20112.8 - 17.0.5133-g7b8c8bd49d - 17.0.0-previews-4-31709-430 -- 16.5.0 -+ 16.5.0 - -+ $(RefOnlyMicrosoftBuildPackagesVersion) -+ $(RefOnlyMicrosoftBuildPackagesVersion) -+ $(RefOnlyMicrosoftBuildPackagesVersion) -+ $(RefOnlyMicrosoftBuildPackagesVersion) - 6.0.0-preview.0.15 - 16.10.23 - - $(NoWarn);CA1819 -- -+ - - true - Microsoft.CodeAnalysis.Build.Tasks -@@ -51,8 +51,8 @@ - - - -- -- -+ -+ - - - -diff --git a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj -index 9744f538e6d..1d515f35f81 100644 ---- a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj -+++ b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj -@@ -27,9 +27,9 @@ - - - -- -- -- -+ -+ -+ - - - -diff --git a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj -index 3644afb8c2f..ed4259ec61b 100644 ---- a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj -+++ b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj -@@ -115,9 +115,9 @@ - - - -- -- -- -+ -+ -+ - - - -diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj -index 1af351cc77b..8ecad0bac56 100644 ---- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj -+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj -@@ -7,7 +7,7 @@ - netcoreapp3.1;netstandard2.0 - full - true -- -+ - - true - -diff --git a/src/Features/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props -similarity index 100% -copy from src/Features/Directory.Build.props -copy to src/Features/LanguageServer/Directory.Build.props -diff --git a/src/Features/Directory.Build.props b/src/Features/Lsif/Directory.Build.props -similarity index 100% -copy from src/Features/Directory.Build.props -copy to src/Features/Lsif/Directory.Build.props -diff --git a/src/Features/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props -similarity index 100% -rename from src/Features/Directory.Build.props -rename to src/NuGet/VisualStudio/Directory.Build.props -diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj -index 6e1cbe46285..8ca3cbb28f0 100644 ---- a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj -+++ b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj -@@ -23,7 +23,7 @@ - - - -- -+ - - - -diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs -index e571afede4a..0cb613b77a6 100644 ---- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs -+++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs -@@ -157,6 +157,7 @@ private IEnumerable GetAllowedPackageReferenceVersions(PackageReference - var name = packageReference.Name.Replace(".", "").Replace("-", ""); - yield return $"$({name}Version)"; - yield return $"$({name}FixedVersion)"; -+ yield return $"$(RefOnly{name}Version)"; - } - } - -@@ -234,8 +235,8 @@ private bool CheckProjectReferencesComplete(TextWriter textWriter, IEnumerable

                              -- /// Unit test projects should not reference each other. In order for unit tests to be run / F5 they must be -- /// modeled as deployment projects. Having Unit Tests reference each other hurts that because it ends up -+ /// Unit test projects should not reference each other. In order for unit tests to be run / F5 they must be -+ /// modeled as deployment projects. Having Unit Tests reference each other hurts that because it ends up - /// putting two copies of the unit test DLL into the UnitTest folder: - /// - /// 1. UnitTests\Current\TheUnitTest\TheUnitTest.dll -@@ -244,7 +245,7 @@ private bool CheckProjectReferencesComplete(TextWriter textWriter, IEnumerable

                              - - -- -+ - - - -diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -index 3bd6d6398e3..a65fc35f1c3 100644 ---- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -+++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -@@ -7,8 +7,6 @@ - true - netcoreapp3.1;net472 - $(DefineConstants);WORKSPACE_MSBUILD -- true -- - - true - -@@ -24,9 +22,9 @@ - - - -- -- -- -+ -+ -+ - - - -diff --git a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj -index 3d0c6e993c0..06773c65e8d 100644 ---- a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj -+++ b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj -@@ -27,8 +27,8 @@ - - - -- -- -+ -+ - - - --- -2.31.1 - From 13362eb7a4fe14c356085773398793bb91f48a8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Oct 2021 11:31:13 -0700 Subject: [PATCH 163/164] Update dependencies from https://github.com/dotnet/sdk build 20211027.8 (#12543) Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21526.8 -> To Version 6.0.100-rtm.21527.8 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 +++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2a1230640..de42f9ad5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,11 @@ + + @@ -19,17 +21,20 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e1c0ae85..6dfe53685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 7c936be255ae26caec9f7febf5ab556976b5c2f1 + 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f - + https://github.com/dotnet/sdk - 7c936be255ae26caec9f7febf5ab556976b5c2f1 + 2c798cbf6bf259ce49d94d91bc665a95d42d7a7f diff --git a/eng/Versions.props b/eng/Versions.props index a9ab6fbb8..a1d77f37f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21526.8 - 6.0.100-rtm.21526.8 + 6.0.100-rtm.21527.8 + 6.0.100-rtm.21527.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e8b04bbff820c93c142f99a507a46b976f5c14c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 27 Oct 2021 14:20:05 -0500 Subject: [PATCH 164/164] Resolve source-build dotnet-format patch conflict (#12545) --- .../patches/format/0001-Fix-MicrosoftExtensionsVersion.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7c19d6a40..7d5d03116 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644