From 0cec6c187e86885eed5c4ba4f0e804834fc26787 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 8 Oct 2021 19:39:22 +0000 Subject: [PATCH 01/48] Handle workload manifests as text-only packages in source-build --- .../job/source-build-run-tarball-build.yml | 9 ++++----- .../Arcade/tools/SourceBuildArcadeTarball.targets | 14 ++++++++++++++ .../Arcade/tools/TextOnlyPackages.csproj | 6 ++++++ src/redist/targets/BundledManifests.targets | 5 ++--- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index bb734e529..328623660 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -90,12 +90,11 @@ jobs: artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt) displayName: Publish Source Build Artifacts - # TODO: Re-enable once https://github.com/dotnet/source-build/issues/2489 is fixed. - # - script: | - # set -x + - script: | + set -x - # docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test - # displayName: Run Tests + docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test + displayName: Run Tests - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml parameters: diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index f07718f1a..cb034ec74 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -324,6 +324,20 @@ $([System.IO.Path]::GetFileName('$(TextOnlyDirectory)')) + + + + + + + + + + + + + + diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 5c4623173..65af1f56b 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -11,7 +11,7 @@ - + [%(Version)] @@ -26,8 +26,7 @@ + DependsOnTargets="LayoutManifestsForSDK;LayoutManifestsForMSI"/> From aac9b449896629925e1865d76ce190246d766047 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 11 Oct 2021 14:02:29 +0000 Subject: [PATCH 02/48] Add missing aspnetcore xml doc smoke-test exclusion --- src/SourceBuild/tarball/content/smoke-test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index d379010f3..ec59fa802 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -522,6 +522,7 @@ function runXmlDocTests() { aspnetcoreappIgnoreList=( Microsoft.AspNetCore.App.Analyzers.xml + Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.Extensions.Logging.Generators.resources.xml Microsoft.Extensions.Logging.Generators.xml ) From ba5131fbf52acb42a13c58dbaec1fb0369a5a58c Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Mon, 11 Oct 2021 16:13:35 -0700 Subject: [PATCH 03/48] Update manifest authoring for localization dir --- src/redist/targets/BundledManifests.targets | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 5c4623173..2cb7cbaa3 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -68,13 +68,15 @@ - - - + DestinationPath="$([MSBuild]::ValueOrDefault('%(WorkloadManifestId)', '').ToLower())" + RestoredNupkgContentPath="%(RestoredNupkgContentPath)" + WorkloadManifestId="%(WorkloadManifestId)"/> + + From ee7b08fdb6c14cb56d60d4293a87cfe709046d24 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 11 Oct 2021 19:18:45 +0000 Subject: [PATCH 04/48] Edit per code review --- .../tools/SourceBuildArcadeTarball.targets | 68 +++++++++++++++---- 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index cb034ec74..7203b401b 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -324,20 +324,6 @@ $([System.IO.Path]::GetFileName('$(TextOnlyDirectory)')) - - - - - - - - + + + + + + + + + + + @@ -356,3 +395,4 @@ + From 39f009f8b8c9c7c6e1e7d92bd25755d130399bc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 07:07:40 +0000 Subject: [PATCH 05/48] Update dependencies from https://github.com/dotnet/sdk build 20211011.44 (#12308) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21508.3 to 4.0.0-6.21511.11 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e370e8620..d64d50f8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - e6d7bc2f7a16a404cad81492b61339381aa76e59 + d5293294c084696ca9280536c17854214ec61fe6 - + https://github.com/dotnet/sdk - e6d7bc2f7a16a404cad81492b61339381aa76e59 + d5293294c084696ca9280536c17854214ec61fe6 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 66b241be4e8d900f8ccb8a15fdc60f249371e97d + 8ed6fe03b503e2ea2527162707cd9e57d04c2187 diff --git a/eng/Versions.props b/eng/Versions.props index 9e9ae81a5..dd14e7dc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21511.42 - 6.0.100-rtm.21511.42 + 6.0.100-rtm.21511.44 + 6.0.100-rtm.21511.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b63ec5c17da5d0681bdd8254bf12e2c1630c3aee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 09:40:59 +0000 Subject: [PATCH 06/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.1 (#12309) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21511.14 to 6.0.0-rtm.21511.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21511.14 to 6.0.0-rtm.21511.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21511.14 to 6.0.0-rtm.21511.21 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.14 to 6.0.0-rtm.21511.21 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21511.14 to 6.0.0-rtm.21511.21 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21511.14 to 6.0.0-rtm.21511.21 (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 d64d50f8b..c548c7304 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime d262c21063bbb5b385a776e4ce24f7132eb918dc - + https://github.com/dotnet/aspnetcore - ef2d247063e952e74ca60e700eebc9f80407b1ca + 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a - + https://github.com/dotnet/aspnetcore - ef2d247063e952e74ca60e700eebc9f80407b1ca + 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a - + https://github.com/dotnet/aspnetcore - ef2d247063e952e74ca60e700eebc9f80407b1ca + 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a - + https://github.com/dotnet/aspnetcore - ef2d247063e952e74ca60e700eebc9f80407b1ca + 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a - + https://github.com/dotnet/aspnetcore - ef2d247063e952e74ca60e700eebc9f80407b1ca + 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a - + https://github.com/dotnet/aspnetcore - ef2d247063e952e74ca60e700eebc9f80407b1ca + 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - d5293294c084696ca9280536c17854214ec61fe6 + d6793b4fb938934a02aec367318591cac0c5b627 - + https://github.com/dotnet/sdk - d5293294c084696ca9280536c17854214ec61fe6 + d6793b4fb938934a02aec367318591cac0c5b627 diff --git a/eng/Versions.props b/eng/Versions.props index dd14e7dc9..3624fab44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21511.14 - 6.0.0-rtm.21511.14 - 6.0.0-rtm.21511.14 - 6.0.0-rtm.21511.14 - 6.0.0-rtm.21511.14 - 6.0.0-rtm.21511.14 + 6.0.0-rtm.21511.21 + 6.0.0-rtm.21511.21 + 6.0.0-rtm.21511.21 + 6.0.0-rtm.21511.21 + 6.0.0-rtm.21511.21 + 6.0.0-rtm.21511.21 0.2.0 - 6.0.100-rtm.21511.44 - 6.0.100-rtm.21511.44 + 6.0.100-rtm.21512.1 + 6.0.100-rtm.21512.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 93f45e2eb9d9a0efb1d87fa4926af7048fbad3b5 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 12 Oct 2021 13:38:37 +0000 Subject: [PATCH 07/48] Update SBRP to reference intermediate package --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c548c7304..f5236f7c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,7 +211,7 @@ https://github.com/dotnet/arcade e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/source-build-reference-packages 5334f439e93c93244c5e2ef97b953491a0dbcf09 From c5a8e1384908b9b9241880f16b932bd6e4a9f59c Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 12 Oct 2021 08:49:14 -0500 Subject: [PATCH 08/48] Include update from darc --- 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 f5236f7c6..4b86dbbeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/source-build-reference-packages - 5334f439e93c93244c5e2ef97b953491a0dbcf09 + feb7e7676aeba776ad906396db4cee4eeeb0454d From 9ca1932e929e1c79abe1e7aa43a418b669538194 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 13:57:59 +0000 Subject: [PATCH 09/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.4 (#12311) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21511.1 to 6.0.100-rtm.21512.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21511.1 to 6.0.100-rtm.21512.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21511.1 to 6.0.100-rtm.21512.1 (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 c548c7304..457499f70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 5cbb78707edf860fb9399b0e34cc982046012b2c + 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/templating - 5cbb78707edf860fb9399b0e34cc982046012b2c + 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/templating - 5cbb78707edf860fb9399b0e34cc982046012b2c + 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - d6793b4fb938934a02aec367318591cac0c5b627 + 1bed0233760ae7d83614a4de964497260be3437a - + https://github.com/dotnet/sdk - d6793b4fb938934a02aec367318591cac0c5b627 + 1bed0233760ae7d83614a4de964497260be3437a diff --git a/eng/Versions.props b/eng/Versions.props index 3624fab44..763d87ffb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21511.1 + 6.0.100-rtm.21512.1 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21512.1 - 6.0.100-rtm.21512.1 + 6.0.100-rtm.21512.4 + 6.0.100-rtm.21512.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21511.1 + 6.0.100-rtm.21512.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From bdf5437675cf02d1d8e6f37b3cd936dca02a809b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:17:47 -0500 Subject: [PATCH 10/48] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211012.1 (#12314) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21511.3 -> To Version 6.0.0-alpha.1.21512.1 Co-authored-by: dotnet-maestro[bot] --- 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 44264fb5e..3c50cd9b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/source-build-reference-packages - feb7e7676aeba776ad906396db4cee4eeeb0454d + 74c3fdcef375b23fff8341d1be900f17281b15f4 From 89aee5a1fbb43ca5cbf58a00502d49acd9f3474b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 19:50:08 +0000 Subject: [PATCH 11/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.9 (#12316) [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 3c50cd9b1..7105f0922 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - 1bed0233760ae7d83614a4de964497260be3437a + 1dff07688ea85baffad6627e1a08b33fc6d9358d - + https://github.com/dotnet/sdk - 1bed0233760ae7d83614a4de964497260be3437a + 1dff07688ea85baffad6627e1a08b33fc6d9358d diff --git a/eng/Versions.props b/eng/Versions.props index 763d87ffb..eb1a6b2e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21512.4 - 6.0.100-rtm.21512.4 + 6.0.100-rtm.21512.9 + 6.0.100-rtm.21512.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0f3461780ffb528d307c704d3bf55e197d4d7d4 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 12 Oct 2021 20:18:03 +0000 Subject: [PATCH 12/48] Enable all smoke-tests --- src/SourceBuild/tarball/content/smoke-test.sh | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index ec59fa802..61a6bf106 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -169,8 +169,8 @@ function doCommand() { dotnetCmd=${dotnetDir}/dotnet - # rename '#'' to 'Sharp' to workaround https://github.com/dotnet/aspnetcore/issues/36900 - projectDir="${lang//"#"/"Sharp"}_${proj}" + # rename '#'' to 'Sharp' to workaround https://github.com/dotnet/roslyn/issues/51692 + projectDir="${lang//#/Sharp}_${proj}" mkdir "${projectDir}" cd "${projectDir}" @@ -297,18 +297,18 @@ function runAllTests() { if [ "$excludeNonWebTests" == "false" ]; then doCommand C# console new restore build run multi-rid-publish doCommand C# classlib new restore build multi-rid-publish - # doCommand C# xunit new restore test - # doCommand C# mstest new restore test + doCommand C# xunit new restore test + doCommand C# mstest new restore test doCommand VB console new restore build run multi-rid-publish doCommand VB classlib new restore build multi-rid-publish - # doCommand VB xunit new restore test - # doCommand VB mstest new restore test + doCommand VB xunit new restore test + doCommand VB mstest new restore test - # doCommand F# console new restore build run multi-rid-publish - # doCommand F# classlib new restore build multi-rid-publish - # doCommand F# xunit new restore test - # doCommand F# mstest new restore test + doCommand F# console new restore build run multi-rid-publish + doCommand F# classlib new restore build multi-rid-publish + doCommand F# xunit new restore test + doCommand F# mstest new restore test fi if [ "$excludeWebTests" == "false" ]; then @@ -330,12 +330,12 @@ 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 + 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 - # doCommand F# webapi "$@" new restore build run multi-rid-publish + doCommand F# web "$@" new restore build run multi-rid-publish + doCommand F# mvc "$@" new restore build run multi-rid-publish + doCommand F# webapi "$@" new restore build run multi-rid-publish } function runXmlDocTests() { From 3d2c179c2cfd8678da8d5471dcf54a1640a3ed5f Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 12 Oct 2021 20:45:37 +0000 Subject: [PATCH 13/48] Update prebuilts and previous source-build --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/eng/Versions.props | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 763d87ffb..d9409a3e8 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.19 - 0.1.0-6.0.100-25 + 0.1.0-6.0.100-bootstrap.22 + 0.1.0-6.0.100-29 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index e5a4dd8e0..f96666e97 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -21,8 +21,7 @@ - 0.1.0-6.0.100-bootstrap.19 0.1.0-6.0.100- - 25 + 29 From d94e3034c879f25b387cb65c66cfe1435903c719 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 22:00:38 +0000 Subject: [PATCH 14/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.13 (#12320) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.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 7105f0922..1023e3356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 309f9f77cf759bc8d68103bc0efc76b180810a45 - + https://github.com/dotnet/runtime - d262c21063bbb5b385a776e4ce24f7132eb918dc + dcc4be529f69e670e8e709fdf1d9c00c52c5a388 - + https://github.com/dotnet/runtime - d262c21063bbb5b385a776e4ce24f7132eb918dc + dcc4be529f69e670e8e709fdf1d9c00c52c5a388 - + https://github.com/dotnet/runtime - d262c21063bbb5b385a776e4ce24f7132eb918dc + dcc4be529f69e670e8e709fdf1d9c00c52c5a388 - + https://github.com/dotnet/runtime - d262c21063bbb5b385a776e4ce24f7132eb918dc + dcc4be529f69e670e8e709fdf1d9c00c52c5a388 - + https://github.com/dotnet/runtime - d262c21063bbb5b385a776e4ce24f7132eb918dc + dcc4be529f69e670e8e709fdf1d9c00c52c5a388 - + https://github.com/dotnet/runtime - d262c21063bbb5b385a776e4ce24f7132eb918dc + dcc4be529f69e670e8e709fdf1d9c00c52c5a388 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d262c21063bbb5b385a776e4ce24f7132eb918dc + dcc4be529f69e670e8e709fdf1d9c00c52c5a388 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - 1dff07688ea85baffad6627e1a08b33fc6d9358d + 9179b30e28ace2b13f4c63c6794f72a6a185a74c - + https://github.com/dotnet/sdk - 1dff07688ea85baffad6627e1a08b33fc6d9358d + 9179b30e28ace2b13f4c63c6794f72a6a185a74c diff --git a/eng/Versions.props b/eng/Versions.props index eb1a6b2e0..8362a4aca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21512.9 - 6.0.100-rtm.21512.9 + 6.0.100-rtm.21512.13 + 6.0.100-rtm.21512.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21511.12 + 6.0.0-rtm.21512.4 - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 + 6.0.0-rtm.21512.4 + 6.0.0-rtm.21512.4 + 6.0.0-rtm.21512.4 + 6.0.0-rtm.21512.4 + 6.0.0-rtm.21512.4 + 6.0.0-rtm.21512.4 2.1.0 From 377dd10954250d5de7219723a03cc80b7a336325 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 00:37:29 +0000 Subject: [PATCH 15/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.18 (#12328) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21511.21 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21511.21 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21511.21 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.21 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21511.21 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21511.21 to 6.0.0-rtm.21512.5 (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 1023e3356..35647bd0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime dcc4be529f69e670e8e709fdf1d9c00c52c5a388 - + https://github.com/dotnet/aspnetcore - 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a + 35c305b6a6d3738475771dc8a6321e26be4b8935 - + https://github.com/dotnet/aspnetcore - 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a + 35c305b6a6d3738475771dc8a6321e26be4b8935 - + https://github.com/dotnet/aspnetcore - 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a + 35c305b6a6d3738475771dc8a6321e26be4b8935 - + https://github.com/dotnet/aspnetcore - 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a + 35c305b6a6d3738475771dc8a6321e26be4b8935 - + https://github.com/dotnet/aspnetcore - 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a + 35c305b6a6d3738475771dc8a6321e26be4b8935 - + https://github.com/dotnet/aspnetcore - 9cb4a3fbfef02615b0cd5ecb24674dc96f45c25a + 35c305b6a6d3738475771dc8a6321e26be4b8935 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - 9179b30e28ace2b13f4c63c6794f72a6a185a74c + 49e2dc215788cfd571ac73dcae982767029eef9e - + https://github.com/dotnet/sdk - 9179b30e28ace2b13f4c63c6794f72a6a185a74c + 49e2dc215788cfd571ac73dcae982767029eef9e diff --git a/eng/Versions.props b/eng/Versions.props index 8362a4aca..642b973c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21511.21 - 6.0.0-rtm.21511.21 - 6.0.0-rtm.21511.21 - 6.0.0-rtm.21511.21 - 6.0.0-rtm.21511.21 - 6.0.0-rtm.21511.21 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 0.2.0 - 6.0.100-rtm.21512.13 - 6.0.100-rtm.21512.13 + 6.0.100-rtm.21512.18 + 6.0.100-rtm.21512.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d5a0fd6fb98cc152cd637104cdafd3737eec9a2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 01:08:06 +0000 Subject: [PATCH 16/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.21 (#12333) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21511.11 to 6.0.0-rtm.21512.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21511.15 to 6.0.0-rtm.21512.2 (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 35647bd0d..2179611cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 309f9f77cf759bc8d68103bc0efc76b180810a45 + 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac - + https://github.com/dotnet/windowsdesktop - 309f9f77cf759bc8d68103bc0efc76b180810a45 + 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac - + https://github.com/dotnet/windowsdesktop - 309f9f77cf759bc8d68103bc0efc76b180810a45 + 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac - + https://github.com/dotnet/windowsdesktop - 309f9f77cf759bc8d68103bc0efc76b180810a45 + 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - 49e2dc215788cfd571ac73dcae982767029eef9e + a3f071bb8b6f8ffa57d058a9fc3f5252de208710 - + https://github.com/dotnet/sdk - 49e2dc215788cfd571ac73dcae982767029eef9e + a3f071bb8b6f8ffa57d058a9fc3f5252de208710 - + https://github.com/dotnet/winforms - 5388194e562bf0d5c6f3eaca2af88b017f843e1c + 29ece171d547bb736dec3bcd5882af3c5d03b7c4 - + https://github.com/dotnet/wpf - 81853027e2841e3d3c6e30ef4b7071e5f487d914 + 61ef1d2ac226b6449588b95996c2280a2de458b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 642b973c1..085cd381a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21511.11 + 6.0.0-rtm.21512.3 - 6.0.0-rtm.21511.15 + 6.0.0-rtm.21512.2 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21512.18 - 6.0.100-rtm.21512.18 + 6.0.100-rtm.21512.21 + 6.0.100-rtm.21512.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 - 6.0.0-rtm.21511.12 + 6.0.0-rtm.21512.3 + 6.0.0-rtm.21512.3 + 6.0.0-rtm.21512.3 + 6.0.0-rtm.21512.3 From 5b9bcab895c40ea06ea7adec940e6fe2c6c61dac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 01:40:35 +0000 Subject: [PATCH 17/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.23 (#12334) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (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 2179611cb..66f21331d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac - + https://github.com/dotnet/runtime - dcc4be529f69e670e8e709fdf1d9c00c52c5a388 + 12fb2c3a2e11596268e58f087728eed53acfced3 - + https://github.com/dotnet/runtime - dcc4be529f69e670e8e709fdf1d9c00c52c5a388 + 12fb2c3a2e11596268e58f087728eed53acfced3 - + https://github.com/dotnet/runtime - dcc4be529f69e670e8e709fdf1d9c00c52c5a388 + 12fb2c3a2e11596268e58f087728eed53acfced3 - + https://github.com/dotnet/runtime - dcc4be529f69e670e8e709fdf1d9c00c52c5a388 + 12fb2c3a2e11596268e58f087728eed53acfced3 - + https://github.com/dotnet/runtime - dcc4be529f69e670e8e709fdf1d9c00c52c5a388 + 12fb2c3a2e11596268e58f087728eed53acfced3 - + https://github.com/dotnet/runtime - dcc4be529f69e670e8e709fdf1d9c00c52c5a388 + 12fb2c3a2e11596268e58f087728eed53acfced3 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - dcc4be529f69e670e8e709fdf1d9c00c52c5a388 + 12fb2c3a2e11596268e58f087728eed53acfced3 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - a3f071bb8b6f8ffa57d058a9fc3f5252de208710 + 8f36e8b594ed66d0e3591a296470ff962f3a4b3e - + https://github.com/dotnet/sdk - a3f071bb8b6f8ffa57d058a9fc3f5252de208710 + 8f36e8b594ed66d0e3591a296470ff962f3a4b3e diff --git a/eng/Versions.props b/eng/Versions.props index 085cd381a..14021b32a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21512.21 - 6.0.100-rtm.21512.21 + 6.0.100-rtm.21512.23 + 6.0.100-rtm.21512.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21512.4 + 6.0.0-rtm.21512.8 - 6.0.0-rtm.21512.4 - 6.0.0-rtm.21512.4 - 6.0.0-rtm.21512.4 - 6.0.0-rtm.21512.4 - 6.0.0-rtm.21512.4 - 6.0.0-rtm.21512.4 + 6.0.0-rtm.21512.8 + 6.0.0-rtm.21512.8 + 6.0.0-rtm.21512.8 + 6.0.0-rtm.21512.8 + 6.0.0-rtm.21512.8 + 6.0.0-rtm.21512.8 2.1.0 From a043afb79db9d9dc51ca14f31b770fa90ff59805 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 03:04:43 +0000 Subject: [PATCH 18/48] Update dependencies from https://github.com/dotnet/sdk build 20211012.24 (#12335) [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 66f21331d..a1af013fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - 8f36e8b594ed66d0e3591a296470ff962f3a4b3e + f300d24952811e0dd186aa639e6c00c99af98b9b - + https://github.com/dotnet/sdk - 8f36e8b594ed66d0e3591a296470ff962f3a4b3e + f300d24952811e0dd186aa639e6c00c99af98b9b diff --git a/eng/Versions.props b/eng/Versions.props index 14021b32a..c512200be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21512.23 - 6.0.100-rtm.21512.23 + 6.0.100-rtm.21512.24 + 6.0.100-rtm.21512.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e8d8dc535b93a1d5f300d2484b262bc66400658 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 15:00:03 +0000 Subject: [PATCH 19/48] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211013.1 (#12338) [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 a1af013fd..de45875bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/source-build-reference-packages - 74c3fdcef375b23fff8341d1be900f17281b15f4 + 58779eb4cffe79f0ed74eca5801550bfd1bd96e6 From b10c4f72cda12d9f4bbefa24faeb77900dc0a8f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 16:13:40 +0000 Subject: [PATCH 20/48] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12336) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21512.2 to 6.0.0-rtm.21512.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Resolve source-build patch conflicts --- eng/Version.Details.xml | 32 +++++++------- eng/Versions.props | 16 +++---- ...03-Upgrade-Newtonsoft.Json-to-13.0.1.patch | 25 ----------- ...-and-test-project-when-building-from.patch | 42 ------------------- 4 files changed, 24 insertions(+), 91 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn-analyzers/0003-Upgrade-Newtonsoft.Json-to-13.0.1.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn-analyzers/0004-Exclude-perfdiff-and-test-project-when-building-from.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de45875bc..0b81c9ff9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac + e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c - + https://github.com/dotnet/windowsdesktop - 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac + e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c - + https://github.com/dotnet/windowsdesktop - 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac + e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c - + https://github.com/dotnet/windowsdesktop - 04cb6e8876ccfef2e72ddca614e681fc7a0b8bac + e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 4d81cf0cec89a714982cef6ba223fffeb710e82c - + https://github.com/dotnet/sdk - f300d24952811e0dd186aa639e6c00c99af98b9b + bde99ecd452f363ace7226475ffde4618471e766 - + https://github.com/dotnet/sdk - f300d24952811e0dd186aa639e6c00c99af98b9b + bde99ecd452f363ace7226475ffde4618471e766 - + https://github.com/dotnet/winforms - 29ece171d547bb736dec3bcd5882af3c5d03b7c4 + 30725d9b3d8c578a113b95cff296c08a0e9458b4 - + https://github.com/dotnet/wpf - 61ef1d2ac226b6449588b95996c2280a2de458b1 + 94c6ac00121c23d73a199255bbb565b492151ad2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index edce6268b..ad227a52e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21512.3 + 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.2 + 6.0.0-rtm.21512.4 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21512.24 - 6.0.100-rtm.21512.24 + 6.0.100-rtm.21512.28 + 6.0.100-rtm.21512.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21512.3 - 6.0.0-rtm.21512.3 - 6.0.0-rtm.21512.3 - 6.0.0-rtm.21512.3 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 + 6.0.0-rtm.21512.5 diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0003-Upgrade-Newtonsoft.Json-to-13.0.1.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0003-Upgrade-Newtonsoft.Json-to-13.0.1.patch deleted file mode 100644 index 0d2ee7a96..000000000 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0003-Upgrade-Newtonsoft.Json-to-13.0.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fa733a5a26776c793477b4404bc670e5a8e94260 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 24 Sep 2021 17:58:20 +0000 -Subject: [PATCH 1/2] Upgrade Newtonsoft.Json to 13.0.1 - ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index c418a1205..cb27118fb 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -67,7 +67,7 @@ - 6.0.0-preview.4.21253.7 - 10.1.0 - 16.1.8 -- 12.0.1 -+ 13.0.1 - 0.2.1 - 1.1.2 - 2.0.0-beta1.20074.1 --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0004-Exclude-perfdiff-and-test-project-when-building-from.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0004-Exclude-perfdiff-and-test-project-when-building-from.patch deleted file mode 100644 index c23e3aaba..000000000 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0004-Exclude-perfdiff-and-test-project-when-building-from.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0b40797eab5933ae0d9dd48e4b8b0ec03d712ca5 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 24 Sep 2021 17:58:56 +0000 -Subject: [PATCH 2/2] Exclude perfdiff and test project when building from - source - ---- - src/Tools/PerfDiff/PerfDiff.csproj | 1 + - .../Tests/RulesetToEditorconfigConverter.UnitTests.csproj | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/Tools/PerfDiff/PerfDiff.csproj b/src/Tools/PerfDiff/PerfDiff.csproj -index 7a829e12e..44279f1f9 100644 ---- a/src/Tools/PerfDiff/PerfDiff.csproj -+++ b/src/Tools/PerfDiff/PerfDiff.csproj -@@ -4,6 +4,7 @@ - Exe - net6.0 - true -+ true - - - -diff --git a/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj b/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj -index 027ca2b09..46fff2f30 100644 ---- a/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj -+++ b/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj -@@ -4,8 +4,9 @@ - netcoreapp3.1;net472 - true - false -+ true - - - - -- -\ No newline at end of file -+ --- -2.31.1 - From e15beac0f651be2943c83c521dd274e653aed888 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 13 Oct 2021 11:15:20 -0500 Subject: [PATCH 21/48] Move Omnisharp fix to the correct place. (#12297) * Move Omnisharp fix to the correct place. We had some crossed PRs and this got added while the other patches were being moved. This moves it to the correct place. * Update patch to apply to new hash. * Another project dependency. --- ...-Fix-Omnisharp-add-needed-extra-TFMs.patch | 61 ---------- ...-Fix-Omnisharp-add-needed-extra-TFMs.patch | 106 ++++++++++++++++++ 2 files changed, 106 insertions(+), 61 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch diff --git a/src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch b/src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch deleted file mode 100644 index 192ed3519..000000000 --- a/src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 93de82c03ff71f897599db2824b959d020b877bd Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 30 Sep 2021 16:08:28 -0500 -Subject: [PATCH 1/2] Fix Omnisharp: Add needed extra TFMs. - -Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360. - ---- - src/libraries/Directory.Build.props | 2 +- - .../ref/System.Resources.Extensions.csproj | 4 ++-- - .../src/System.Resources.Extensions.csproj | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props -index 4d39fad397e..649c669517e 100644 ---- a/src/libraries/Directory.Build.props -+++ b/src/libraries/Directory.Build.props -@@ -27,7 +27,7 @@ - - - -- net461;net462;net47;net471;net472 -+ net46;net461;net462;net47;net471;net472 - - - -diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj -index 99037ae459c..848be41690c 100644 ---- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj -+++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent);netstandard2.0;net461 -+ $(NetCoreAppCurrent);netstandard2.0;net46;net461 - enable - - -@@ -11,4 +11,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj -index adacc9b977e..38d4c145352 100644 ---- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj -+++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent);netstandard2.0;net461 -+ $(NetCoreAppCurrent);netstandard2.0;net46;net461 - $(DefineConstants);RESOURCES_EXTENSIONS - enable - --- -2.17.1 - diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch new file mode 100644 index 000000000..9072fbd50 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch @@ -0,0 +1,106 @@ +From 827f1e036db2082b56b003f870f5ff8dabc9b1ed Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Tue, 12 Oct 2021 14:04:27 -0500 +Subject: [PATCH] Fix Omnisharp: Add needed extra TFMs. + +Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360. + +--- + src/libraries/Directory.Build.props | 2 +- + .../ref/System.Resources.Extensions.csproj | 4 ++-- + .../src/System.Resources.Extensions.csproj | 2 +- + .../ref/System.Runtime.CompilerServices.Unsafe.csproj | 4 ++-- + .../src/System.Runtime.CompilerServices.Unsafe.ilproj | 6 +++++- + 5 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props +index a03b334346a..30418e38a2a 100644 +--- a/src/libraries/Directory.Build.props ++++ b/src/libraries/Directory.Build.props +@@ -20,7 +20,7 @@ + false + $(RepositoryEngineeringDir)LicenseHeader.txt + +- net461;net462;net47;net471;net472 ++ net46;net461;net462;net47;net471;net472 + + + +diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +index 99037ae459c..848be41690c 100644 +--- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj ++++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +@@ -1,6 +1,6 @@ + + +- $(NetCoreAppCurrent);netstandard2.0;net461 ++ $(NetCoreAppCurrent);netstandard2.0;net46;net461 + enable + + +@@ -11,4 +11,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +index a0a79e45adf..29c9b123ce5 100644 +--- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj ++++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +@@ -1,7 +1,7 @@ + + + true +- $(NetCoreAppCurrent);netstandard2.0;net461 ++ $(NetCoreAppCurrent);netstandard2.0;net46;net461 + $(DefineConstants);RESOURCES_EXTENSIONS + enable + true +diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +index 766ea9a8ae7..5324c85404b 100644 +--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj ++++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +@@ -3,7 +3,7 @@ + true + false + enable +- $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 ++ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net46;net461 + + + +@@ -14,4 +14,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +index a9e3de0c454..75467734292 100644 +--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj ++++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +@@ -1,6 +1,6 @@ +  + +- $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 ++ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net46;net461 + + IMPL + OPT +@@ -20,6 +20,10 @@ System.Runtime.CompilerServices.Unsafe + + netstandard + ++ ++ mscorlib ++ #define $(TargetFramework) ++ + + mscorlib + #define $(TargetFramework) +-- +2.18.0 + From fa1573136d0bf1c89b48b9673f51af23457f1888 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 13 Oct 2021 11:15:45 -0500 Subject: [PATCH 22/48] Add runtime patches to eliminate pre-builts (#12318) * Add runtime patches to eliminate pre-builts --- ...1-Remove-RefOnly-dependency-versions.patch | 266 ++++++++++++++++++ ...-of-pre-built-packages-during-source.patch | 191 +++++++++++++ 2 files changed, 457 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch new file mode 100644 index 000000000..d11be050a --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch @@ -0,0 +1,266 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric Erhardt +Date: Fri, 8 Oct 2021 19:55:43 -0500 +Subject: [PATCH 1/2] Remove RefOnly dependency versions + +This allows for source-build to replace these versions with source-built versions. + +Note: Removing unnecessary MSBuild PackageReferences rather than updating the version of these unnecessary references. + +See https://github.com/dotnet/source-build/issues/2421 for details. +Backported to runtime with https://github.com/dotnet/runtime/pull/60315. +--- + eng/Versions.props | 14 ++++---------- + ...crosoft.DotNet.CoreSetup.Packaging.Tests.csproj | 2 +- + .../src/Microsoft.NETCore.Platforms.csproj | 5 ++--- + .../AndroidAppBuilder/AndroidAppBuilder.csproj | 5 +---- + src/tasks/AotCompilerTask/MonoAOTCompiler.csproj | 6 ++---- + src/tasks/AppleAppBuilder/AppleAppBuilder.csproj | 5 +---- + src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj | 7 ++----- + src/tasks/ILStripTask/ILStrip.csproj | 5 +---- + .../JsonToItemsTaskFactory.csproj | 5 +---- + .../RuntimeConfigParser/RuntimeConfigParser.csproj | 6 ++---- + src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 5 +---- + src/tasks/WasmBuildTasks/WasmBuildTasks.csproj | 5 +---- + .../WorkloadBuildTasks/WorkloadBuildTasks.csproj | 5 +---- + src/tasks/installer.tasks/installer.tasks.csproj | 6 +++--- + 14 files changed, 23 insertions(+), 58 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 94a3045e604..d2c0d141056 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -146,16 +146,10 @@ + 1.0.0-beta-build0015 + 1.0.4-preview6.19326.1 + 0.2.61701 +- +- 16.10.0 +- $(RefOnlyMicrosoftBuildVersion) +- $(RefOnlyMicrosoftBuildVersion) +- $(RefOnlyMicrosoftBuildVersion) +- 5.8.0 +- 5.8.0 ++ 16.10.0 ++ $(MicrosoftBuildVersion) ++ 5.8.0 ++ 5.8.0 + + 1.0.1-prerelease-00006 + 16.9.0-preview-20201201-01 +diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj +index 8dcef20c22d..73a3fda2b55 100644 +--- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj ++++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj +@@ -7,7 +7,7 @@ + + + +- ++ + + + +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +index 3872248843d..4968a69f531 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +@@ -44,9 +44,8 @@ + + + +- +- +- ++ ++ + + + +diff --git a/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj b/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj +index de6a04a95f0..139d5672ee0 100644 +--- a/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj ++++ b/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj +@@ -11,10 +11,7 @@ + + + +- +- +- +- ++ + + + +diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj +index 840115ca71b..caf34787a2d 100644 +--- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj ++++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj +@@ -11,10 +11,8 @@ + $(NoWarn),CS8604,CS8602 + + +- +- +- +- ++ ++ + + + +diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj +index 7ceb4480e1c..e28dafef5d8 100644 +--- a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj ++++ b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj +@@ -11,10 +11,7 @@ + + + +- +- +- +- ++ + + + +diff --git a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj +index fcd5b20ab2c..ddddfadb593 100644 +--- a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj ++++ b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj +@@ -9,11 +9,8 @@ + $(NoWarn),CS8604,CS8602 + + +- +- +- +- +- ++ ++ + + + +diff --git a/src/tasks/ILStripTask/ILStrip.csproj b/src/tasks/ILStripTask/ILStrip.csproj +index bb9c41f692e..91b63a8c0a6 100644 +--- a/src/tasks/ILStripTask/ILStrip.csproj ++++ b/src/tasks/ILStripTask/ILStrip.csproj +@@ -8,10 +8,7 @@ + false + + +- +- +- +- ++ + + + +diff --git a/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj b/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj +index 17799fbf657..579682fd84f 100644 +--- a/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj ++++ b/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj +@@ -9,10 +9,7 @@ + + + +- +- +- +- ++ + + + +diff --git a/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj b/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj +index c07e367def6..074f89c415a 100644 +--- a/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj ++++ b/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj +@@ -10,10 +10,8 @@ + $(NoWarn),CS8604,CS8602 + + +- +- +- +- ++ ++ + + + +diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +index 22a530b7de3..358de5541e3 100644 +--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj ++++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +@@ -19,10 +19,7 @@ + + + +- +- +- +- ++ + + + +diff --git a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj +index 0f8b6c93993..fd88116ca0a 100644 +--- a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj ++++ b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj +@@ -6,10 +6,7 @@ + $(NoWarn),CA1050 + + +- +- +- +- ++ + + + + + +- +- +- +- ++ + + + + +- ++ + + + +- +- ++ ++ + + + diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch b/src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch new file mode 100644 index 000000000..4bcdd21a2 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch @@ -0,0 +1,191 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric Erhardt +Date: Tue, 12 Oct 2021 19:40:56 +0000 +Subject: [PATCH 2/2] Eliminate usages of pre-built packages during + source-build + +* Don't build MSBuild tasks for netfx during source-build +* Don't build Microsoft.Windows.Compatibility during source-build +* Don't build test projects during source-build +* Don't restore Microsoft.DiaSymReader.Native +* Don't build source generators that target older Roslyn versions +* Don't build ILStripTask since it uses a Mono.Cecil "sources" NuGet package that isn't part of source-build + +See https://github.com/dotnet/source-build/issues/2421 for details. +Backported to runtime with https://github.com/dotnet/runtime/pull/60315. +--- + Directory.Build.props | 4 ++++ + eng/Subsets.props | 2 +- + .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 2 +- + .../src/Microsoft.Extensions.Logging.Abstractions.csproj | 3 ++- + .../src/Microsoft.NETCore.Platforms.csproj | 4 ++-- + src/libraries/System.Text.Json/src/System.Text.Json.csproj | 3 ++- + src/libraries/src.proj | 5 +++++ + src/tasks/Directory.Build.props | 3 +++ + src/tasks/installer.tasks/installer.tasks.csproj | 6 +++--- + src/tasks/tasks.proj | 5 +++++ + 10 files changed, 28 insertions(+), 9 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 58c7f876aea..c58a9d1a047 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -52,6 +52,10 @@ + $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) + Microsoft.NETCore.App + .NET $(NetCoreAppCurrentVersion) ++ ++ net472 ++ ++ + + + +diff --git a/eng/Subsets.props b/eng/Subsets.props +index a7c5fb0e96e..b2292ac98e6 100644 +--- a/eng/Subsets.props ++++ b/eng/Subsets.props +@@ -72,7 +72,7 @@ + host.native + + packs.product +- $(DefaultPacksSubsets)+packs.tests ++ $(DefaultPacksSubsets)+packs.tests + $(DefaultPacksSubsets)+packs.installers + + +diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +index 15d09343b05..09069935a00 100644 +--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props ++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +@@ -238,7 +238,7 @@ + + + +- ++ + + + + + +- ++ + + + +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +index 4968a69f531..b941586e3d6 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +@@ -1,6 +1,6 @@ + + +- $(NetCoreAppToolCurrent);net472 ++ $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) + + false + $(MSBuildProjectName) +@@ -21,7 +21,7 @@ + $(AdditionalRuntimeIdentifiers);$(OutputRID) + + +- ++ + + + +diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj +index 4b7f0bc75ce..bba18ce24ed 100644 +--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj ++++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj +@@ -351,7 +351,8 @@ System.Text.Json.Utf8JsonReader + + + +- ++ + + + +diff --git a/src/libraries/src.proj b/src/libraries/src.proj +index 8b38ce5b449..4e0fea066f7 100644 +--- a/src/libraries/src.proj ++++ b/src/libraries/src.proj +@@ -14,6 +14,11 @@ + Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" + Condition="'$(BuildAllConfigurations)' != 'true'" /> + ++ ++ <_allSrc Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj; ++ Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" ++ Condition="'$(DotNetBuildFromSource)' == 'true'" /> ++ + ++ + net6.0 + + +diff --git a/src/tasks/installer.tasks/installer.tasks.csproj b/src/tasks/installer.tasks/installer.tasks.csproj +index 5cff57cdefb..98c370fdfed 100644 +--- a/src/tasks/installer.tasks/installer.tasks.csproj ++++ b/src/tasks/installer.tasks/installer.tasks.csproj +@@ -1,6 +1,6 @@ + + +- $(TargetFrameworkForNETCoreTasks);net461 ++ $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) + false + false + +@@ -10,12 +10,12 @@ + + + +- ++ + + + + +- ++ + + + +diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj +index 9c62f8b76b9..03a049e1bf4 100644 +--- a/src/tasks/tasks.proj ++++ b/src/tasks/tasks.proj +@@ -1,6 +1,11 @@ + + + ++ ++ ++ ++ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT DOTNETHOME_X86 AND DOTNETHOME_X86_SEARCH - - - NOT DOTNETHOME_X64 AND DOTNETHOME_X64_SEARCH AND %PROCESSOR_ARCHITECTURE="AMD64" - - - NOT DOTNETHOME_X64 AND DOTNETHOME_X64_ALT_SEARCH AND NOT %PROCESSOR_ARCHITECTURE="AMD64" - - - NOT DOTNETHOME_ARM64 AND DOTNETHOME_ARM64_SEARCH - - From 2b2d7709dcd07ba4e4a1cf9eeafed557fdf5f60e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 16:51:11 +0000 Subject: [PATCH 24/48] Update dependencies from https://github.com/dotnet/sdk build 20211013.5 (#12340) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21512.1 to 6.0.100-rtm.21513.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21512.1 to 6.0.100-rtm.21513.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21512.1 to 6.0.100-rtm.21513.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 0b81c9ff9..e4265e4d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 4d81cf0cec89a714982cef6ba223fffeb710e82c + 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/templating - 4d81cf0cec89a714982cef6ba223fffeb710e82c + 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/templating - 4d81cf0cec89a714982cef6ba223fffeb710e82c + 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - bde99ecd452f363ace7226475ffde4618471e766 + 7e728c000755cfce49ba4e325c528f884a72b208 - + https://github.com/dotnet/sdk - bde99ecd452f363ace7226475ffde4618471e766 + 7e728c000755cfce49ba4e325c528f884a72b208 diff --git a/eng/Versions.props b/eng/Versions.props index ad227a52e..fc86393fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21512.1 + 6.0.100-rtm.21513.2 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21512.28 - 6.0.100-rtm.21512.28 + 6.0.100-rtm.21513.5 + 6.0.100-rtm.21513.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21512.1 + 6.0.100-rtm.21513.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 032f3aab69e060bea019561f7253be2d79d62ca0 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 13 Oct 2021 12:46:46 -0500 Subject: [PATCH 25/48] [release/6.0.1xx] Add short source-build dev README (#12292) * Add short source-build dev README * Describe patch creation process --- src/SourceBuild/README.md | 77 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 src/SourceBuild/README.md diff --git a/src/SourceBuild/README.md b/src/SourceBuild/README.md new file mode 100644 index 000000000..cb90757a6 --- /dev/null +++ b/src/SourceBuild/README.md @@ -0,0 +1,77 @@ +# Source-Build + +This directory contains files necessary to generate a tarball that can be used +to build .NET from source. + +For more information, see +[dotnet/source-build](https://github.com/dotnet/source-build). + +## 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: + +1. Check out this repository and open a command line in the directory. +1. `./build.sh /p:ArcadeBuildTarball=true /p:TarballDir=/repos/tarball1 /p:PreserveTarballGitFolders=true` + * The `TarballDir` can be anywhere you want outside of the repository. +1. `cd /repos/tarball1` +1. `./prep.sh` +1. `./build.sh --online` +1. Examine results and make changes to the source code in the tarball. The + `.git` folders are preserved, so you can commit changes and save them as + patches. +1. When a repo builds, source-build places a `.complete` file to prevent it from + rebuilding again. This allows you to incrementally retry a build if there's a + transient failure. But it also prevents you from rebuilding a repo after + you've modified it. + * To force a repo to rebuild with your new changes, run: + `rm -f ./artifacts/obj/semaphores//Build.complete` +1. Run `./build.sh --online` again, and continue to repeat as necessary. + +When developing a prebuilt removal change, examine the results of the build, +specifically: + +* Prebuilt report. For example: + `./src/runtime.733a3089ec6945422caf06035c18ff700c9d51be/artifacts/source-build/self/prebuilt-report` + +## Creating a patch file + +To create a repo patch file, first commit your changes to the repo as normal, +then run this command inside the repo to generate a patch file inside the repo: + +```sh +git format-patch --zero-commit --no-signature -1 +``` + +Then, move the patch file into this repo, at +`src/SourceBuild/tarball/patches/`. + +> If you define `PATCH_DIR` to point at the `patches` directory, you can use +> `-o` to place the patch file directly in the right directory: +> +> ```sh +> git format-patch --zero-commit --no-signature -1 -o "$PATCH_DIR/" +> ``` + +After generating the patch file, the numeric prefix on the filename may need to +be changed. By convention, new patches should be one number above the largest +number that already exists in the patch file directory. If there's a gap in the +number sequence, do not fix it (generally speaking), to avoid unnecessary diffs +and potential merge conflicts. + +To apply a patch, or multiple patches, use `git am` while inside the target +repo. For example, to apply *all* `sdk` patches onto a fresh clone of the `sdk` +repository that has already been checked out to the correct commit, use: + +```sh +git am "$PATCH_DIR/sdk/*" +``` + +This creates a Git commit with the patch contents, so you can easily amend a +patch or create a new commit on top that you can be sure will apply cleanly. + +There is a method to create a series of patches based on a range of Git commits, +but this is not usually useful for 6.0 main development. It is used in servicing +to "freshen up" the sequence of patches (resolve conflicts) all at once. + +Note: Tarballs have already applied patches to the source code. From 9a88142b6cfec330de86f2ac55432d0186186809 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 18:52:23 +0000 Subject: [PATCH 26/48] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211013.2 (#12346) [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 e4265e4d7..859b861ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/source-build-reference-packages - 58779eb4cffe79f0ed74eca5801550bfd1bd96e6 + 9cda2866bb5365a2d866068a0c0aecdc133ca325 From 7b0f3bb7b52696a5b4cb67ee848a2670708b851d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 19:10:21 +0000 Subject: [PATCH 27/48] Update dependencies from https://github.com/dotnet/sdk build 20211013.13 (#12347) [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 859b861ee..16cb35631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - 7e728c000755cfce49ba4e325c528f884a72b208 + 81ff5d667e2e52af79336f512505c1dc0de411da - + https://github.com/dotnet/sdk - 7e728c000755cfce49ba4e325c528f884a72b208 + 81ff5d667e2e52af79336f512505c1dc0de411da diff --git a/eng/Versions.props b/eng/Versions.props index fc86393fc..0eee713e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21513.5 - 6.0.100-rtm.21513.5 + 6.0.100-rtm.21513.13 + 6.0.100-rtm.21513.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c50163124ed8a26bdf84d67b2a93a467fa1255d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:11:18 +0000 Subject: [PATCH 28/48] Update dependencies from https://github.com/dotnet/sdk build 20211013.16 (#12348) [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 16cb35631..ca387c06c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - 81ff5d667e2e52af79336f512505c1dc0de411da + 4cc787ab8e6fb4182d3c52797ee534347adc9146 - + https://github.com/dotnet/sdk - 81ff5d667e2e52af79336f512505c1dc0de411da + 4cc787ab8e6fb4182d3c52797ee534347adc9146 diff --git a/eng/Versions.props b/eng/Versions.props index 0eee713e3..9aebd9b65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21513.13 - 6.0.100-rtm.21513.13 + 6.0.100-rtm.21513.16 + 6.0.100-rtm.21513.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db2d5a671580b26f06d9c12a7760ea494c062097 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 22:19:25 +0000 Subject: [PATCH 29/48] Update dependencies from https://github.com/dotnet/sdk build 20211013.22 (#12353) [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 ca387c06c..e0b3566e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - 4cc787ab8e6fb4182d3c52797ee534347adc9146 + 1eefb219f0e0977eb686e255ebd5c38a08a8109f - + https://github.com/dotnet/sdk - 4cc787ab8e6fb4182d3c52797ee534347adc9146 + 1eefb219f0e0977eb686e255ebd5c38a08a8109f diff --git a/eng/Versions.props b/eng/Versions.props index 9aebd9b65..fe7a76450 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21513.16 - 6.0.100-rtm.21513.16 + 6.0.100-rtm.21513.22 + 6.0.100-rtm.21513.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 792f9a0244a2c73d8340d5fb92d0c2f95b7c9d0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 22:53:47 +0000 Subject: [PATCH 30/48] Update dependencies from https://github.com/dotnet/sdk build 20211013.27 (#12354) [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 e0b3566e5..b6f08d4a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - 1eefb219f0e0977eb686e255ebd5c38a08a8109f + bdd7a1e9d18a40e2d34c2e7e512eccd27a235537 - + https://github.com/dotnet/sdk - 1eefb219f0e0977eb686e255ebd5c38a08a8109f + bdd7a1e9d18a40e2d34c2e7e512eccd27a235537 diff --git a/eng/Versions.props b/eng/Versions.props index fe7a76450..61fadf272 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21513.22 - 6.0.100-rtm.21513.22 + 6.0.100-rtm.21513.27 + 6.0.100-rtm.21513.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b7247c58eff06eb6f47565d8fc2b7c023691d6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 02:41:17 +0000 Subject: [PATCH 31/48] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12355) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rtm.21505.3 to 6.0.0-rtm.21512.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) - Resolve source-build patch conflicts --- eng/Version.Details.xml | 64 ++--- eng/Versions.props | 32 +-- ...1-Remove-RefOnly-dependency-versions.patch | 266 ------------------ ...-of-pre-built-packages-during-source.patch | 191 ------------- 4 files changed, 48 insertions(+), 505 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6f08d4a4..4c9decccf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c - + https://github.com/dotnet/runtime - 12fb2c3a2e11596268e58f087728eed53acfced3 + 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 - + https://github.com/dotnet/runtime - 12fb2c3a2e11596268e58f087728eed53acfced3 + 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 - + https://github.com/dotnet/runtime - 12fb2c3a2e11596268e58f087728eed53acfced3 + 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 - + https://github.com/dotnet/runtime - 12fb2c3a2e11596268e58f087728eed53acfced3 + 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 - + https://github.com/dotnet/runtime - 12fb2c3a2e11596268e58f087728eed53acfced3 + 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 - + https://github.com/dotnet/runtime - 12fb2c3a2e11596268e58f087728eed53acfced3 + 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 12fb2c3a2e11596268e58f087728eed53acfced3 + 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 - + https://github.com/dotnet/aspnetcore - 35c305b6a6d3738475771dc8a6321e26be4b8935 + 67cbd6684d745da649235726de976439561d6c1f - + https://github.com/dotnet/aspnetcore - 35c305b6a6d3738475771dc8a6321e26be4b8935 + 67cbd6684d745da649235726de976439561d6c1f - + https://github.com/dotnet/aspnetcore - 35c305b6a6d3738475771dc8a6321e26be4b8935 + 67cbd6684d745da649235726de976439561d6c1f - + https://github.com/dotnet/aspnetcore - 35c305b6a6d3738475771dc8a6321e26be4b8935 + 67cbd6684d745da649235726de976439561d6c1f - + https://github.com/dotnet/aspnetcore - 35c305b6a6d3738475771dc8a6321e26be4b8935 + 67cbd6684d745da649235726de976439561d6c1f - + https://github.com/dotnet/aspnetcore - 35c305b6a6d3738475771dc8a6321e26be4b8935 + 67cbd6684d745da649235726de976439561d6c1f https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - bdd7a1e9d18a40e2d34c2e7e512eccd27a235537 + 9ebaa619eb6ad6f4bb44de62d073574bf55d3405 - + https://github.com/dotnet/sdk - bdd7a1e9d18a40e2d34c2e7e512eccd27a235537 + 9ebaa619eb6ad6f4bb44de62d073574bf55d3405 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - fd04453453de7a7d5581f4f129de09ad6838d89e + 199dbf8b315d8f82dae2d6de72fb63ad26b31907 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 61fadf272..a9596e7e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,36 +44,36 @@ - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 + 6.0.0-rtm.21513.9 + 6.0.0-rtm.21513.9 + 6.0.0-rtm.21513.9 + 6.0.0-rtm.21513.9 + 6.0.0-rtm.21513.9 + 6.0.0-rtm.21513.9 0.2.0 - 6.0.100-rtm.21513.27 - 6.0.100-rtm.21513.27 + 6.0.100-rtm.21513.36 + 6.0.100-rtm.21513.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21512.8 + 6.0.0-rtm.21513.8 - 6.0.0-rtm.21512.8 - 6.0.0-rtm.21512.8 - 6.0.0-rtm.21512.8 - 6.0.0-rtm.21512.8 - 6.0.0-rtm.21512.8 - 6.0.0-rtm.21512.8 + 6.0.0-rtm.21513.8 + 6.0.0-rtm.21513.8 + 6.0.0-rtm.21513.8 + 6.0.0-rtm.21513.8 + 6.0.0-rtm.21513.8 + 6.0.0-rtm.21513.8 2.1.0 @@ -171,7 +171,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rtm.21505.3 + 6.0.0-rtm.21512.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch deleted file mode 100644 index d11be050a..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Remove-RefOnly-dependency-versions.patch +++ /dev/null @@ -1,266 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eric Erhardt -Date: Fri, 8 Oct 2021 19:55:43 -0500 -Subject: [PATCH 1/2] Remove RefOnly dependency versions - -This allows for source-build to replace these versions with source-built versions. - -Note: Removing unnecessary MSBuild PackageReferences rather than updating the version of these unnecessary references. - -See https://github.com/dotnet/source-build/issues/2421 for details. -Backported to runtime with https://github.com/dotnet/runtime/pull/60315. ---- - eng/Versions.props | 14 ++++---------- - ...crosoft.DotNet.CoreSetup.Packaging.Tests.csproj | 2 +- - .../src/Microsoft.NETCore.Platforms.csproj | 5 ++--- - .../AndroidAppBuilder/AndroidAppBuilder.csproj | 5 +---- - src/tasks/AotCompilerTask/MonoAOTCompiler.csproj | 6 ++---- - src/tasks/AppleAppBuilder/AppleAppBuilder.csproj | 5 +---- - src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj | 7 ++----- - src/tasks/ILStripTask/ILStrip.csproj | 5 +---- - .../JsonToItemsTaskFactory.csproj | 5 +---- - .../RuntimeConfigParser/RuntimeConfigParser.csproj | 6 ++---- - src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 5 +---- - src/tasks/WasmBuildTasks/WasmBuildTasks.csproj | 5 +---- - .../WorkloadBuildTasks/WorkloadBuildTasks.csproj | 5 +---- - src/tasks/installer.tasks/installer.tasks.csproj | 6 +++--- - 14 files changed, 23 insertions(+), 58 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 94a3045e604..d2c0d141056 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -146,16 +146,10 @@ - 1.0.0-beta-build0015 - 1.0.4-preview6.19326.1 - 0.2.61701 -- -- 16.10.0 -- $(RefOnlyMicrosoftBuildVersion) -- $(RefOnlyMicrosoftBuildVersion) -- $(RefOnlyMicrosoftBuildVersion) -- 5.8.0 -- 5.8.0 -+ 16.10.0 -+ $(MicrosoftBuildVersion) -+ 5.8.0 -+ 5.8.0 - - 1.0.1-prerelease-00006 - 16.9.0-preview-20201201-01 -diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj -index 8dcef20c22d..73a3fda2b55 100644 ---- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj -+++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj -@@ -7,7 +7,7 @@ - - - -- -+ - - - -diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj -index 3872248843d..4968a69f531 100644 ---- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj -+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj -@@ -44,9 +44,8 @@ - - - -- -- -- -+ -+ - - - -diff --git a/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj b/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj -index de6a04a95f0..139d5672ee0 100644 ---- a/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj -+++ b/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj -@@ -11,10 +11,7 @@ - - - -- -- -- -- -+ - - - -diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj -index 840115ca71b..caf34787a2d 100644 ---- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj -+++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj -@@ -11,10 +11,8 @@ - $(NoWarn),CS8604,CS8602 - - -- -- -- -- -+ -+ - - - -diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj -index 7ceb4480e1c..e28dafef5d8 100644 ---- a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj -+++ b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj -@@ -11,10 +11,7 @@ - - - -- -- -- -- -+ - - - -diff --git a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj -index fcd5b20ab2c..ddddfadb593 100644 ---- a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj -+++ b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj -@@ -9,11 +9,8 @@ - $(NoWarn),CS8604,CS8602 - - -- -- -- -- -- -+ -+ - - - -diff --git a/src/tasks/ILStripTask/ILStrip.csproj b/src/tasks/ILStripTask/ILStrip.csproj -index bb9c41f692e..91b63a8c0a6 100644 ---- a/src/tasks/ILStripTask/ILStrip.csproj -+++ b/src/tasks/ILStripTask/ILStrip.csproj -@@ -8,10 +8,7 @@ - false - - -- -- -- -- -+ - - - -diff --git a/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj b/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj -index 17799fbf657..579682fd84f 100644 ---- a/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj -+++ b/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj -@@ -9,10 +9,7 @@ - - - -- -- -- -- -+ - - - -diff --git a/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj b/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj -index c07e367def6..074f89c415a 100644 ---- a/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj -+++ b/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj -@@ -10,10 +10,8 @@ - $(NoWarn),CS8604,CS8602 - - -- -- -- -- -+ -+ - - - -diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -index 22a530b7de3..358de5541e3 100644 ---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -@@ -19,10 +19,7 @@ - - - -- -- -- -- -+ - - - -diff --git a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj -index 0f8b6c93993..fd88116ca0a 100644 ---- a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj -+++ b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj -@@ -6,10 +6,7 @@ - $(NoWarn),CA1050 - - -- -- -- -- -+ - - - - - -- -- -- -- -+ - - - - -- -+ - - - -- -- -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch b/src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch deleted file mode 100644 index 4bcdd21a2..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-Eliminate-usages-of-pre-built-packages-during-source.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eric Erhardt -Date: Tue, 12 Oct 2021 19:40:56 +0000 -Subject: [PATCH 2/2] Eliminate usages of pre-built packages during - source-build - -* Don't build MSBuild tasks for netfx during source-build -* Don't build Microsoft.Windows.Compatibility during source-build -* Don't build test projects during source-build -* Don't restore Microsoft.DiaSymReader.Native -* Don't build source generators that target older Roslyn versions -* Don't build ILStripTask since it uses a Mono.Cecil "sources" NuGet package that isn't part of source-build - -See https://github.com/dotnet/source-build/issues/2421 for details. -Backported to runtime with https://github.com/dotnet/runtime/pull/60315. ---- - Directory.Build.props | 4 ++++ - eng/Subsets.props | 2 +- - .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 2 +- - .../src/Microsoft.Extensions.Logging.Abstractions.csproj | 3 ++- - .../src/Microsoft.NETCore.Platforms.csproj | 4 ++-- - src/libraries/System.Text.Json/src/System.Text.Json.csproj | 3 ++- - src/libraries/src.proj | 5 +++++ - src/tasks/Directory.Build.props | 3 +++ - src/tasks/installer.tasks/installer.tasks.csproj | 6 +++--- - src/tasks/tasks.proj | 5 +++++ - 10 files changed, 28 insertions(+), 9 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 58c7f876aea..c58a9d1a047 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -52,6 +52,10 @@ - $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) - Microsoft.NETCore.App - .NET $(NetCoreAppCurrentVersion) -+ -+ net472 -+ -+ - - - -diff --git a/eng/Subsets.props b/eng/Subsets.props -index a7c5fb0e96e..b2292ac98e6 100644 ---- a/eng/Subsets.props -+++ b/eng/Subsets.props -@@ -72,7 +72,7 @@ - host.native - - packs.product -- $(DefaultPacksSubsets)+packs.tests -+ $(DefaultPacksSubsets)+packs.tests - $(DefaultPacksSubsets)+packs.installers - - -diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props -index 15d09343b05..09069935a00 100644 ---- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props -+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props -@@ -238,7 +238,7 @@ - - - -- -+ - - - - - -- -+ - - - -diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj -index 4968a69f531..b941586e3d6 100644 ---- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj -+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppToolCurrent);net472 -+ $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) - - false - $(MSBuildProjectName) -@@ -21,7 +21,7 @@ - $(AdditionalRuntimeIdentifiers);$(OutputRID) - - -- -+ - - - -diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj -index 4b7f0bc75ce..bba18ce24ed 100644 ---- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj -+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj -@@ -351,7 +351,8 @@ System.Text.Json.Utf8JsonReader - - - -- -+ - - - -diff --git a/src/libraries/src.proj b/src/libraries/src.proj -index 8b38ce5b449..4e0fea066f7 100644 ---- a/src/libraries/src.proj -+++ b/src/libraries/src.proj -@@ -14,6 +14,11 @@ - Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" - Condition="'$(BuildAllConfigurations)' != 'true'" /> - -+ -+ <_allSrc Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj; -+ Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" -+ Condition="'$(DotNetBuildFromSource)' == 'true'" /> -+ - -+ - net6.0 - - -diff --git a/src/tasks/installer.tasks/installer.tasks.csproj b/src/tasks/installer.tasks/installer.tasks.csproj -index 5cff57cdefb..98c370fdfed 100644 ---- a/src/tasks/installer.tasks/installer.tasks.csproj -+++ b/src/tasks/installer.tasks/installer.tasks.csproj -@@ -1,6 +1,6 @@ - - -- $(TargetFrameworkForNETCoreTasks);net461 -+ $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) - false - false - -@@ -10,12 +10,12 @@ - - - -- -+ - - - - -- -+ - - - -diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj -index 9c62f8b76b9..03a049e1bf4 100644 ---- a/src/tasks/tasks.proj -+++ b/src/tasks/tasks.proj -@@ -1,6 +1,11 @@ - - - -+ -+ -+ -+ - - - diff --git a/eng/Versions.props b/eng/Versions.props index a9596e7e9..ba76d059d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21513.36 - 6.0.100-rtm.21513.36 + 6.0.100-rtm.21513.42 + 6.0.100-rtm.21513.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 99ca026d78e4a8e61727fc643c95571636a8ef65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 05:45:01 +0000 Subject: [PATCH 33/48] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12358) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.23 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.23 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.23 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21513.9 to 6.0.0-rtm.21513.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21513.9 to 6.0.0-rtm.21513.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.9 to 6.0.0-rtm.21513.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.9 to 6.0.0-rtm.21513.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21513.9 to 6.0.0-rtm.21513.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21513.9 to 6.0.0-rtm.21513.16 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.23 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.23 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21513.17 (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 5b4fcc56b..96c2e6c53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c + b8d194cf883545cb5b026ad91313b22f6fb5da8d - + https://github.com/dotnet/windowsdesktop - e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c + b8d194cf883545cb5b026ad91313b22f6fb5da8d - + https://github.com/dotnet/windowsdesktop - e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c + b8d194cf883545cb5b026ad91313b22f6fb5da8d - + https://github.com/dotnet/windowsdesktop - e01b6fd0d6e99a3f702f6e0d17ded1b3b020ca7c + b8d194cf883545cb5b026ad91313b22f6fb5da8d https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 - + https://github.com/dotnet/aspnetcore - 67cbd6684d745da649235726de976439561d6c1f + 82629def5f9b6fe40414e45458b33758990995ce - + https://github.com/dotnet/aspnetcore - 67cbd6684d745da649235726de976439561d6c1f + 82629def5f9b6fe40414e45458b33758990995ce - + https://github.com/dotnet/aspnetcore - 67cbd6684d745da649235726de976439561d6c1f + 82629def5f9b6fe40414e45458b33758990995ce - + https://github.com/dotnet/aspnetcore - 67cbd6684d745da649235726de976439561d6c1f + 82629def5f9b6fe40414e45458b33758990995ce - + https://github.com/dotnet/aspnetcore - 67cbd6684d745da649235726de976439561d6c1f + 82629def5f9b6fe40414e45458b33758990995ce - + https://github.com/dotnet/aspnetcore - 67cbd6684d745da649235726de976439561d6c1f + 82629def5f9b6fe40414e45458b33758990995ce https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - 5bbca6385f36f900505761cea24cd0c4c2376754 + 361ac0611fcc580b56f3e8deb5b2a2f56fa936d3 - + https://github.com/dotnet/sdk - 5bbca6385f36f900505761cea24cd0c4c2376754 + 361ac0611fcc580b56f3e8deb5b2a2f56fa936d3 - + https://github.com/dotnet/winforms - 30725d9b3d8c578a113b95cff296c08a0e9458b4 + b7b6ae8a723c3d0ebe230d05a1f9de1fff225f08 - + https://github.com/dotnet/wpf - 94c6ac00121c23d73a199255bbb565b492151ad2 + b0c4dcefaeb43ccb542717da03a62f2bb9a17b4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ba76d059d..99ef0a790 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21512.5 + 6.0.0-rtm.21513.15 - 6.0.0-rtm.21512.4 + 6.0.0-rtm.21513.17 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21513.9 - 6.0.0-rtm.21513.9 - 6.0.0-rtm.21513.9 - 6.0.0-rtm.21513.9 - 6.0.0-rtm.21513.9 - 6.0.0-rtm.21513.9 + 6.0.0-rtm.21513.16 + 6.0.0-rtm.21513.16 + 6.0.0-rtm.21513.16 + 6.0.0-rtm.21513.16 + 6.0.0-rtm.21513.16 + 6.0.0-rtm.21513.16 0.2.0 - 6.0.100-rtm.21513.42 - 6.0.100-rtm.21513.42 + 6.0.100-rtm.21513.52 + 6.0.100-rtm.21513.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 - 6.0.0-rtm.21512.5 + 6.0.0-rtm.21513.23 + 6.0.0-rtm.21513.23 + 6.0.0-rtm.21513.23 + 6.0.0-rtm.21513.23 From 294f3e8dc157552ee0cd132daa2640c75b0a6061 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 06:43:57 +0000 Subject: [PATCH 34/48] Update dependencies from https://github.com/dotnet/sdk build 20211013.54 (#12359) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (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 96c2e6c53..c3bc41d9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop b8d194cf883545cb5b026ad91313b22f6fb5da8d - + https://github.com/dotnet/runtime - 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 + 29dad028278ad8332592960dbe3a3a241f02a500 - + https://github.com/dotnet/runtime - 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 + 29dad028278ad8332592960dbe3a3a241f02a500 - + https://github.com/dotnet/runtime - 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 + 29dad028278ad8332592960dbe3a3a241f02a500 - + https://github.com/dotnet/runtime - 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 + 29dad028278ad8332592960dbe3a3a241f02a500 - + https://github.com/dotnet/runtime - 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 + 29dad028278ad8332592960dbe3a3a241f02a500 - + https://github.com/dotnet/runtime - 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 + 29dad028278ad8332592960dbe3a3a241f02a500 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2 + 29dad028278ad8332592960dbe3a3a241f02a500 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - 361ac0611fcc580b56f3e8deb5b2a2f56fa936d3 + f1143a754d0ca77f836c07aeaa984b858c8426db - + https://github.com/dotnet/sdk - 361ac0611fcc580b56f3e8deb5b2a2f56fa936d3 + f1143a754d0ca77f836c07aeaa984b858c8426db diff --git a/eng/Versions.props b/eng/Versions.props index 99ef0a790..75adad04d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21513.52 - 6.0.100-rtm.21513.52 + 6.0.100-rtm.21513.54 + 6.0.100-rtm.21513.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21513.8 + 6.0.0-rtm.21513.22 - 6.0.0-rtm.21513.8 - 6.0.0-rtm.21513.8 - 6.0.0-rtm.21513.8 - 6.0.0-rtm.21513.8 - 6.0.0-rtm.21513.8 - 6.0.0-rtm.21513.8 + 6.0.0-rtm.21513.22 + 6.0.0-rtm.21513.22 + 6.0.0-rtm.21513.22 + 6.0.0-rtm.21513.22 + 6.0.0-rtm.21513.22 + 6.0.0-rtm.21513.22 2.1.0 From 94f5a9dfcf8d14ff215dc1f7a75ace9e4f63f756 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 08:52:16 +0000 Subject: [PATCH 35/48] Update dependencies from https://github.com/dotnet/sdk build 20211014.1 (#12360) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21513.23 to 6.0.0-rtm.21513.28 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.23 to 6.0.0-rtm.21513.28 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21513.23 to 6.0.0-rtm.21513.28 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21513.23 to 6.0.0-rtm.21513.28 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21513.15 to 6.0.0-rtm.21513.19 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21513.23 to 6.0.0-rtm.21513.28 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21513.17 to 6.0.0-rtm.21513.21 (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 c3bc41d9d..23454e602 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - b8d194cf883545cb5b026ad91313b22f6fb5da8d + ceb63cd704cb33642a65e36cb67d736f96530e26 - + https://github.com/dotnet/windowsdesktop - b8d194cf883545cb5b026ad91313b22f6fb5da8d + ceb63cd704cb33642a65e36cb67d736f96530e26 - + https://github.com/dotnet/windowsdesktop - b8d194cf883545cb5b026ad91313b22f6fb5da8d + ceb63cd704cb33642a65e36cb67d736f96530e26 - + https://github.com/dotnet/windowsdesktop - b8d194cf883545cb5b026ad91313b22f6fb5da8d + ceb63cd704cb33642a65e36cb67d736f96530e26 https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - f1143a754d0ca77f836c07aeaa984b858c8426db + 4bb7c0ca5ad412346dce927ffd139660dd66ad5a - + https://github.com/dotnet/sdk - f1143a754d0ca77f836c07aeaa984b858c8426db + 4bb7c0ca5ad412346dce927ffd139660dd66ad5a - + https://github.com/dotnet/winforms - b7b6ae8a723c3d0ebe230d05a1f9de1fff225f08 + 69eebc37f171f3d6cee7ff6d63c20762b70b685e - + https://github.com/dotnet/wpf - b0c4dcefaeb43ccb542717da03a62f2bb9a17b4f + bc889f2530324da100e9e5395fc09007646db9ce https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 75adad04d..e3ff37927 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21513.15 + 6.0.0-rtm.21513.19 - 6.0.0-rtm.21513.17 + 6.0.0-rtm.21513.21 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21513.54 - 6.0.100-rtm.21513.54 + 6.0.100-rtm.21514.1 + 6.0.100-rtm.21514.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21513.23 - 6.0.0-rtm.21513.23 - 6.0.0-rtm.21513.23 - 6.0.0-rtm.21513.23 + 6.0.0-rtm.21513.28 + 6.0.0-rtm.21513.28 + 6.0.0-rtm.21513.28 + 6.0.0-rtm.21513.28 From 0079e66fae70a22bd8bde6c101ed7ed039e2a25a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 11:51:45 +0000 Subject: [PATCH 36/48] Update dependencies from https://github.com/dotnet/sdk build 20211014.6 (#12362) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (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 23454e602..24130683f 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 - 29dad028278ad8332592960dbe3a3a241f02a500 + ae31427bf065a1573c51f710633fe597cd359d0a - + https://github.com/dotnet/runtime - 29dad028278ad8332592960dbe3a3a241f02a500 + ae31427bf065a1573c51f710633fe597cd359d0a - + https://github.com/dotnet/runtime - 29dad028278ad8332592960dbe3a3a241f02a500 + ae31427bf065a1573c51f710633fe597cd359d0a - + https://github.com/dotnet/runtime - 29dad028278ad8332592960dbe3a3a241f02a500 + ae31427bf065a1573c51f710633fe597cd359d0a - + https://github.com/dotnet/runtime - 29dad028278ad8332592960dbe3a3a241f02a500 + ae31427bf065a1573c51f710633fe597cd359d0a - + https://github.com/dotnet/runtime - 29dad028278ad8332592960dbe3a3a241f02a500 + ae31427bf065a1573c51f710633fe597cd359d0a @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 29dad028278ad8332592960dbe3a3a241f02a500 + ae31427bf065a1573c51f710633fe597cd359d0a https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 - + https://github.com/dotnet/sdk - 4bb7c0ca5ad412346dce927ffd139660dd66ad5a + ca5f6bcfbd2e3cc28f8e3b7015ed46c311365d29 - + https://github.com/dotnet/sdk - 4bb7c0ca5ad412346dce927ffd139660dd66ad5a + ca5f6bcfbd2e3cc28f8e3b7015ed46c311365d29 diff --git a/eng/Versions.props b/eng/Versions.props index e3ff37927..46805b950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21514.1 - 6.0.100-rtm.21514.1 + 6.0.100-rtm.21514.6 + 6.0.100-rtm.21514.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21513.22 + 6.0.0-rtm.21513.26 - 6.0.0-rtm.21513.22 - 6.0.0-rtm.21513.22 - 6.0.0-rtm.21513.22 - 6.0.0-rtm.21513.22 - 6.0.0-rtm.21513.22 - 6.0.0-rtm.21513.22 + 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 2.1.0 From b0c51e07c82df3a1e37e13fff9ddedd7c7aa62ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 12:33:10 +0000 Subject: [PATCH 37/48] Update dependencies from https://github.com/dotnet/sdk build 20211014.8 (#12363) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21513.2 to 6.0.100-rtm.21514.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21513.2 to 6.0.100-rtm.21514.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21513.2 to 6.0.100-rtm.21514.1 (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 24130683f..aaa9d12af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 + 2679360b874296a9943719622a332864dd2aff1f - + https://github.com/dotnet/templating - 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 + 2679360b874296a9943719622a332864dd2aff1f - + https://github.com/dotnet/templating - 7c72083fad2c59e2e8bd29019e6aa7586b8a72e3 + 2679360b874296a9943719622a332864dd2aff1f - + https://github.com/dotnet/sdk - ca5f6bcfbd2e3cc28f8e3b7015ed46c311365d29 + 13e80c22f7e24595598b7165a42aaf8df5143440 - + https://github.com/dotnet/sdk - ca5f6bcfbd2e3cc28f8e3b7015ed46c311365d29 + 13e80c22f7e24595598b7165a42aaf8df5143440 diff --git a/eng/Versions.props b/eng/Versions.props index 46805b950..14a50d1ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21513.2 + 6.0.100-rtm.21514.1 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.6 - 6.0.100-rtm.21514.6 + 6.0.100-rtm.21514.8 + 6.0.100-rtm.21514.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21513.2 + 6.0.100-rtm.21514.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 824fec3c02a0cd55a18154733010ccee31c04fc4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 13:39:10 +0000 Subject: [PATCH 38/48] Update dependencies from https://github.com/dotnet/sdk build 20211014.11 (#12365) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21514.1 to 6.0.100-rtm.21514.4 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21514.1 to 6.0.100-rtm.21514.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21514.1 to 6.0.100-rtm.21514.4 (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 aaa9d12af..7a3bf0d68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 2679360b874296a9943719622a332864dd2aff1f + c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/templating - 2679360b874296a9943719622a332864dd2aff1f + c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/templating - 2679360b874296a9943719622a332864dd2aff1f + c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - 13e80c22f7e24595598b7165a42aaf8df5143440 + b9d232dfd85c72f1907c6b6fa88e476ecf060da0 - + https://github.com/dotnet/sdk - 13e80c22f7e24595598b7165a42aaf8df5143440 + b9d232dfd85c72f1907c6b6fa88e476ecf060da0 diff --git a/eng/Versions.props b/eng/Versions.props index 14a50d1ba..6b172bedb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21514.1 + 6.0.100-rtm.21514.4 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.8 - 6.0.100-rtm.21514.8 + 6.0.100-rtm.21514.11 + 6.0.100-rtm.21514.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21514.1 + 6.0.100-rtm.21514.4 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 429b554acf6a2ef76f85d9e9b876457a8a6c6dcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 14:32:26 +0000 Subject: [PATCH 39/48] Update dependencies from https://github.com/dotnet/sdk build 20211014.15 (#12366) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21513.16 to 6.0.0-rtm.21514.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21513.16 to 6.0.0-rtm.21514.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.16 to 6.0.0-rtm.21514.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.16 to 6.0.0-rtm.21514.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21513.16 to 6.0.0-rtm.21514.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21513.16 to 6.0.0-rtm.21514.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 7a3bf0d68..e180b17a3 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 - 82629def5f9b6fe40414e45458b33758990995ce + 44922136fac15f137cda7741199f710a0090ce31 - + https://github.com/dotnet/aspnetcore - 82629def5f9b6fe40414e45458b33758990995ce + 44922136fac15f137cda7741199f710a0090ce31 - + https://github.com/dotnet/aspnetcore - 82629def5f9b6fe40414e45458b33758990995ce + 44922136fac15f137cda7741199f710a0090ce31 - + https://github.com/dotnet/aspnetcore - 82629def5f9b6fe40414e45458b33758990995ce + 44922136fac15f137cda7741199f710a0090ce31 - + https://github.com/dotnet/aspnetcore - 82629def5f9b6fe40414e45458b33758990995ce + 44922136fac15f137cda7741199f710a0090ce31 - + https://github.com/dotnet/aspnetcore - 82629def5f9b6fe40414e45458b33758990995ce + 44922136fac15f137cda7741199f710a0090ce31 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - b9d232dfd85c72f1907c6b6fa88e476ecf060da0 + c70eb0c982220b3a0c53ce80879e61f78e6accda - + https://github.com/dotnet/sdk - b9d232dfd85c72f1907c6b6fa88e476ecf060da0 + c70eb0c982220b3a0c53ce80879e61f78e6accda diff --git a/eng/Versions.props b/eng/Versions.props index 6b172bedb..85b00c9a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21513.16 - 6.0.0-rtm.21513.16 - 6.0.0-rtm.21513.16 - 6.0.0-rtm.21513.16 - 6.0.0-rtm.21513.16 - 6.0.0-rtm.21513.16 + 6.0.0-rtm.21514.4 + 6.0.0-rtm.21514.4 + 6.0.0-rtm.21514.4 + 6.0.0-rtm.21514.4 + 6.0.0-rtm.21514.4 + 6.0.0-rtm.21514.4 0.2.0 - 6.0.100-rtm.21514.11 - 6.0.100-rtm.21514.11 + 6.0.100-rtm.21514.15 + 6.0.100-rtm.21514.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0568648ac4628cfcea92f64af63cf002779cb0d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 15:54:59 +0000 Subject: [PATCH 40/48] Update dependencies from https://github.com/dotnet/sdk build 20211014.20 (#12367) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21514.4 to 6.0.0-rtm.21514.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21514.4 to 6.0.0-rtm.21514.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21514.4 to 6.0.0-rtm.21514.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.4 to 6.0.0-rtm.21514.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21514.4 to 6.0.0-rtm.21514.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21514.4 to 6.0.0-rtm.21514.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 e180b17a3..78d8b43ad 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 - 44922136fac15f137cda7741199f710a0090ce31 + 90a5030e59c373b287b48ca4b4356fa61df0d71a - + https://github.com/dotnet/aspnetcore - 44922136fac15f137cda7741199f710a0090ce31 + 90a5030e59c373b287b48ca4b4356fa61df0d71a - + https://github.com/dotnet/aspnetcore - 44922136fac15f137cda7741199f710a0090ce31 + 90a5030e59c373b287b48ca4b4356fa61df0d71a - + https://github.com/dotnet/aspnetcore - 44922136fac15f137cda7741199f710a0090ce31 + 90a5030e59c373b287b48ca4b4356fa61df0d71a - + https://github.com/dotnet/aspnetcore - 44922136fac15f137cda7741199f710a0090ce31 + 90a5030e59c373b287b48ca4b4356fa61df0d71a - + https://github.com/dotnet/aspnetcore - 44922136fac15f137cda7741199f710a0090ce31 + 90a5030e59c373b287b48ca4b4356fa61df0d71a https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating c6f66eb3c0bf99f709eb1ceb950cfba9bf7ea4c1 - + https://github.com/dotnet/sdk - c70eb0c982220b3a0c53ce80879e61f78e6accda + 0839bfa7a04c427e2b46ddd4e540ad1d54f86089 - + https://github.com/dotnet/sdk - c70eb0c982220b3a0c53ce80879e61f78e6accda + 0839bfa7a04c427e2b46ddd4e540ad1d54f86089 diff --git a/eng/Versions.props b/eng/Versions.props index 85b00c9a1..516a8ada9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21514.4 - 6.0.0-rtm.21514.4 - 6.0.0-rtm.21514.4 - 6.0.0-rtm.21514.4 - 6.0.0-rtm.21514.4 - 6.0.0-rtm.21514.4 + 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 0.2.0 - 6.0.100-rtm.21514.15 - 6.0.100-rtm.21514.15 + 6.0.100-rtm.21514.20 + 6.0.100-rtm.21514.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f929db75b376cda8926db9c326d9178f321107bf Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 14 Oct 2021 16:16:09 +0000 Subject: [PATCH 41/48] 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 516a8ada9..59fd5fe8a 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.22 - 0.1.0-6.0.100-29 + 0.1.0-6.0.100-bootstrap.23 + 0.1.0-6.0.100-30 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index f96666e97..365caa902 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- - 29 + 30 From eb35d414e9e4e8ee029106c24dbbc4abd7e94861 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 16:23:50 +0000 Subject: [PATCH 42/48] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211014.2 (#12368) [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 78d8b43ad..ed82c96dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/source-build-reference-packages - 9cda2866bb5365a2d866068a0c0aecdc133ca325 + 83a56ff632506f3d41fae37165136c8c59e697a9 From 6ff730a152d7721a6f48c744b6d19d1d3a13829b Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 14 Oct 2021 10:41:17 -0700 Subject: [PATCH 43/48] [release/6.0.1xx] Update Asp.Net templates (#12331) * [release/6.0.1xx] Update Asp.Net templates * Update GenerateBundledVersions.targets too --- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 516a8ada9..4fb9b0570 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.10 + 5.0.11 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.19 + 3.1.20 3.2.1 4.8.0-rc2.19462.10 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 a52a9ace2c676433a9df582c311dff401cc66155 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 18:54:43 +0000 Subject: [PATCH 44/48] Update dependencies from https://github.com/dotnet/sdk build 20211014.26 (#12373) [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 ed82c96dc..6c669799f 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 - 0839bfa7a04c427e2b46ddd4e540ad1d54f86089 + 017a9901e1c2471279211f3ed2e5a59c3af24025 - + https://github.com/dotnet/sdk - 0839bfa7a04c427e2b46ddd4e540ad1d54f86089 + 017a9901e1c2471279211f3ed2e5a59c3af24025 diff --git a/eng/Versions.props b/eng/Versions.props index 4fb9b0570..b3038b5df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21514.20 - 6.0.100-rtm.21514.20 + 6.0.100-rtm.21514.26 + 6.0.100-rtm.21514.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e3a96ef1c7318eb79d67ca7386aa8cbc460ee094 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 19:33:05 +0000 Subject: [PATCH 45/48] [release/6.0.1xx] Update dependencies from dotnet/arcade (#12349) [release/6.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21423-02 to 1.1.0-beta-21480-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Resolve conflicts in source-build patches - Resolve conflicts in source-build patches --- eng/Version.Details.xml | 16 +- eng/Versions.props | 2 +- global.json | 4 +- ...loads-WiX-dependency-in-source-build.patch | 124 -------------- .../0001-Update-TFMs-to-net6.0.patch | 156 ------------------ ...-dotnet-arcade-issues-7778-Ignore-cu.patch | 26 --- 6 files changed, 11 insertions(+), 317 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch delete mode 100644 src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c669799f..d7cef7244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,28 +197,28 @@ - + https://github.com/dotnet/arcade - e58cb829bf6d9c340b4a0c100956e2995d792aa2 + 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 - + https://github.com/dotnet/arcade - e58cb829bf6d9c340b4a0c100956e2995d792aa2 + 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 - + https://github.com/dotnet/arcade - e58cb829bf6d9c340b4a0c100956e2995d792aa2 + 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 https://github.com/dotnet/source-build-reference-packages 83a56ff632506f3d41fae37165136c8c59e697a9 - + https://github.com/dotnet/sourcelink - 6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9 + 8031e5220baf2acad991e661d8308b783d2acf3e diff --git a/eng/Versions.props b/eng/Versions.props index b3038b5df..bf2fb55ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21507.1 + 6.0.0-beta.21513.3 diff --git a/global.json b/global.json index 57ecd2983..d6b36eb70 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.21507.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21507.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21513.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21513.3" } } 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 deleted file mode 100644 index 188312413..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch +++ /dev/null @@ -1,124 +0,0 @@ -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 diff --git a/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch b/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch deleted file mode 100644 index 9cc7b6bf9..000000000 --- a/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch +++ /dev/null @@ -1,156 +0,0 @@ -From aba2e21af6d299f0e5c04c7848e4971e0da0e5b5 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 20 Jul 2021 21:01:43 +0000 -Subject: [PATCH] Update TFMs to net6.0 - -When building from source, only the current TFM is built. Update -TargetFrameworks to only have net6.0. ---- - eng/Versions.props | 1 + - src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj | 1 + - .../Microsoft.SourceLink.AzureDevOpsServer.Git.csproj | 1 + - .../Microsoft.SourceLink.AzureRepos.Git.csproj | 1 + - .../Microsoft.SourceLink.Bitbucket.Git.csproj | 1 + - src/SourceLink.Common/Microsoft.SourceLink.Common.csproj | 1 + - src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj | 1 + - src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj | 1 + - src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj | 1 + - src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj | 1 + - src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj | 1 + - 11 files changed, 11 insertions(+) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 4ea51a8..eff58cf 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -7,6 +7,7 @@ - true - - true -+ false - true - 2.4.1 - 16.7.0 -diff --git a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj -index 3fa8c71..da0277b 100644 ---- a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj -+++ b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj -index ceec252..84e89bd 100644 ---- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj -+++ b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj -index bdb048e..b01b429 100644 ---- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj -+++ b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj -index bf27b3f..11ac33d 100644 ---- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj -+++ b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj -index 09ac8ec..534b316 100644 ---- a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj -+++ b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj -index 626b9cc..0c025ca 100644 ---- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj -+++ b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj -index 4a1d0af..ada8986 100644 ---- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj -+++ b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj -index 19f92a8..b9ec7b4 100644 ---- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj -+++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj -index fa9e33e..acca3af 100644 ---- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj -+++ b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj -index 5d17262..3dd091a 100644 ---- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj -+++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj -@@ -3,6 +3,7 @@ - - - net6.0;netstandard2.0 -+ net6.0 - false - none - false --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch b/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch deleted file mode 100644 index 8dffe11a5..000000000 --- a/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4c6179851c1e4ff7f6835707d11f0d9a411aefbc Mon Sep 17 00:00:00 2001 -From: Matt Galbraith -Date: Mon, 23 Aug 2021 08:52:35 -0700 -Subject: [PATCH] https://github.com/dotnet/arcade/issues/7778 - Ignore curl - failures for no-network build scenario - ---- - eng/common/tools.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 3c5f3a12..41e32310 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -402,7 +402,7 @@ function StopProcesses { - function TryLogClientIpAddress () { - echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' - if command -v curl > /dev/null; then -- curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' -+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi - } - --- -2.30.2 - From 3b70c3266c5e3c17a766780f56ab1e809581527c Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Mon, 25 Oct 2021 12:56:39 -0700 Subject: [PATCH 46/48] Fix manifest generation merge --- src/redist/targets/BundledManifests.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 86da9fc12..a42f2cd63 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -69,13 +69,13 @@ + DestinationPath="%(BundledManifests.SdkFeatureBand)/$([MSBuild]::ValueOrDefault('%(WorkloadManifestId)', '').ToLower())/localize"/> From cc60d4d8582a63535eacd89916f8e52f90e8c95b Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 26 Oct 2021 09:11:13 -0700 Subject: [PATCH 47/48] Revert to released patch versions of 5.0 and 3.1 runtimes --- 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 96cf3c3e8..9ed946ac6 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - 21 - 12 + 20 + 11 From 44f79fd7afe8f6982878f158741281e46b18268f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 26 Oct 2021 16:02:48 -0500 Subject: [PATCH 48/48] Remove runtime patch that is no longer rneeded. --- ...-Fix-Omnisharp-add-needed-extra-TFMs.patch | 106 ------------------ 1 file changed, 106 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch deleted file mode 100644 index 9072fbd50..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 827f1e036db2082b56b003f870f5ff8dabc9b1ed Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 12 Oct 2021 14:04:27 -0500 -Subject: [PATCH] Fix Omnisharp: Add needed extra TFMs. - -Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360. - ---- - src/libraries/Directory.Build.props | 2 +- - .../ref/System.Resources.Extensions.csproj | 4 ++-- - .../src/System.Resources.Extensions.csproj | 2 +- - .../ref/System.Runtime.CompilerServices.Unsafe.csproj | 4 ++-- - .../src/System.Runtime.CompilerServices.Unsafe.ilproj | 6 +++++- - 5 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props -index a03b334346a..30418e38a2a 100644 ---- a/src/libraries/Directory.Build.props -+++ b/src/libraries/Directory.Build.props -@@ -20,7 +20,7 @@ - false - $(RepositoryEngineeringDir)LicenseHeader.txt - -- net461;net462;net47;net471;net472 -+ net46;net461;net462;net47;net471;net472 - - - -diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj -index 99037ae459c..848be41690c 100644 ---- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj -+++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent);netstandard2.0;net461 -+ $(NetCoreAppCurrent);netstandard2.0;net46;net461 - enable - - -@@ -11,4 +11,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj -index a0a79e45adf..29c9b123ce5 100644 ---- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj -+++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj -@@ -1,7 +1,7 @@ - - - true -- $(NetCoreAppCurrent);netstandard2.0;net461 -+ $(NetCoreAppCurrent);netstandard2.0;net46;net461 - $(DefineConstants);RESOURCES_EXTENSIONS - enable - true -diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj -index 766ea9a8ae7..5324c85404b 100644 ---- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj -+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj -@@ -3,7 +3,7 @@ - true - false - enable -- $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 -+ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net46;net461 - - - -@@ -14,4 +14,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj -index a9e3de0c454..75467734292 100644 ---- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj -+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj -@@ -1,6 +1,6 @@ -  - -- $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 -+ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net46;net461 - - IMPL - OPT -@@ -20,6 +20,10 @@ System.Runtime.CompilerServices.Unsafe - - netstandard - -+ -+ mscorlib -+ #define $(TargetFramework) -+ - - mscorlib - #define $(TargetFramework) --- -2.18.0 -