From 10545361bc0153e6b0f77a721e46f2396ad5ceae Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 3 Feb 2021 23:57:06 -0600 Subject: [PATCH 01/42] Initial arcade-powered source-build infra --- eng/SourceBuild.props | 7 +++++++ eng/SourceBuildPrebuiltBaseline.xml | 5 +++++ eng/Version.Details.xml | 1 + 3 files changed, 13 insertions(+) create mode 100644 eng/SourceBuild.props create mode 100644 eng/SourceBuildPrebuiltBaseline.xml diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props new file mode 100644 index 00000000000000..535c43ea7507e7 --- /dev/null +++ b/eng/SourceBuild.props @@ -0,0 +1,7 @@ + + + + runtime + + + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml new file mode 100644 index 00000000000000..c1b6dfbf053817 --- /dev/null +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6868fff23e7a5e..20d1966bf966d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,6 +9,7 @@ https://github.com/dotnet/arcade f6ed3308865528c56ed26b85004121fce56bf4f4 + https://github.com/dotnet/arcade From 7d0c956f2eb92b7da73c3ec38f3b860eb3abd4cb Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 4 Feb 2021 00:46:11 -0600 Subject: [PATCH 02/42] Add patches, fixup from 5.0 --- eng/SourceBuild.props | 15 +++ ...d-source-build-specific-build-script.patch | 104 ++++++++++++++++++ ...trailing-path-separator-to-repo_root.patch | 25 +++++ ...ult-nopgooptimize-in-build-scripts-u.patch | 35 ++++++ ...-PackageVersionProps-from-eng-Vervsi.patch | 24 ++++ ...rapp5.0-versions-in-libraries-nupkgs.patch | 32 ++++++ ...runtime-remove-netcoreapp2.x-targets.patch | 54 +++++++++ .../0007-Remove-Browser-TFM.patch | 31 ++++++ ...08-Use-1.0-version-of-ref-assemblies.patch | 25 +++++ .../0009-runtime-trim-clr.tools.patch | 39 +++++++ ...itionally-set-PackageTargetFramework.patch | 25 +++++ ...entifiers-tag-to-prevent-aspnet-pack.patch | 38 +++++++ ...nentModel.Annotations-to-version-tha.patch | 53 +++++++++ ...ity.Cryptography.Cng-to-single-versi.patch | 30 +++++ ...te-nuget-versions-to-version-in-SBRP.patch | 27 +++++ ...e-libraries-packages.proj-harvesting.patch | 27 +++++ ...s-packages-use-net5.0-PackagingTaskA.patch | 25 +++++ .../0017-Build-net4-in-source-build.patch | 96 ++++++++++++++++ 18 files changed, 705 insertions(+) create mode 100644 eng/source-build-patches/0001-Add-source-build-specific-build-script.patch create mode 100644 eng/source-build-patches/0002-Add-trailing-path-separator-to-repo_root.patch create mode 100644 eng/source-build-patches/0003-Temporarily-default-nopgooptimize-in-build-scripts-u.patch create mode 100644 eng/source-build-patches/0004-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch create mode 100644 eng/source-build-patches/0005-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch create mode 100644 eng/source-build-patches/0006-runtime-remove-netcoreapp2.x-targets.patch create mode 100644 eng/source-build-patches/0007-Remove-Browser-TFM.patch create mode 100644 eng/source-build-patches/0008-Use-1.0-version-of-ref-assemblies.patch create mode 100644 eng/source-build-patches/0009-runtime-trim-clr.tools.patch create mode 100644 eng/source-build-patches/0010-Conditionally-set-PackageTargetFramework.patch create mode 100644 eng/source-build-patches/0011-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch create mode 100644 eng/source-build-patches/0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch create mode 100644 eng/source-build-patches/0013-Pin-System.Security.Cryptography.Cng-to-single-versi.patch create mode 100644 eng/source-build-patches/0014-Update-nuget-versions-to-version-in-SBRP.patch create mode 100644 eng/source-build-patches/0015-Remove-libraries-packages.proj-harvesting.patch create mode 100644 eng/source-build-patches/0016-runtime-libraries-packages-use-net5.0-PackagingTaskA.patch create mode 100644 eng/source-build-patches/0017-Build-net4-in-source-build.patch diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 535c43ea7507e7..fadab85aa6ed06 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -4,4 +4,19 @@ runtime + + + + + + + + diff --git a/eng/source-build-patches/0001-Add-source-build-specific-build-script.patch b/eng/source-build-patches/0001-Add-source-build-specific-build-script.patch new file mode 100644 index 00000000000000..682cc2a9ff5fda --- /dev/null +++ b/eng/source-build-patches/0001-Add-source-build-specific-build-script.patch @@ -0,0 +1,104 @@ +From f6bdb6e761e42b418817c2dd849660c1d6964f4a Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 15 Jan 2020 15:14:54 +0000 +Subject: [PATCH] Add source-build specific build script + +--- + build-source-build.sh | 85 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 85 insertions(+) + create mode 100755 build-source-build.sh + +diff --git a/build-source-build.sh b/build-source-build.sh +new file mode 100755 +index 00000000000..25c0c1b0625 +--- /dev/null ++++ b/build-source-build.sh +@@ -0,0 +1,85 @@ ++#!/usr/bin/env bash ++set -euo pipefail ++ ++source="${BASH_SOURCE[0]}" ++ ++# resolve $SOURCE until the file is no longer a symlink ++while [[ -h $source ]]; do ++ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" ++ source="$(readlink "$source")" ++ ++ # if $source was a relative symlink, we need to resolve it relative to the path where the ++ # symlink file was located ++ [[ $source != /* ]] && source="$scriptroot/$source" ++done ++ ++scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" ++ ++capture="common" ++commonArgs= ++coreclrArgs= ++librariesArgs= ++installerArgs= ++additionalArgs= ++ ++for arg do ++ shift ++ opt="$(echo "$arg" | awk '{print tolower($0)}')" ++ case $opt in ++ (--coreclr-args) ++ capture="coreclr" ++ arg="" ++ ;; ++ (--libraries-args) ++ capture="libraries" ++ arg="" ++ ;; ++ (--installer-args) ++ capture="installer" ++ arg="" ++ ;; ++ (--additional-args) ++ capture="additional" ++ arg="" ++ ;; ++ (*) ;; ++ esac ++ ++ if [ "$arg" != "" ]; then ++ case $capture in ++ (common) ++ commonArgs="$commonArgs $arg" ++ ;; ++ (coreclr) ++ coreclrArgs="$coreclrArgs $arg" ++ ;; ++ (libraries) ++ librariesArgs="$librariesArgs $arg" ++ ;; ++ (installer) ++ installerArgs="$installerArgs $arg" ++ ;; ++ (additional) ++ additionalArgs="$additionalArgs $arg" ++ ;; ++ (*) ;; ++ esac ++ fi ++done ++ ++echo "commonArgs = [$commonArgs]" ++echo "coreclrArgs = [$coreclrArgs]" ++echo "librariesArgs = [$librariesArgs]" ++echo "installerArgs = [$installerArgs]" ++echo "additionalAgs = [$additionalArgs]" ++ ++echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs ++find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "coreclrBuild.binlog" * {} \; ++ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) ++echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs ++find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; ++echo "Running command: $scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+installers+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs ++find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; +-- +2.25.4 + diff --git a/eng/source-build-patches/0002-Add-trailing-path-separator-to-repo_root.patch b/eng/source-build-patches/0002-Add-trailing-path-separator-to-repo_root.patch new file mode 100644 index 00000000000000..2ca5735b76ea8e --- /dev/null +++ b/eng/source-build-patches/0002-Add-trailing-path-separator-to-repo_root.patch @@ -0,0 +1,25 @@ +From 7ad6f5dc44092c47cee1af32be0f6a061b8abb7c Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 24 Jan 2020 19:01:58 +0000 +Subject: [PATCH] Add trailing path separator to repo_root + +--- + eng/common/build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/common/build.sh b/eng/common/build.sh +index 55b298f16cc..1b250d16018 100755 +--- a/eng/common/build.sh ++++ b/eng/common/build.sh +@@ -202,7 +202,7 @@ function Build { + MSBuild $_InitializeToolset \ + $bl \ + /p:Configuration=$configuration \ +- /p:RepoRoot="$repo_root" \ ++ /p:RepoRoot="$repo_root/" \ + /p:Restore=$restore \ + /p:Build=$build \ + /p:Rebuild=$rebuild \ +-- +2.25.4 + diff --git a/eng/source-build-patches/0003-Temporarily-default-nopgooptimize-in-build-scripts-u.patch b/eng/source-build-patches/0003-Temporarily-default-nopgooptimize-in-build-scripts-u.patch new file mode 100644 index 00000000000000..a91baf222e674e --- /dev/null +++ b/eng/source-build-patches/0003-Temporarily-default-nopgooptimize-in-build-scripts-u.patch @@ -0,0 +1,35 @@ +From ea2f8aed39d650f3a9a5791eb0858fe5ece3331c Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 25 Mar 2020 15:22:44 +0000 +Subject: [PATCH] Temporarily default nopgooptimize in build scripts until + https://github.com/dotnet/runtime/issues/34069 is fixed. + +--- + src/coreclr/build-runtime.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/build-runtime.sh b/src/coreclr/build-runtime.sh +index 25cf3e06ea6..cfc466fbed0 100755 +--- a/src/coreclr/build-runtime.sh ++++ b/src/coreclr/build-runtime.sh +@@ -173,7 +173,7 @@ __CrossBuild=0 + __DistroRid="" + __PgoInstrument=0 + __PgoOptDataPath="" +-__PgoOptimize=1 ++__PgoOptimize=0 + __PortableBuild=1 + __ProjectDir="$__ProjectRoot" + __RootBinDir="$__RepoRootDir/artifacts" +@@ -184,7 +184,7 @@ __SkipCrossArchNative=0 + __SkipGenerateVersion=0 + __SkipManaged=0 + __SkipRestore="" +-__SkipRestoreOptData=0 ++__SkipRestoreOptData=1 + __SourceDir="$__ProjectDir/src" + __StaticAnalyzer=0 + __UnprocessedBuildArgs= +-- +2.25.4 + diff --git a/eng/source-build-patches/0004-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch b/eng/source-build-patches/0004-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch new file mode 100644 index 00000000000000..d91e64c6d1fc47 --- /dev/null +++ b/eng/source-build-patches/0004-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch @@ -0,0 +1,24 @@ +From 42bb5cf46bbc21011822afeabda30eaee72d25cd Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Mon, 20 Apr 2020 15:09:58 +0000 +Subject: [PATCH] Remove import of PackageVersionProps from eng/Vervsions.props + It should be imported by Arcade SDK + +--- + eng/Versions.props | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index cc4a7b62914..cef8de452b4 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -167,6 +167,4 @@ + 9.0.1-alpha.1.21101.1 + 9.0.1-alpha.1.21101.1 + +- +- + +-- +2.25.4 + diff --git a/eng/source-build-patches/0005-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch b/eng/source-build-patches/0005-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch new file mode 100644 index 00000000000000..f6e75f86066ebb --- /dev/null +++ b/eng/source-build-patches/0005-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch @@ -0,0 +1,32 @@ +From b0080bd8a32d77a59b4c970d0107f98ec7a159ed Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 11 Jun 2020 12:15:06 -0400 +Subject: [PATCH] Include netcorapp5.0 versions in libraries nupkgs + +Assets for netcoreapp3.0 are not built in source-build because we don't +have references for past netcoreapp versions. That leaves the packages +built by the libraries build with a placeholder for netcoreapp3.0, which +causes issues with consumption of these packages in dependent repos. +Packages for netcoreapp5.0 are built but not packaged by design. This +patch includes these assets in the packages built by the libraries +build, only for the source-build build. +--- + src/libraries/Directory.Build.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets +index 0548b4468af..7460e44616b 100644 +--- a/src/libraries/Directory.Build.targets ++++ b/src/libraries/Directory.Build.targets +@@ -230,7 +230,7 @@ + + + +- true ++ true + + + +-- +2.25.4 + diff --git a/eng/source-build-patches/0006-runtime-remove-netcoreapp2.x-targets.patch b/eng/source-build-patches/0006-runtime-remove-netcoreapp2.x-targets.patch new file mode 100644 index 00000000000000..edbaaa89ea4e9a --- /dev/null +++ b/eng/source-build-patches/0006-runtime-remove-netcoreapp2.x-targets.patch @@ -0,0 +1,54 @@ +From a0f215803f4739cdc2d7c596a5bed365220ac3ca Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Mon, 16 Nov 2020 16:49:49 +0100 +Subject: [PATCH] runtime: remove netcoreapp2.x targets + +--- + eng/empty.csproj | 1 + + src/libraries/Directory.Build.props | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+) + +diff --git a/eng/empty.csproj b/eng/empty.csproj +index 6edde5507fc..68985aae3b6 100644 +--- a/eng/empty.csproj ++++ b/eng/empty.csproj +@@ -10,6 +10,7 @@ + + + netcoreapp2.0 ++ net5.0 + + + +diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props +index 3daf1a941be..94606e51460 100644 +--- a/src/libraries/Directory.Build.props ++++ b/src/libraries/Directory.Build.props +@@ -33,6 +33,24 @@ + $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) + + ++ ++ ++ ;$(TargetFrameworks); ++ ++ $(TargetFrameworks.Replace(';netcoreapp2.0;', ';')) ++ $(TargetFrameworks.Replace(';netcoreapp2.0-windows;', ';')) ++ $(TargetFrameworks.Replace(';netcoreapp2.0-Windows_NT;', ';')) ++ $(TargetFrameworks.Replace(';netcoreapp2.0-FreeBSD;', ';')) ++ $(TargetFrameworks.Replace(';netcoreapp2.0-Linux;', ';')) ++ $(TargetFrameworks.Replace(';netcoreapp2.0-OSX;', ';')) ++ ++ $(TargetFrameworks.Replace(';netcoreapp2.1;', ';')) ++ $(TargetFrameworks.Replace(';netcoreapp2.1-Windows_NT;', ';')) ++ $(TargetFrameworks.Replace(';netcoreapp2.1-Unix;', ';')) ++ ++ $(TargetFrameworks.Trim(';')) ++ ++ + + + false +-- +2.25.4 + diff --git a/eng/source-build-patches/0007-Remove-Browser-TFM.patch b/eng/source-build-patches/0007-Remove-Browser-TFM.patch new file mode 100644 index 00000000000000..1c4bd2908bc59e --- /dev/null +++ b/eng/source-build-patches/0007-Remove-Browser-TFM.patch @@ -0,0 +1,31 @@ +From d7b8db6b071bf7bf30ff8ae54c08e5cb6aebc2ec Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 2 Sep 2020 08:24:20 -0500 +Subject: [PATCH] Remove -Browser TFM + +This gets treated the same as net5.0 for some reason, which causes +errors like +.dotnet/sdk/5.0.100-preview.8.20417.9/NuGet.RestoreEx.targets(10,5): +error : Invalid restore input. Duplicate frameworks found: 'net5.0, net5.0, net5.0'. Input files: +artifacts/src/runtime.bf456654f9a4f9a86c15d9d50095ff29cde5f0a4/src/libraries/Native/native-binplace.proj. +[artifacts/src/runtime.bf456654f9a4f9a86c15d9d50095ff29cde5f0a4/Build.proj] +--- + .../src/System.Security.Cryptography.OpenSsl.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +index 90ccdc04e80..e29a3e3d909 100644 +--- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj ++++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +@@ -1,7 +1,7 @@ + + + true +- $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;net47 ++ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;net47;$(NetFrameworkCurrent) + true + enable + +-- +2.25.4 + diff --git a/eng/source-build-patches/0008-Use-1.0-version-of-ref-assemblies.patch b/eng/source-build-patches/0008-Use-1.0-version-of-ref-assemblies.patch new file mode 100644 index 00000000000000..a8ec239a8b71ab --- /dev/null +++ b/eng/source-build-patches/0008-Use-1.0-version-of-ref-assemblies.patch @@ -0,0 +1,25 @@ +From a1d1e603e5ffc5cc0402725819ea3a29e71e6c7b Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sat, 5 Sep 2020 02:46:44 -0500 +Subject: [PATCH] Use 1.0 version of ref assemblies + +--- + src/libraries/pkg/test/frameworkSettings/net/settings.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/pkg/test/frameworkSettings/net/settings.targets b/src/libraries/pkg/test/frameworkSettings/net/settings.targets +index e4e8ff23d68..edfeff17503 100644 +--- a/src/libraries/pkg/test/frameworkSettings/net/settings.targets ++++ b/src/libraries/pkg/test/frameworkSettings/net/settings.targets +@@ -8,7 +8,7 @@ + + +- ++ + + + +-- +2.25.4 + diff --git a/eng/source-build-patches/0009-runtime-trim-clr.tools.patch b/eng/source-build-patches/0009-runtime-trim-clr.tools.patch new file mode 100644 index 00000000000000..34279e4e28a279 --- /dev/null +++ b/eng/source-build-patches/0009-runtime-trim-clr.tools.patch @@ -0,0 +1,39 @@ +From c23a864f1047e37521b9cd2a1b4788eba588398d Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Thu, 22 Oct 2020 10:07:49 +0200 +Subject: [PATCH] runtime: trim clr.tools + +--- + eng/Subsets.props | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/eng/Subsets.props b/eng/Subsets.props +index ce3049f51cb..a2363fcd2b0 100644 +--- a/eng/Subsets.props ++++ b/eng/Subsets.props +@@ -49,6 +49,7 @@ + $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages + + libs.native+libs.ref+libs.src+libs.pretest+libs.packages ++ libs.native+libs.ref+libs.src+libs.packages + + host.native+host.pkg+host.tools+host.tests + +@@ -188,11 +189,11 @@ + ++ $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'" /> ++ + + ++ Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64' and '$(DotNetBuildFromSource)' != 'true'"/> + + + +-- +2.25.4 + diff --git a/eng/source-build-patches/0010-Conditionally-set-PackageTargetFramework.patch b/eng/source-build-patches/0010-Conditionally-set-PackageTargetFramework.patch new file mode 100644 index 00000000000000..5ed79230e1cd7b --- /dev/null +++ b/eng/source-build-patches/0010-Conditionally-set-PackageTargetFramework.patch @@ -0,0 +1,25 @@ +From c315609c4d93a7de32a765c768e56a9e14823528 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 2 Oct 2020 13:27:28 +0000 +Subject: [PATCH] Conditionally set PackageTargetFramework + +--- + .../System.IO.Pipelines/ref/System.IO.Pipelines.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +index 7cb28689989..30b811fac8d 100644 +--- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj ++++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +@@ -5,7 +5,7 @@ + true + +- netcoreapp2.0 ++ netcoreapp2.0 + true + + +-- +2.25.4 + diff --git a/eng/source-build-patches/0011-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch b/eng/source-build-patches/0011-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch new file mode 100644 index 00000000000000..d466940d9fa126 --- /dev/null +++ b/eng/source-build-patches/0011-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch @@ -0,0 +1,38 @@ +From ff45a58b37e554bdf0ade6033ba2a1efe4c5798f Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Tue, 13 Oct 2020 16:56:31 +0000 +Subject: [PATCH] Remove tag to prevent aspnet pack from + loading + +--- + src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 1 - + src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +index e4805e45bd9..eae0d51ff0b 100644 +--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj ++++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +@@ -12,7 +12,6 @@ + $(RuntimeBinDir)/crossgen2 + true + false +- linux-x64;linux-musl-x64;osx-x64;win-x64 + Debug;Release;Checked + true + +diff --git a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj +index dbe495a3d24..781fd33ac42 100644 +--- a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj ++++ b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj +@@ -9,7 +9,6 @@ + $(RuntimeBinDir)/dotnet-pgo + true + false +- linux-x64;linux-musl-x64;win-x64 + + + +-- +2.25.4 + diff --git a/eng/source-build-patches/0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch b/eng/source-build-patches/0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch new file mode 100644 index 00000000000000..2af1e4e099e084 --- /dev/null +++ b/eng/source-build-patches/0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch @@ -0,0 +1,53 @@ +From f18656faeea52f86792c66a3cf36f82a0b937c70 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Tue, 13 Oct 2020 17:00:34 +0000 +Subject: [PATCH] Pin System.ComponentModel.Annotations to version that can be + added to sbrp + +--- + .../src/Microsoft.Extensions.Options.DataAnnotations.csproj | 2 +- + .../ref/Microsoft.Extensions.Options.csproj | 2 +- + .../src/Microsoft.Extensions.Options.csproj | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +index bcf5ce56123..41bd9555c45 100644 +--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj ++++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +@@ -11,7 +11,7 @@ + + + +- ++ + + + +diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj +index c441c3ec38a..24c3e885eec 100644 +--- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj ++++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj +@@ -12,6 +12,6 @@ + + + +- ++ + + +diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +index ba7dcec688a..d3cfc425ac6 100644 +--- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj ++++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +@@ -18,7 +18,7 @@ + + + +- ++ + + + +-- +2.25.4 + diff --git a/eng/source-build-patches/0013-Pin-System.Security.Cryptography.Cng-to-single-versi.patch b/eng/source-build-patches/0013-Pin-System.Security.Cryptography.Cng-to-single-versi.patch new file mode 100644 index 00000000000000..2caccccd8d7254 --- /dev/null +++ b/eng/source-build-patches/0013-Pin-System.Security.Cryptography.Cng-to-single-versi.patch @@ -0,0 +1,30 @@ +From 82678ff2bec86be98d9797f98dab99aa1e82c25c Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 30 Oct 2020 16:25:21 +0000 +Subject: [PATCH] Pin System.Security.Cryptography.Cng to single version + +If System.Security.Cryptography.Cng is restored using the PVP +version (5.0.0), this causes conflicts later in the restore which +results in an error: + An item with the same key has already been added. + Key: (System.Security.Cryptography.Cng, 5.0.0) +--- + .../src/System.Security.Cryptography.Pkcs.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +index e9db368ef24..c396c21a798 100644 +--- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj ++++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +@@ -639,7 +639,7 @@ + + + +- ++ + + + +-- +2.25.4 + diff --git a/eng/source-build-patches/0014-Update-nuget-versions-to-version-in-SBRP.patch b/eng/source-build-patches/0014-Update-nuget-versions-to-version-in-SBRP.patch new file mode 100644 index 00000000000000..2e9a8423b55c5b --- /dev/null +++ b/eng/source-build-patches/0014-Update-nuget-versions-to-version-in-SBRP.patch @@ -0,0 +1,27 @@ +From 8afeee8f76edbd6046efbaf9a2f3b2546de88a50 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Tue, 27 Oct 2020 17:38:33 +0000 +Subject: [PATCH] Update nuget versions to version in SBRP + +--- + eng/Versions.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index cef8de452b4..f17e627eda2 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -137,8 +137,8 @@ + $(RefOnlyMicrosoftBuildVersion) + $(RefOnlyMicrosoftBuildVersion) + $(RefOnlyMicrosoftBuildVersion) +- 4.9.4 +- 4.9.4 ++ 5.1.0 ++ 5.1.0 + + 1.0.1-prerelease-00006 + 16.9.0-preview-20201201-01 +-- +2.25.4 + diff --git a/eng/source-build-patches/0015-Remove-libraries-packages.proj-harvesting.patch b/eng/source-build-patches/0015-Remove-libraries-packages.proj-harvesting.patch new file mode 100644 index 00000000000000..d9fa0aa5ab32fa --- /dev/null +++ b/eng/source-build-patches/0015-Remove-libraries-packages.proj-harvesting.patch @@ -0,0 +1,27 @@ +From 7e470148fdae7a3a69a39a1c0de41034bb57926c Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Mon, 2 Nov 2020 11:54:57 -0600 +Subject: [PATCH] Remove libraries-packages.proj harvesting + +Remove some prebuilts by removing package harvesting. Package harvesting +is not compatible with the concept of a prebuiltless source-build. +--- + src/libraries/libraries-packages.proj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj +index cfbf75d8a4e..603d523df55 100644 +--- a/src/libraries/libraries-packages.proj ++++ b/src/libraries/libraries-packages.proj +@@ -25,7 +25,7 @@ + + + +- ++ + + +- net45;net451;net452;net46;net461;net462;net47;net471;net472 +- $(AdditionalBuildTargetFrameworks);netstandard2.0 ++ net45;net451;net452;net46;net461;net462;net47;net471;net472 ++ $(AdditionalBuildTargetFrameworks);$(NETFrameworkTargetFrameworksExcept48) ++ $(AdditionalBuildTargetFrameworks);netstandard2.0;net48;$(NETFrameworkTargetFrameworksExcept48) ++ + + $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) + $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) +diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +index e1dad4a470d..ac14aaad7d6 100644 +--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj ++++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +@@ -10,6 +10,9 @@ + + + ++ ++ ++ + + + +diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +index 4adc0b2edb5..66d4e2aa47d 100644 +--- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj ++++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +@@ -10,7 +10,7 @@ + + + +- ++ + + + +diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +index 50d5af47646..3451105192e 100644 +--- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj ++++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +@@ -13,7 +13,7 @@ + + + +- ++ + + + +\ No newline at end of file +-- +2.25.4 + From 376c10c0b0095a41ffd05fec2cf6169a5ce36993 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 4 Feb 2021 11:13:51 -0600 Subject: [PATCH 03/42] Rename patches to match 6.0-p1 work --- ...patch => 0003-Add-source-build-specific-build-script.patch} | 0 ...tch => 0004-Add-trailing-path-separator-to-repo_root.patch} | 0 ...Temporarily-default-nopgooptimize-in-build-scripts-u.patch} | 0 ...Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch} | 0 ...09-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch} | 0 ...x-targets.patch => 0010-remove-netcoreapp2.x-targetx.patch} | 3 +++ ...Remove-Browser-TFM.patch => 0013-Remove--Browser-TFM.patch} | 0 ...lies.patch => 0015-Use-1.0-version-of-ref-assemblies.patch} | 0 ...-runtime-trim-clr.tools.patch => 0017-trim-clr.tools.patch} | 1 + ...tch => 0020-Conditionally-set-PackageTargetFramework.patch} | 0 ...Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch} | 0 ...Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch} | 1 + ...Pin-System.Security.Cryptography.Cng-to-single-versi.patch} | 0 ...tch => 0026-Update-nuget-versions-to-version-in-SBRP.patch} | 0 ...ch => 0027-Remove-libraries-packages.proj-harvesting.patch} | 0 ...=> 0029-libraries-packages-use-net5.0-PackagingTaskA.patch} | 0 ...ource-build.patch => 0033-Build-net4-in-source-build.patch} | 0 17 files changed, 5 insertions(+) rename eng/source-build-patches/{0001-Add-source-build-specific-build-script.patch => 0003-Add-source-build-specific-build-script.patch} (100%) rename eng/source-build-patches/{0002-Add-trailing-path-separator-to-repo_root.patch => 0004-Add-trailing-path-separator-to-repo_root.patch} (100%) rename eng/source-build-patches/{0003-Temporarily-default-nopgooptimize-in-build-scripts-u.patch => 0006-Temporarily-default-nopgooptimize-in-build-scripts-u.patch} (100%) rename eng/source-build-patches/{0004-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch => 0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch} (100%) rename eng/source-build-patches/{0005-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch => 0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch} (100%) rename eng/source-build-patches/{0006-runtime-remove-netcoreapp2.x-targets.patch => 0010-remove-netcoreapp2.x-targetx.patch} (94%) rename eng/source-build-patches/{0007-Remove-Browser-TFM.patch => 0013-Remove--Browser-TFM.patch} (100%) rename eng/source-build-patches/{0008-Use-1.0-version-of-ref-assemblies.patch => 0015-Use-1.0-version-of-ref-assemblies.patch} (100%) rename eng/source-build-patches/{0009-runtime-trim-clr.tools.patch => 0017-trim-clr.tools.patch} (97%) rename eng/source-build-patches/{0010-Conditionally-set-PackageTargetFramework.patch => 0020-Conditionally-set-PackageTargetFramework.patch} (100%) rename eng/source-build-patches/{0011-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch => 0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch} (100%) rename eng/source-build-patches/{0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch => 0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch} (98%) rename eng/source-build-patches/{0013-Pin-System.Security.Cryptography.Cng-to-single-versi.patch => 0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch} (100%) rename eng/source-build-patches/{0014-Update-nuget-versions-to-version-in-SBRP.patch => 0026-Update-nuget-versions-to-version-in-SBRP.patch} (100%) rename eng/source-build-patches/{0015-Remove-libraries-packages.proj-harvesting.patch => 0027-Remove-libraries-packages.proj-harvesting.patch} (100%) rename eng/source-build-patches/{0016-runtime-libraries-packages-use-net5.0-PackagingTaskA.patch => 0029-libraries-packages-use-net5.0-PackagingTaskA.patch} (100%) rename eng/source-build-patches/{0017-Build-net4-in-source-build.patch => 0033-Build-net4-in-source-build.patch} (100%) diff --git a/eng/source-build-patches/0001-Add-source-build-specific-build-script.patch b/eng/source-build-patches/0003-Add-source-build-specific-build-script.patch similarity index 100% rename from eng/source-build-patches/0001-Add-source-build-specific-build-script.patch rename to eng/source-build-patches/0003-Add-source-build-specific-build-script.patch diff --git a/eng/source-build-patches/0002-Add-trailing-path-separator-to-repo_root.patch b/eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch similarity index 100% rename from eng/source-build-patches/0002-Add-trailing-path-separator-to-repo_root.patch rename to eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch diff --git a/eng/source-build-patches/0003-Temporarily-default-nopgooptimize-in-build-scripts-u.patch b/eng/source-build-patches/0006-Temporarily-default-nopgooptimize-in-build-scripts-u.patch similarity index 100% rename from eng/source-build-patches/0003-Temporarily-default-nopgooptimize-in-build-scripts-u.patch rename to eng/source-build-patches/0006-Temporarily-default-nopgooptimize-in-build-scripts-u.patch diff --git a/eng/source-build-patches/0004-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch similarity index 100% rename from eng/source-build-patches/0004-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch rename to eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch diff --git a/eng/source-build-patches/0005-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch similarity index 100% rename from eng/source-build-patches/0005-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch rename to eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch diff --git a/eng/source-build-patches/0006-runtime-remove-netcoreapp2.x-targets.patch b/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch similarity index 94% rename from eng/source-build-patches/0006-runtime-remove-netcoreapp2.x-targets.patch rename to eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch index edbaaa89ea4e9a..4de1a92ee83648 100644 --- a/eng/source-build-patches/0006-runtime-remove-netcoreapp2.x-targets.patch +++ b/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch @@ -3,6 +3,9 @@ From: Tom Deseyn Date: Mon, 16 Nov 2020 16:49:49 +0100 Subject: [PATCH] runtime: remove netcoreapp2.x targets +dagood: (6.0) changed patch to remove netcoreapp2.0 centrally in +src/libraries/Directory.Build.props instead of a find-replace across +all files. --- eng/empty.csproj | 1 + src/libraries/Directory.Build.props | 18 ++++++++++++++++++ diff --git a/eng/source-build-patches/0007-Remove-Browser-TFM.patch b/eng/source-build-patches/0013-Remove--Browser-TFM.patch similarity index 100% rename from eng/source-build-patches/0007-Remove-Browser-TFM.patch rename to eng/source-build-patches/0013-Remove--Browser-TFM.patch diff --git a/eng/source-build-patches/0008-Use-1.0-version-of-ref-assemblies.patch b/eng/source-build-patches/0015-Use-1.0-version-of-ref-assemblies.patch similarity index 100% rename from eng/source-build-patches/0008-Use-1.0-version-of-ref-assemblies.patch rename to eng/source-build-patches/0015-Use-1.0-version-of-ref-assemblies.patch diff --git a/eng/source-build-patches/0009-runtime-trim-clr.tools.patch b/eng/source-build-patches/0017-trim-clr.tools.patch similarity index 97% rename from eng/source-build-patches/0009-runtime-trim-clr.tools.patch rename to eng/source-build-patches/0017-trim-clr.tools.patch index 34279e4e28a279..d1832b34b90a41 100644 --- a/eng/source-build-patches/0009-runtime-trim-clr.tools.patch +++ b/eng/source-build-patches/0017-trim-clr.tools.patch @@ -3,6 +3,7 @@ From: Tom Deseyn Date: Thu, 22 Oct 2020 10:07:49 +0200 Subject: [PATCH] runtime: trim clr.tools +dagood: (6.0) used '$(DotNetBuildFromSource)' != 'true' in fixup --- eng/Subsets.props | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/source-build-patches/0010-Conditionally-set-PackageTargetFramework.patch b/eng/source-build-patches/0020-Conditionally-set-PackageTargetFramework.patch similarity index 100% rename from eng/source-build-patches/0010-Conditionally-set-PackageTargetFramework.patch rename to eng/source-build-patches/0020-Conditionally-set-PackageTargetFramework.patch diff --git a/eng/source-build-patches/0011-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch b/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch similarity index 100% rename from eng/source-build-patches/0011-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch rename to eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch diff --git a/eng/source-build-patches/0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch b/eng/source-build-patches/0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch similarity index 98% rename from eng/source-build-patches/0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch rename to eng/source-build-patches/0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch index 2af1e4e099e084..dfdb307ad4a548 100644 --- a/eng/source-build-patches/0012-Pin-System.ComponentModel.Annotations-to-version-tha.patch +++ b/eng/source-build-patches/0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch @@ -4,6 +4,7 @@ Date: Tue, 13 Oct 2020 17:00:34 +0000 Subject: [PATCH] Pin System.ComponentModel.Annotations to version that can be added to sbrp +dagood: (6.0) Note: this patch's filename doesn't match. --- .../src/Microsoft.Extensions.Options.DataAnnotations.csproj | 2 +- .../ref/Microsoft.Extensions.Options.csproj | 2 +- diff --git a/eng/source-build-patches/0013-Pin-System.Security.Cryptography.Cng-to-single-versi.patch b/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch similarity index 100% rename from eng/source-build-patches/0013-Pin-System.Security.Cryptography.Cng-to-single-versi.patch rename to eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch diff --git a/eng/source-build-patches/0014-Update-nuget-versions-to-version-in-SBRP.patch b/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch similarity index 100% rename from eng/source-build-patches/0014-Update-nuget-versions-to-version-in-SBRP.patch rename to eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch diff --git a/eng/source-build-patches/0015-Remove-libraries-packages.proj-harvesting.patch b/eng/source-build-patches/0027-Remove-libraries-packages.proj-harvesting.patch similarity index 100% rename from eng/source-build-patches/0015-Remove-libraries-packages.proj-harvesting.patch rename to eng/source-build-patches/0027-Remove-libraries-packages.proj-harvesting.patch diff --git a/eng/source-build-patches/0016-runtime-libraries-packages-use-net5.0-PackagingTaskA.patch b/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch similarity index 100% rename from eng/source-build-patches/0016-runtime-libraries-packages-use-net5.0-PackagingTaskA.patch rename to eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch diff --git a/eng/source-build-patches/0017-Build-net4-in-source-build.patch b/eng/source-build-patches/0033-Build-net4-in-source-build.patch similarity index 100% rename from eng/source-build-patches/0017-Build-net4-in-source-build.patch rename to eng/source-build-patches/0033-Build-net4-in-source-build.patch From 8a4c258cfbd484be816332420846ed333a95acaf Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 15 Jan 2020 15:14:54 +0000 Subject: [PATCH 04/42] Add source-build specific build script --- build-source-build.sh | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 build-source-build.sh diff --git a/build-source-build.sh b/build-source-build.sh new file mode 100755 index 00000000000000..25c0c1b0625320 --- /dev/null +++ b/build-source-build.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash +set -euo pipefail + +source="${BASH_SOURCE[0]}" + +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done + +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +capture="common" +commonArgs= +coreclrArgs= +librariesArgs= +installerArgs= +additionalArgs= + +for arg do + shift + opt="$(echo "$arg" | awk '{print tolower($0)}')" + case $opt in + (--coreclr-args) + capture="coreclr" + arg="" + ;; + (--libraries-args) + capture="libraries" + arg="" + ;; + (--installer-args) + capture="installer" + arg="" + ;; + (--additional-args) + capture="additional" + arg="" + ;; + (*) ;; + esac + + if [ "$arg" != "" ]; then + case $capture in + (common) + commonArgs="$commonArgs $arg" + ;; + (coreclr) + coreclrArgs="$coreclrArgs $arg" + ;; + (libraries) + librariesArgs="$librariesArgs $arg" + ;; + (installer) + installerArgs="$installerArgs $arg" + ;; + (additional) + additionalArgs="$additionalArgs $arg" + ;; + (*) ;; + esac + fi +done + +echo "commonArgs = [$commonArgs]" +echo "coreclrArgs = [$coreclrArgs]" +echo "librariesArgs = [$librariesArgs]" +echo "installerArgs = [$installerArgs]" +echo "additionalAgs = [$additionalArgs]" + +echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" +$scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "coreclrBuild.binlog" * {} \; +ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) +echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" +$scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; +echo "Running command: $scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" +$scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+installers+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; From 9d474ceb314dae03ca0f5851cfb228588ccf87b4 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 4 Feb 2021 11:28:07 -0600 Subject: [PATCH 05/42] Incorporate build-source-build.sh, into eng/ --- eng/SourceBuild.props | 2 + .../build-source-build.sh | 2 +- ...d-source-build-specific-build-script.patch | 104 ------------------ 3 files changed, 3 insertions(+), 105 deletions(-) rename build-source-build.sh => eng/build-source-build.sh (98%) delete mode 100644 eng/source-build-patches/0003-Add-source-build-specific-build-script.patch diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index fadab85aa6ed06..50d9d4401a0f41 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -2,6 +2,8 @@ runtime + + $(RepositoryEngineeringDir)build-source-build.sh -Date: Wed, 15 Jan 2020 15:14:54 +0000 -Subject: [PATCH] Add source-build specific build script - ---- - build-source-build.sh | 85 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 85 insertions(+) - create mode 100755 build-source-build.sh - -diff --git a/build-source-build.sh b/build-source-build.sh -new file mode 100755 -index 00000000000..25c0c1b0625 ---- /dev/null -+++ b/build-source-build.sh -@@ -0,0 +1,85 @@ -+#!/usr/bin/env bash -+set -euo pipefail -+ -+source="${BASH_SOURCE[0]}" -+ -+# resolve $SOURCE until the file is no longer a symlink -+while [[ -h $source ]]; do -+ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -+ source="$(readlink "$source")" -+ -+ # if $source was a relative symlink, we need to resolve it relative to the path where the -+ # symlink file was located -+ [[ $source != /* ]] && source="$scriptroot/$source" -+done -+ -+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -+ -+capture="common" -+commonArgs= -+coreclrArgs= -+librariesArgs= -+installerArgs= -+additionalArgs= -+ -+for arg do -+ shift -+ opt="$(echo "$arg" | awk '{print tolower($0)}')" -+ case $opt in -+ (--coreclr-args) -+ capture="coreclr" -+ arg="" -+ ;; -+ (--libraries-args) -+ capture="libraries" -+ arg="" -+ ;; -+ (--installer-args) -+ capture="installer" -+ arg="" -+ ;; -+ (--additional-args) -+ capture="additional" -+ arg="" -+ ;; -+ (*) ;; -+ esac -+ -+ if [ "$arg" != "" ]; then -+ case $capture in -+ (common) -+ commonArgs="$commonArgs $arg" -+ ;; -+ (coreclr) -+ coreclrArgs="$coreclrArgs $arg" -+ ;; -+ (libraries) -+ librariesArgs="$librariesArgs $arg" -+ ;; -+ (installer) -+ installerArgs="$installerArgs $arg" -+ ;; -+ (additional) -+ additionalArgs="$additionalArgs $arg" -+ ;; -+ (*) ;; -+ esac -+ fi -+done -+ -+echo "commonArgs = [$commonArgs]" -+echo "coreclrArgs = [$coreclrArgs]" -+echo "librariesArgs = [$librariesArgs]" -+echo "installerArgs = [$installerArgs]" -+echo "additionalAgs = [$additionalArgs]" -+ -+echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs -+find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "coreclrBuild.binlog" * {} \; -+ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) -+echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs -+find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; -+echo "Running command: $scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+installers+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs -+find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; --- -2.25.4 - From 06f1d5e0342568d4ad5e892320edf66fc6f63d11 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 8 Feb 2021 08:58:07 -0600 Subject: [PATCH 06/42] Run inner build script, through coreclr --- eng/SourceBuild.props | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 50d9d4401a0f41..423acdbc2b12bf 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -3,7 +3,12 @@ runtime - $(RepositoryEngineeringDir)build-source-build.sh + $(CurrentRepoSourceBuildSourceDir)eng\build-source-build.sh + + + $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false + $(InnerBuildArgs) /p:EnableSourceLink=false + $(InnerBuildArgs) /p:DeterministicSourcePaths=false Date: Mon, 8 Feb 2021 10:47:12 -0600 Subject: [PATCH 07/42] Initial source-build args based on live build (not props file) --- eng/SourceBuild.props | 62 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 423acdbc2b12bf..1178c3b7dfd592 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -2,13 +2,75 @@ runtime + + + $(CurrentRepoSourceBuildSourceDir)eng\build-source-build.sh + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) + $(__DistroRid) + + <_targetRidPlatformIndex>$(TargetRid.LastIndexOfAny("-")) + $(TargetRid.Substring(0, $(_targetRidPlatformIndex))) + $(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-')) + + minimal + + + $(InnerBuildArgs) --arch $(TargetRidPlatform) + $(InnerBuildArgs) --configuration Release + $(InnerBuildArgs) /p:RuntimeConfiguration=Release + $(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 + $(InnerBuildArgs) --binaryLog + $(InnerBuildArgs) --ci + $(InnerBuildArgs) --runtimeConfiguration Release + $(InnerBuildArgs) --verbosity $(LogVerbosity) + $(InnerBuildArgs) --nodereuse false + $(InnerBuildArgs) --warnAsError false $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false $(InnerBuildArgs) /p:EnableSourceLink=false $(InnerBuildArgs) /p:DeterministicSourcePaths=false + + + $(InnerBuildArgs) --coreclr-args + $(InnerBuildArgs) -cmakeargs + $(InnerBuildArgs) -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE + $(InnerBuildArgs) /p:ContinuousIntegrationBuild=true + $(InnerBuildArgs) /p:PackageRid=$(TargetRid) + $(InnerBuildArgs) /p:NoPgoOptimize=true + $(InnerBuildArgs) /p:KeepNativeSymbols=true + $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) + + + $(InnerBuildArgs) --libraries-args + $(InnerBuildArgs) --restore --build --pack + $(InnerBuildArgs) /p:SkipTests=true + $(InnerBuildArgs) /p:ConfigurationGroup=Release + $(InnerBuildArgs) /p:PackageRid=$(TargetRid) + $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) + $(InnerBuildArgs) /p:PortableBuild= + $(InnerBuildArgs) /p:BuildAllPackages=true + $(InnerBuildArgs) /p:BuildAllOOBPackages=true + $(InnerBuildArgs) /p:KeepNativeSymbols=true + $(InnerBuildArgs) /p:BuiltSdkPackageOverride="" + + + $(InnerBuildArgs) --installer-args + $(InnerBuildArgs) /p:PortableBuild= + $(InnerBuildArgs) /p:KeepNativeSymbols=true + $(InnerBuildArgs) -cmakeargs + $(InnerBuildArgs) -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE + $(InnerBuildArgs) /p:BuildDebPackage=false + $(InnerBuildArgs) /p:BuildAllPackages=true + $(InnerBuildArgs) /p:RestoreAllBuildRids=false + $(InnerBuildArgs) /p:OutputRid=$(TargetRid) + $(InnerBuildArgs) /p:DotNetOutputBlobFeedDir=/work/artifacts/obj/x64/Release/blob-feed/ + $(InnerBuildArgs) /p:BuiltSdkPackageOverride="" + $(InnerBuildArgs) --warnAsError false + + $(InnerBuildArgs) --additional-args Date: Mon, 8 Feb 2021 10:55:41 -0600 Subject: [PATCH 08/42] Cleanup: add RID comments, rm empty/absolute args --- eng/SourceBuild.props | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 1178c3b7dfd592..5ad0cfc2163a81 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -8,9 +8,11 @@ $(CurrentRepoSourceBuildSourceDir)eng\build-source-build.sh + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) $(__DistroRid) + <_targetRidPlatformIndex>$(TargetRid.LastIndexOfAny("-")) $(TargetRid.Substring(0, $(_targetRidPlatformIndex))) $(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-')) @@ -54,7 +56,6 @@ $(InnerBuildArgs) /p:BuildAllPackages=true $(InnerBuildArgs) /p:BuildAllOOBPackages=true $(InnerBuildArgs) /p:KeepNativeSymbols=true - $(InnerBuildArgs) /p:BuiltSdkPackageOverride="" $(InnerBuildArgs) --installer-args @@ -66,8 +67,6 @@ $(InnerBuildArgs) /p:BuildAllPackages=true $(InnerBuildArgs) /p:RestoreAllBuildRids=false $(InnerBuildArgs) /p:OutputRid=$(TargetRid) - $(InnerBuildArgs) /p:DotNetOutputBlobFeedDir=/work/artifacts/obj/x64/Release/blob-feed/ - $(InnerBuildArgs) /p:BuiltSdkPackageOverride="" $(InnerBuildArgs) --warnAsError false $(InnerBuildArgs) --additional-args From 59fb50e150bf8ed7bea01b14479ee824e0d11bba Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 8 Feb 2021 11:22:43 -0600 Subject: [PATCH 09/42] Fix subsets --- eng/build-source-build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/build-source-build.sh b/eng/build-source-build.sh index ad1a30435ff7b3..a0d49385a9c6cc 100755 --- a/eng/build-source-build.sh +++ b/eng/build-source-build.sh @@ -73,13 +73,14 @@ echo "librariesArgs = [$librariesArgs]" echo "installerArgs = [$installerArgs]" echo "additionalAgs = [$additionalArgs]" -echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" +set -x + $scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "coreclrBuild.binlog" * {} \; + ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) -echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" $scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; -echo "Running command: $scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" -$scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+installers+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs + +$scriptroot/build.sh $commonArgs -subset Host.Native+Host.Tools+Packs.Product+Packs.Installers $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; From ad4201ba7ac7737ba3a6e87936a2e6d98e70fd5c Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 8 Feb 2021 12:25:02 -0600 Subject: [PATCH 10/42] Disable sourcelink in env, not args --- eng/SourceBuild.props | 11 +++++++---- eng/build-source-build.sh | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 5ad0cfc2163a81..5b8832b6941449 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -30,10 +30,6 @@ $(InnerBuildArgs) --verbosity $(LogVerbosity) $(InnerBuildArgs) --nodereuse false $(InnerBuildArgs) --warnAsError false - - $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false - $(InnerBuildArgs) /p:EnableSourceLink=false - $(InnerBuildArgs) /p:DeterministicSourcePaths=false $(InnerBuildArgs) --coreclr-args @@ -72,6 +68,13 @@ $(InnerBuildArgs) --additional-args + + + + + + + Date: Mon, 8 Feb 2021 12:55:44 -0600 Subject: [PATCH 11/42] Fix CI NZEC --- eng/SourceBuild.props | 1 + eng/build-source-build.sh | 36 +++++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 5b8832b6941449..77419d2a634bcc 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -72,6 +72,7 @@ + diff --git a/eng/build-source-build.sh b/eng/build-source-build.sh index 87b8b51d860cd4..96ac3e9bba3482 100755 --- a/eng/build-source-build.sh +++ b/eng/build-source-build.sh @@ -73,14 +73,36 @@ echo "librariesArgs = [$librariesArgs]" echo "installerArgs = [$installerArgs]" echo "additionalAgs = [$additionalArgs]" -set -x +# Runs a subset build and interprets exit code. +# $1: Arbitrary name for the subset. Names the log files. +# $@: Remaining args are passed along. +# +# In Arcade 6, in CI mode, the build will always exit 0. This is intentional: https://github.com/dotnet/arcade/pull/6635 +# To work around this (because we always build in CI mode for consistency), scan logs for the +# CI-style error reporting line so source-build can return the correct exit code. +subBuild() { + name=$1 + shift + + mkdir "$scriptroot/artifacts" || : + logFile="$scriptroot/artifacts/$name.log" + + # Exit NZEC if build command has NZEC *or* if the log file contains an error log command. + ( + set -x + "$scriptroot/build.sh" $commonArgs "$@" $additionalArgs | tee "$logFile" + ) && ( + # Grep exits 0 if there is a match. Negate, so we exit 0 if there is no match. + ! grep -F '##vso[task.complete result=Failed' "$logFile" + ) + + # Copy each subset binlog to its own file, rather than overwriting. + find $scriptroot/artifacts/ -type f -name sourcebuild.binlog -exec rename "sourcebuild.binlog" "${name}Build.binlog" * {} \; +} -$scriptroot/build.sh $commonArgs -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs -find $scriptroot/artifacts/ -type f -name sourcebuild.binlog -exec rename "sourcebuild.binlog" "coreclrBuild.binlog" * {} \; +subBuild coreclr -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) -$scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs -find $scriptroot/artifacts/ -type f -name sourcebuild.binlog -exec rename "sourcebuild.binlog" "librariesBuild.binlog" * {} \; +subBuild libraries -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath -$scriptroot/build.sh $commonArgs -subset Host.Native+Host.Tools+Packs.Product+Packs.Installers $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs -find $scriptroot/artifacts/ -type f -name sourcebuild.binlog -exec rename "sourcebuild.binlog" "installerBuild.binlog" * {} \; +subBuild installer -subset Host.Native+Host.Tools+Packs.Product+Packs.Installers $installerArgs /p:ILAsmToolPath=$ilasmPath From c4f711d73c62f658e3cc48b8c8380ddeae29e538 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 8 Feb 2021 14:34:23 -0600 Subject: [PATCH 12/42] Revert "Use same code to DetectCiphersuiteConfiguration for portable and non-portable builds" This reverts commit 464010d9d0241bbdcbfbda25b32e78991ddf6093. --- .../pal_ssl.c | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c index 05ae51669a1257..cd949dbf6afaaa 100644 --- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c +++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c @@ -43,18 +43,21 @@ static int32_t g_config_specified_ciphersuites = 0; static void DetectCiphersuiteConfiguration() { - // OpenSSL 1.0 does not support CipherSuites so there is no way for caller to override default - // Always produce g_config_specified_ciphersuites = 1 on OpenSSL 1.0. -#ifdef FEATURE_DISTRO_AGNOSTIC_SSL + // This routine will always produce g_config_specified_ciphersuites = 1 on OpenSSL 1.0.x, + // so if we're building direct for 1.0.x (the only time NEED_OPENSSL_1_1 is undefined) then + // just omit all the code here. + // + // The method uses OpenSSL 1.0.x API, except for the fallback function SSL_CTX_config, to + // make the portable version easier. +#ifdef NEED_OPENSSL_1_1 + if (API_EXISTS(SSL_state)) { + // For portable builds NEED_OPENSSL_1_1 is always set. + // OpenSSL 1.0 does not support CipherSuites so there is no way for caller to override default g_config_specified_ciphersuites = 1; return; } -#elif OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_1_1_0_RTM - g_config_specified_ciphersuites = 1; - return; -#endif // Check to see if there's a registered default CipherString. If not, we will use our own. SSL_CTX* ctx = SSL_CTX_new(TLS_method()); @@ -100,13 +103,21 @@ static void DetectCiphersuiteConfiguration() { ssl = SSL_new(ctx); assert(ssl != NULL); - int systemDefaultCount = sk_SSL_CIPHER_num(SSL_get_ciphers(ssl)); + int after = sk_SSL_CIPHER_num(SSL_get_ciphers(ssl)); SSL_free(ssl); - g_config_specified_ciphersuites = (allCount != systemDefaultCount); + g_config_specified_ciphersuites = (allCount != after); } SSL_CTX_free(ctx); + +#else + + // The Fedora, RHEL, and CentOS builds replace the normal defaults (with a configuration model). + // Consider their non-portable builds to always have specified ciphersuites in config. + g_config_specified_ciphersuites = 1; + +#endif } void CryptoNative_EnsureLibSslInitialized() From 479c95a17eb5f2e5cf76f285a4c15914a619fb2f Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 8 Feb 2021 16:43:11 -0600 Subject: [PATCH 13/42] Fix portability --- eng/SourceBuild.props | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 77419d2a634bcc..4c2e2558e00585 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -8,6 +8,9 @@ $(CurrentRepoSourceBuildSourceDir)eng\build-source-build.sh + true + false + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) $(__DistroRid) @@ -48,14 +51,14 @@ $(InnerBuildArgs) /p:ConfigurationGroup=Release $(InnerBuildArgs) /p:PackageRid=$(TargetRid) $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) - $(InnerBuildArgs) /p:PortableBuild= + $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) $(InnerBuildArgs) /p:BuildAllPackages=true $(InnerBuildArgs) /p:BuildAllOOBPackages=true $(InnerBuildArgs) /p:KeepNativeSymbols=true $(InnerBuildArgs) --installer-args - $(InnerBuildArgs) /p:PortableBuild= + $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) $(InnerBuildArgs) /p:KeepNativeSymbols=true $(InnerBuildArgs) -cmakeargs $(InnerBuildArgs) -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE From 25654319baf40211eea9f307c2b7fc97898b4979 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 8 Feb 2021 17:11:09 -0600 Subject: [PATCH 14/42] Fix AllJits build --- eng/build-source-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build-source-build.sh b/eng/build-source-build.sh index 96ac3e9bba3482..0e407e469e8a23 100755 --- a/eng/build-source-build.sh +++ b/eng/build-source-build.sh @@ -100,7 +100,7 @@ subBuild() { find $scriptroot/artifacts/ -type f -name sourcebuild.binlog -exec rename "sourcebuild.binlog" "${name}Build.binlog" * {} \; } -subBuild coreclr -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs +subBuild coreclr -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages+Clr.Jit+Clr.AllJits $coreclrArgs ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) subBuild libraries -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath From cd313cd07a4e3308c4087047bcec8e7c6edf145b Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 12 Feb 2021 11:11:04 -0600 Subject: [PATCH 15/42] Fix missing crossgen2 for non-portable RID --- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index ec198224a2eb6f..51dc61d878339c 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -9,7 +9,8 @@ Microsoft.NETCore.App.Crossgen2.$(RuntimeIdentifier) dotnet-crossgen2 crossgen2 - linux-x64;linux-musl-x64;osx-x64;osx-arm64;win-x64 + + linux-x64;linux-musl-x64;osx-x64;osx-arm64;win-x64 false AddRuntimeFilesToPackage; From 2b5307dbbd7122d73f10ff8bd44b7ac61023e894 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 12 Feb 2021 12:43:23 -0600 Subject: [PATCH 16/42] Create supplemental intermediate nupkgs --- eng/SourceBuild.props | 121 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 4c2e2558e00585..069e82b6f6f5c3 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -71,6 +71,10 @@ $(InnerBuildArgs) --additional-args + + false + + @@ -94,4 +98,121 @@ Condition="'@(SourceBuildPatchFile)' != ''" /> + + + + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-hostfxr-internal-*.tar.gz" Category="hostfxr-internal" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-internal-*.tar.gz" Category="runtime-internal" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-*.tar.gz" Category="RuntimePack.archive" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Runtime.*.nupkg" Category="RuntimePack" /> + + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*.tar.gz" Category="Crossgen2Pack.archive" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-apphost-pack-*.tar.gz" Category="HostPack.archive" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-targeting-pack-*.tar.gz" Category="RefPack.archive" /> + + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Crossgen2.*.nupkg" Category="Crossgen2Pack" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Host.*.nupkg" Category="HostPack" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Ref.*.nupkg" Category="RefPack" /> + + <_intermediateArtifactFile + Include=" + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-ilverify.*.nupkg; + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NET.Sdk.IL.*.nupkg; + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*Microsoft.NETCore.ILAsm.*.nupkg; + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*Microsoft.NETCore.ILDAsm.*.nupkg; + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*Microsoft.NETCore.TestHost.*.nupkg" + Category="CoreCLR" /> + + <_intermediateArtifactFile + Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)NonShipping\Microsoft.NET.HostModel.*.nupkg;" + Category="HostLibraries" /> + + <_intermediateArtifactFile + Include=" + $(CurrentRepoSourceBuildArtifactsPackagesDir)NonShipping\Microsoft.*.nupkg; + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.*.nupkg; + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\System.*.nupkg" + Category="Libraries" /> + + + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.nupkg" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.tar.gz" /> + + <_intermediateArtifactFile Remove="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.symbols.nupkg" /> + + <_intermediateFile Include="@(_intermediateArtifactFile)" PackagePath="artifacts" /> + + + <_intermediateFile Include="$(SourceBuildSelfPrebuiltReportDir)**\*" PackagePath="prebuilt-report" /> + + + + + + + + + + + + + + $(BaseOutputPath)SupplementalIntermediatePackages.txt + + + + + + + + + + + + + + + + + + $(SourceBuildIntermediateNupkgPrefix)$(GitHubRepositoryName).$(SupplementalIntermediateNupkgCategory)$(SourceBuildIntermediateNupkgSuffix) + + + + + + + + + + + + From d7546c5025ad1f2d952c063085d20f78cf116777 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 16 Feb 2021 10:01:28 -0600 Subject: [PATCH 17/42] Tweak category names --- eng/SourceBuild.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 069e82b6f6f5c3..e2cd15dcacf537 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -106,16 +106,16 @@ --> <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-hostfxr-internal-*.tar.gz" Category="hostfxr-internal" /> <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-internal-*.tar.gz" Category="runtime-internal" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-*.tar.gz" Category="RuntimePack.archive" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Runtime.*.nupkg" Category="RuntimePack" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-*.tar.gz" Category="runtime" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*.tar.gz" Category="Crossgen2Pack.archive" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-apphost-pack-*.tar.gz" Category="HostPack.archive" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-targeting-pack-*.tar.gz" Category="RefPack.archive" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*.tar.gz" Category="Crossgen2Pack.Archive" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-apphost-pack-*.tar.gz" Category="HostPack.Archive" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-targeting-pack-*.tar.gz" Category="RefPack.Archive" /> <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Crossgen2.*.nupkg" Category="Crossgen2Pack" /> <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Host.*.nupkg" Category="HostPack" /> <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Ref.*.nupkg" Category="RefPack" /> + <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Runtime.*.nupkg" Category="RuntimePack" /> <_intermediateArtifactFile Include=" From d6602eb37d88007d49acabb5b7a4890a2031f6c5 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 16 Feb 2021 11:20:07 -0600 Subject: [PATCH 18/42] Use centralized supplemental nupkg infra --- eng/SourceBuild.props | 116 ++++++++---------------------------------- 1 file changed, 20 insertions(+), 96 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index e2cd15dcacf537..14abff3723e47f 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -71,10 +71,6 @@ $(InnerBuildArgs) --additional-args - - false - - @@ -98,121 +94,49 @@ Condition="'@(SourceBuildPatchFile)' != ''" /> - + - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-hostfxr-internal-*.tar.gz" Category="hostfxr-internal" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-internal-*.tar.gz" Category="runtime-internal" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-*.tar.gz" Category="runtime" /> + + + - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*.tar.gz" Category="Crossgen2Pack.Archive" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-apphost-pack-*.tar.gz" Category="HostPack.Archive" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-targeting-pack-*.tar.gz" Category="RefPack.Archive" /> + + + - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Crossgen2.*.nupkg" Category="Crossgen2Pack" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Host.*.nupkg" Category="HostPack" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Ref.*.nupkg" Category="RefPack" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Runtime.*.nupkg" Category="RuntimePack" /> + + + + - <_intermediateArtifactFile + - <_intermediateArtifactFile + - <_intermediateArtifactFile + - - - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.nupkg" /> - <_intermediateArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.tar.gz" /> - - <_intermediateArtifactFile Remove="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.symbols.nupkg" /> - - <_intermediateFile Include="@(_intermediateArtifactFile)" PackagePath="artifacts" /> - - - <_intermediateFile Include="$(SourceBuildSelfPrebuiltReportDir)**\*" PackagePath="prebuilt-report" /> - - - - - - - - - - - $(BaseOutputPath)SupplementalIntermediatePackages.txt - - - - - - - - - - - - - - - - - - $(SourceBuildIntermediateNupkgPrefix)$(GitHubRepositoryName).$(SupplementalIntermediateNupkgCategory)$(SourceBuildIntermediateNupkgSuffix) - - - - - - - - - - - - From a7d8b9569a76cda1829492986fcb3f5a806a7b2f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 27 Apr 2021 15:05:16 +0000 Subject: [PATCH 19/42] Add additional 6.0 patches --- ...t.Extensions.Hosting.WindowsServices.patch | 24 +++++++++ .../0035-Update-linker-arguments.patch | 52 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch create mode 100644 eng/source-build-patches/0035-Update-linker-arguments.patch diff --git a/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch b/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch new file mode 100644 index 00000000000000..4073bad8069bae --- /dev/null +++ b/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch @@ -0,0 +1,24 @@ +From 6521f8a43f5c146efc72b72dd3b0e61344a71618 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Mon, 15 Mar 2021 19:00:55 +0000 +Subject: [PATCH] Exclude Microsoft.Extensions.Hosting.WindowsServices from + source-build + +--- + .../Directory.Build.props | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props +index c5f4d2e6da1..5493f19bc19 100644 +--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props ++++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props +@@ -3,5 +3,7 @@ + + .NET hosting infrastructure for Windows Services. + hosting ++ ++ true + + +-- +2.25.4 diff --git a/eng/source-build-patches/0035-Update-linker-arguments.patch b/eng/source-build-patches/0035-Update-linker-arguments.patch new file mode 100644 index 00000000000000..59fd3e44177e43 --- /dev/null +++ b/eng/source-build-patches/0035-Update-linker-arguments.patch @@ -0,0 +1,52 @@ +From b3247ebbe75d304a8660b970b27cc781082f7fbe Mon Sep 17 00:00:00 2001 +From: Dan Seefeldt +Date: Thu, 22 Apr 2021 13:01:19 -0500 +Subject: [PATCH] Update linker arguments + +source-build is building version 6.0.100-preview.2.21174.1 of linker while +runtime has a dependency on version 6.0.100-preview.2.21118.4. The newer +version doesn't support -c or -u. See https://github.com/dotnet/runtime/pull/48780. +Once runtime is building with this commit, this patch can be removed. +--- + eng/illink.targets | 10 +++++----- + src/libraries/illink-sharedframework.targets | 3 --- + 2 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/eng/illink.targets b/eng/illink.targets +index 4d48845507a..a617537e6fa 100644 +--- a/eng/illink.targets ++++ b/eng/illink.targets +@@ -232,12 +232,12 @@ + Condition="'$(ILLinkTrimAssembly)' == 'true'" + DependsOnTargets="SetCommonILLinkArgs"> + +- +- $(ILLinkArgs) -c skip +- +- $(ILLinkArgs) -u skip ++ ++ $(ILLinkArgs) --trim-mode skip ++ ++ $(ILLinkArgs) --action skip + +- $(ILLinkArgs) -p link $(TargetName) ++ $(ILLinkArgs) --action link $(TargetName) + $(ILLinkArgs) -b true + + $(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)" +diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets +index 264c03533ba..c2a716bccaa 100644 +--- a/src/libraries/illink-sharedframework.targets ++++ b/src/libraries/illink-sharedframework.targets +@@ -11,9 +11,6 @@ + + + +- +- $(ILLinkArgs) -c link +- $(ILLinkArgs) -u link + + $(ILLinkArgs) -b true + $(InnerBuildArgs) --installer-args + $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) $(InnerBuildArgs) /p:KeepNativeSymbols=true $(InnerBuildArgs) -cmakeargs @@ -80,6 +81,20 @@ + + + + + + + + + diff --git a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch index d91e64c6d1fc47..84c9df981833f7 100644 --- a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch +++ b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch @@ -13,8 +13,8 @@ index cc4a7b62914..cef8de452b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,6 +167,4 @@ - 9.0.1-alpha.1.21101.1 - 9.0.1-alpha.1.21101.1 + 9.0.1-alpha.1.21219.1 + 9.0.1-alpha.1.21219.1 - - diff --git a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch index f6e75f86066ebb..d827de3f48da3b 100644 --- a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch +++ b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch @@ -26,7 +26,7 @@ index 0548b4468af..7460e44616b 100644 + true - + - + false -- 2.25.4 diff --git a/eng/source-build-patches/0013-Remove--Browser-TFM.patch b/eng/source-build-patches/0013-Remove--Browser-TFM.patch index 1c4bd2908bc59e..93b779bb5aa520 100644 --- a/eng/source-build-patches/0013-Remove--Browser-TFM.patch +++ b/eng/source-build-patches/0013-Remove--Browser-TFM.patch @@ -14,16 +14,15 @@ artifacts/src/runtime.bf456654f9a4f9a86c15d9d50095ff29cde5f0a4/src/libraries/Nat 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj -index 90ccdc04e80..e29a3e3d909 100644 +index 133c02e..ad2eadd 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj -@@ -1,7 +1,7 @@ +@@ -1,6 +1,6 @@ +- $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) ++ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent);net47 true -- $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;net47 -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;net47;$(NetFrameworkCurrent) - true enable -- diff --git a/eng/source-build-patches/0017-trim-clr.tools.patch b/eng/source-build-patches/0017-trim-clr.tools.patch index d1832b34b90a41..c86820b227a4fc 100644 --- a/eng/source-build-patches/0017-trim-clr.tools.patch +++ b/eng/source-build-patches/0017-trim-clr.tools.patch @@ -20,15 +20,15 @@ index ce3049f51cb..a2363fcd2b0 100644 host.native+host.pkg+host.tools+host.tests -@@ -188,11 +189,11 @@ +@@ -201,12 +201,11 @@ -+ $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'" /> -+ ++ $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> + + Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64' and '$(DotNetBuildFromSource)' != 'true'"/> diff --git a/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch b/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch index d466940d9fa126..2f0126d4222303 100644 --- a/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch +++ b/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch @@ -5,22 +5,9 @@ Subject: [PATCH] Remove tag to prevent aspnet pack from loading --- - src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 1 - src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj | 1 - - 2 files changed, 2 deletions(-) + 1 files changed, 1 deletions(-) -diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj -index e4805e45bd9..eae0d51ff0b 100644 ---- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj -+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj -@@ -12,7 +12,6 @@ - $(RuntimeBinDir)/crossgen2 - true - false -- linux-x64;linux-musl-x64;osx-x64;win-x64 - Debug;Release;Checked - true - diff --git a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj index dbe495a3d24..781fd33ac42 100644 --- a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj @@ -30,9 +17,9 @@ index dbe495a3d24..781fd33ac42 100644 true false - linux-x64;linux-musl-x64;win-x64 - - - + true + true + dotnet-pgo -- 2.25.4 diff --git a/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch b/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch index 2caccccd8d7254..690c28939fbe27 100644 --- a/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch +++ b/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch @@ -17,14 +17,14 @@ index e9db368ef24..c396c21a798 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -639,7 +639,7 @@ - - - + + + - + - - - + + + -- 2.25.4 diff --git a/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch b/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch index 2e9a8423b55c5b..1baed6ae61f2b5 100644 --- a/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch +++ b/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch @@ -8,15 +8,15 @@ Subject: [PATCH] Update nuget versions to version in SBRP 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props -index cef8de452b4..f17e627eda2 100644 +index f459c77..bc6d52a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -137,8 +137,8 @@ +@@ -148,8 +148,8 @@ $(RefOnlyMicrosoftBuildVersion) $(RefOnlyMicrosoftBuildVersion) $(RefOnlyMicrosoftBuildVersion) -- 4.9.4 -- 4.9.4 +- 5.8.0 +- 5.8.0 + 5.1.0 + 5.1.0 diff --git a/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch b/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch index b268accf582333..67ef4da8da5a08 100644 --- a/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch +++ b/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch @@ -15,7 +15,7 @@ index 603d523df55..38cd7e74337 100644 $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\ -- $(PackagingTaskAssembly)netcoreapp2.1\ +- $(PackagingTaskAssembly)netcoreapp3.1\ + $(PackagingTaskAssembly)net5.0\ $(PackagingTaskAssembly)net472\ $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll diff --git a/eng/source-build-patches/0035-Update-linker-arguments.patch b/eng/source-build-patches/0035-Update-linker-arguments.patch deleted file mode 100644 index 59fd3e44177e43..00000000000000 --- a/eng/source-build-patches/0035-Update-linker-arguments.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b3247ebbe75d304a8660b970b27cc781082f7fbe Mon Sep 17 00:00:00 2001 -From: Dan Seefeldt -Date: Thu, 22 Apr 2021 13:01:19 -0500 -Subject: [PATCH] Update linker arguments - -source-build is building version 6.0.100-preview.2.21174.1 of linker while -runtime has a dependency on version 6.0.100-preview.2.21118.4. The newer -version doesn't support -c or -u. See https://github.com/dotnet/runtime/pull/48780. -Once runtime is building with this commit, this patch can be removed. ---- - eng/illink.targets | 10 +++++----- - src/libraries/illink-sharedframework.targets | 3 --- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/eng/illink.targets b/eng/illink.targets -index 4d48845507a..a617537e6fa 100644 ---- a/eng/illink.targets -+++ b/eng/illink.targets -@@ -232,12 +232,12 @@ - Condition="'$(ILLinkTrimAssembly)' == 'true'" - DependsOnTargets="SetCommonILLinkArgs"> - -- -- $(ILLinkArgs) -c skip -- -- $(ILLinkArgs) -u skip -+ -+ $(ILLinkArgs) --trim-mode skip -+ -+ $(ILLinkArgs) --action skip - -- $(ILLinkArgs) -p link $(TargetName) -+ $(ILLinkArgs) --action link $(TargetName) - $(ILLinkArgs) -b true - - $(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)" -diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets -index 264c03533ba..c2a716bccaa 100644 ---- a/src/libraries/illink-sharedframework.targets -+++ b/src/libraries/illink-sharedframework.targets -@@ -11,9 +11,6 @@ - - - -- -- $(ILLinkArgs) -c link -- $(ILLinkArgs) -u link - - $(ILLinkArgs) -b true - - From aa13d3cb8094bb7f73b4d125c273bb24be104540 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 3 May 2021 12:55:17 +0000 Subject: [PATCH 22/42] Fix issue with incorrect patch merge --- eng/source-build-patches/0017-trim-clr.tools.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/source-build-patches/0017-trim-clr.tools.patch b/eng/source-build-patches/0017-trim-clr.tools.patch index c86820b227a4fc..bd240df64e7520 100644 --- a/eng/source-build-patches/0017-trim-clr.tools.patch +++ b/eng/source-build-patches/0017-trim-clr.tools.patch @@ -9,10 +9,10 @@ dagood: (6.0) used '$(DotNetBuildFromSource)' != 'true' in fixup 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props -index ce3049f51cb..a2363fcd2b0 100644 +index 24b4bd2..5e6e299 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props -@@ -49,6 +49,7 @@ +@@ -51,6 +51,7 @@ $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages libs.native+libs.ref+libs.src+libs.pretest+libs.packages @@ -20,13 +20,14 @@ index ce3049f51cb..a2363fcd2b0 100644 host.native+host.pkg+host.tools+host.tests -@@ -201,12 +201,11 @@ +@@ -201,12 +202,12 @@ + $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> ++ Date: Tue, 4 May 2021 15:13:52 +0000 Subject: [PATCH 23/42] Patch updates --- .../0013-Remove--Browser-TFM.patch | 2 +- ...te-nuget-versions-to-version-in-SBRP.patch | 27 ------------------- ...0035-cross-gen-corelib-no-mibc-files.patch | 27 +++++++++++++++++++ ...eadyToRun.Experimental-NuGet-package.patch | 27 +++++++++++++++++++ 4 files changed, 55 insertions(+), 28 deletions(-) delete mode 100644 eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch create mode 100644 eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch create mode 100644 eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch diff --git a/eng/source-build-patches/0013-Remove--Browser-TFM.patch b/eng/source-build-patches/0013-Remove--Browser-TFM.patch index 93b779bb5aa520..24863626d100eb 100644 --- a/eng/source-build-patches/0013-Remove--Browser-TFM.patch +++ b/eng/source-build-patches/0013-Remove--Browser-TFM.patch @@ -21,7 +21,7 @@ index 133c02e..ad2eadd 100644 - $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent);net47 ++ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent);$(NetFrameworkCurrent) true enable diff --git a/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch b/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch deleted file mode 100644 index 1baed6ae61f2b5..00000000000000 --- a/eng/source-build-patches/0026-Update-nuget-versions-to-version-in-SBRP.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8afeee8f76edbd6046efbaf9a2f3b2546de88a50 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 27 Oct 2020 17:38:33 +0000 -Subject: [PATCH] Update nuget versions to version in SBRP - ---- - eng/Versions.props | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index f459c77..bc6d52a 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -148,8 +148,8 @@ - $(RefOnlyMicrosoftBuildVersion) - $(RefOnlyMicrosoftBuildVersion) - $(RefOnlyMicrosoftBuildVersion) -- 5.8.0 -- 5.8.0 -+ 5.1.0 -+ 5.1.0 - - 1.0.1-prerelease-00006 - 16.9.0-preview-20201201-01 --- -2.25.4 - diff --git a/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch b/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch new file mode 100644 index 00000000000000..51500070a79b6d --- /dev/null +++ b/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch @@ -0,0 +1,27 @@ +From b473825eaa9540131b9b7181274e3e6547eed02b Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Mon, 3 May 2021 15:29:02 +0000 +Subject: [PATCH] cross-gen-corelib.proj fix related to PR 50536 to handle no + mibc files + +--- + src/coreclr/crossgen-corelib.proj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj +index 53c4e57..0a8f17a 100644 +--- a/src/coreclr/crossgen-corelib.proj ++++ b/src/coreclr/crossgen-corelib.proj +@@ -100,7 +100,8 @@ + $(CrossGenDllCmd) -o:$(CoreLibOutputPath) + $(CrossGenDllCmd) -r:$([MSBuild]::NormalizePath('$(BinDir)', 'IL', '*.dll')) + $(CrossGenDllCmd) --targetarch:$(TargetArchitecture) +- $(CrossGenDllCmd) -m:$(MergedMibcPath) --embed-pgo-data ++ @(OptimizationMibcFiles->'-m:$(MergedMibcPath)', ' ') ++ $(CrossGenDllCmd) $(MibcArgs) --embed-pgo-data + $(CrossGenDllCmd) -O + $(CrossGenDllCmd) $(CoreLibInputPath) + +-- +1.8.3.1 + diff --git a/eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch b/eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch new file mode 100644 index 00000000000000..0813aba85574cf --- /dev/null +++ b/eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch @@ -0,0 +1,27 @@ +From 39e09e379d1511bdf4d9484f1ae0efdd516894fa Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Mon, 3 May 2021 15:35:38 +0000 +Subject: [PATCH] Exclude ReadyToRun.Experimental NuGet package + +Not required by SDK and depends on non-SB components (e.g. r2rdump) +--- + src/coreclr/.nuget/coreclr-packages.proj | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/coreclr/.nuget/coreclr-packages.proj b/src/coreclr/.nuget/coreclr-packages.proj +index 2f7d06a..b8aec3a 100644 +--- a/src/coreclr/.nuget/coreclr-packages.proj ++++ b/src/coreclr/.nuget/coreclr-packages.proj +@@ -13,6 +13,9 @@ + + + ++ ++ ++ + + + +-- +1.8.3.1 + From f5445eecf8917780ea7992d09d5e4fac8f205ea8 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 14 May 2021 16:01:36 +0000 Subject: [PATCH 24/42] Edit clr.tools patch --- eng/source-build-patches/0017-trim-clr.tools.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/eng/source-build-patches/0017-trim-clr.tools.patch b/eng/source-build-patches/0017-trim-clr.tools.patch index bd240df64e7520..5fac6f0e866560 100644 --- a/eng/source-build-patches/0017-trim-clr.tools.patch +++ b/eng/source-build-patches/0017-trim-clr.tools.patch @@ -5,8 +5,8 @@ Subject: [PATCH] runtime: trim clr.tools dagood: (6.0) used '$(DotNetBuildFromSource)' != 'true' in fixup --- - eng/Subsets.props | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) + eng/Subsets.props | 9 ++++--- + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 24b4bd2..5e6e299 100644 @@ -36,6 +36,15 @@ index 24b4bd2..5e6e299 100644 +@@ -218,7 +218,7 @@ + + + +- ++ + + + -- 2.25.4 From 0a8059d7ead5f9d0d68a2a66511833fed9a1b53b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 14 May 2021 16:42:23 +0000 Subject: [PATCH 25/42] patch updates --- ...move-import-of-PackageVersionProps-from-eng-Vervsi.patch | 4 ++-- ...-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch | 2 +- ...n-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch | 4 ++-- ...n-System.Security.Cryptography.Cng-to-single-versi.patch | 2 +- .../0033-Build-net4-in-source-build.patch | 6 +++--- ...clude-Microsoft.Extensions.Hosting.WindowsServices.patch | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch index 84c9df981833f7..88a4bbf4509088 100644 --- a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch +++ b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch @@ -13,8 +13,8 @@ index cc4a7b62914..cef8de452b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,6 +167,4 @@ - 9.0.1-alpha.1.21219.1 - 9.0.1-alpha.1.21219.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 - - diff --git a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch index d827de3f48da3b..8628ba8d06a926 100644 --- a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch +++ b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch @@ -26,7 +26,7 @@ index 0548b4468af..7460e44616b 100644 + true - + true From 9b2c5b30a72319f9b5b9083c6707b19d2e55560e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 14 May 2021 16:54:10 +0000 Subject: [PATCH 26/42] Revert patch integration --- ...ssing-crossgen2-for-non-portable-RID.patch | 25 +++++++++++++++++++ .../Microsoft.NETCore.App.Crossgen2.sfxproj | 3 +-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch diff --git a/eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch b/eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch new file mode 100644 index 00000000000000..89950b8698154e --- /dev/null +++ b/eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch @@ -0,0 +1,25 @@ +From a3b356e19adaa1b001fdf6de79896ed85ec74df5 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 12 Feb 2021 11:11:04 -0600 +Subject: [PATCH] Fix missing crossgen2 for non-portable RID + +--- + .../Microsoft.NETCore.App.Crossgen2.sfxproj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +index ec198224a2e..51dc61d8783 100644 +--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj ++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +@@ -9,7 +9,8 @@ + $(SharedFrameworkName)$(PgoSuffix).$(RuntimeIdentifier) + dotnet-crossgen2 + crossgen2 +- linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm ++ ++ linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm + false + + AddRuntimeFilesToPackage; +-- +2.25.4 diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index e382bbac090e83..e9cd505eea1690 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -10,8 +10,7 @@ $(SharedFrameworkName)$(PgoSuffix).$(RuntimeIdentifier) dotnet-crossgen2 crossgen2 - - linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm + linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm false AddRuntimeFilesToPackage; From 23e4735e5cc9956d3f3b351a252f0b1622a14cec Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 26 May 2021 13:56:15 +0000 Subject: [PATCH 27/42] Patch updates --- ...-PackageVersionProps-from-eng-Vervsi.patch | 4 +-- .../0010-remove-netcoreapp2.x-targetx.patch | 10 +++---- .../0017-trim-clr.tools.patch | 17 +++++++----- .../0033-Build-net4-in-source-build.patch | 26 +++++++++---------- ...t.Extensions.Hosting.WindowsServices.patch | 7 ++--- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch index 88a4bbf4509088..dda1478470cdc0 100644 --- a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch +++ b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch @@ -13,8 +13,8 @@ index cc4a7b62914..cef8de452b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,6 +167,4 @@ - 9.0.1-alpha.1.21260.1 - 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21267.1 + 9.0.1-alpha.1.21267.1 - - diff --git a/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch b/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch index 6420a92319b3ad..e806f78ad3cf4b 100644 --- a/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch +++ b/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch @@ -27,8 +27,8 @@ diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build index 3daf1a941be..94606e51460 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props -@@ -33,6 +33,24 @@ - $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) +@@ -45,6 +45,24 @@ + false + @@ -49,9 +49,9 @@ index 3daf1a941be..94606e51460 100644 + $(TargetFrameworks.Trim(';')) + + - - - false + + + -- 2.25.4 diff --git a/eng/source-build-patches/0017-trim-clr.tools.patch b/eng/source-build-patches/0017-trim-clr.tools.patch index 5fac6f0e866560..ff94894cc8bb6b 100644 --- a/eng/source-build-patches/0017-trim-clr.tools.patch +++ b/eng/source-build-patches/0017-trim-clr.tools.patch @@ -12,12 +12,17 @@ diff --git a/eng/Subsets.props b/eng/Subsets.props index 24b4bd2..5e6e299 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props -@@ -51,6 +51,7 @@ - $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages - - libs.native+libs.ref+libs.src+libs.pretest+libs.packages -+ libs.native+libs.ref+libs.src+libs.packages - +@@ -52,8 +52,11 @@ + + libs.native+ +- $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.pretest+libs.packages ++ $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.packages ++ $(DefaultLibrariesSubsets)libs.pretest ++ + host.native+host.pkg+host.tools+host.tests @@ -201,12 +202,12 @@ diff --git a/eng/source-build-patches/0033-Build-net4-in-source-build.patch b/eng/source-build-patches/0033-Build-net4-in-source-build.patch index 74c6d05f9f111b..2d924b7283cc35 100644 --- a/eng/source-build-patches/0033-Build-net4-in-source-build.patch +++ b/eng/source-build-patches/0033-Build-net4-in-source-build.patch @@ -37,19 +37,19 @@ diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build index 94606e51460..807578c11ed 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props -@@ -26,8 +26,10 @@ +@@ -27,8 +27,10 @@ + - $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)', '(-[^;]+)', '')) - net45;net451;net452;net46;net461;net462;net47;net471;net472 - $(AdditionalBuildTargetFrameworks);netstandard2.0 + net45;net451;net452;net46;net461;net462;net47;net471;net472 -+ $(AdditionalBuildTargetFrameworks);$(NETFrameworkTargetFrameworksExcept48) -+ $(AdditionalBuildTargetFrameworks);netstandard2.0;net48;$(NETFrameworkTargetFrameworksExcept48) -+ - - $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) - $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) ++ $(NETFrameworkTargetFrameworksExcept48) ++ $(AdditionalBuildTargetFrameworks);netstandard2.0 ++ $(NETFrameworkTargetFrameworksExcept48);net48;netstandard2.0 + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index e1dad4a470d..ac14aaad7d6 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -69,20 +69,20 @@ index 4adc0b2edb5..66d4e2aa47d 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -10,7 +10,7 @@ - - - + + + - + - + diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj index 50d5af47646..3451105192e 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -13,7 +13,7 @@ - + - diff --git a/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch b/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch index 03ef7cb36ec316..714964bfa5e682 100644 --- a/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch +++ b/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch @@ -5,19 +5,20 @@ Subject: [PATCH] Exclude Microsoft.Extensions.Hosting.WindowsServices from source-build --- - .../Directory.Build.props | 2 ++ - 1 file changed, 2 insertions(+) + .../Directory.Build.props | 3 ++ + 1 file changed, 3 insertions(+) diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props index c5f4d2e6da1..5493f19bc19 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props -@@ -3,5 +3,7 @@ +@@ -2,5 +2,8 @@ hosting + + true ++ false -- From 5a12eafca6ba4ede8038de9ad7972f3662af58f6 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 8 Jun 2021 02:46:06 +0000 Subject: [PATCH 28/42] Edits per code review feedback --- eng/SourceBuild.props | 41 ++-------- eng/Subsets.props | 6 +- eng/build-source-build.sh | 108 -------------------------- src/libraries/Directory.Build.targets | 4 + 4 files changed, 16 insertions(+), 143 deletions(-) delete mode 100755 eng/build-source-build.sh diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index c46be420aa28d0..46c3b443214042 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -6,7 +6,7 @@ - $(CurrentRepoSourceBuildSourceDir)eng\build-source-build.sh + ./build.sh true false @@ -22,54 +22,26 @@ minimal - $(InnerBuildArgs) --arch $(TargetRidPlatform) - $(InnerBuildArgs) --configuration Release - $(InnerBuildArgs) /p:RuntimeConfiguration=Release - $(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 - $(InnerBuildArgs) --binaryLog + $(InnerBuildArgs) --configuration $(Configuration) $(InnerBuildArgs) --ci - $(InnerBuildArgs) --runtimeConfiguration Release + $(InnerBuildArgs) --runtimeConfiguration $(Configuration) $(InnerBuildArgs) --verbosity $(LogVerbosity) $(InnerBuildArgs) --nodereuse false $(InnerBuildArgs) --warnAsError false - - - $(InnerBuildArgs) --coreclr-args - $(InnerBuildArgs) -cmakeargs - $(InnerBuildArgs) -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE + $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE + $(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 $(InnerBuildArgs) /p:ContinuousIntegrationBuild=true $(InnerBuildArgs) /p:PackageRid=$(TargetRid) $(InnerBuildArgs) /p:NoPgoOptimize=true $(InnerBuildArgs) /p:KeepNativeSymbols=true $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) - - - $(InnerBuildArgs) --libraries-args - $(InnerBuildArgs) --restore --build --pack - $(InnerBuildArgs) /p:SkipTests=true - $(InnerBuildArgs) /p:ConfigurationGroup=Release - $(InnerBuildArgs) /p:PackageRid=$(TargetRid) - $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) + $(InnerBuildArgs) /p:ConfigurationGroup=$(Configuration) $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) $(InnerBuildArgs) /p:BuildAllPackages=true $(InnerBuildArgs) /p:BuildAllOOBPackages=true - $(InnerBuildArgs) /p:KeepNativeSymbols=true - - - $(InnerBuildArgs) --installer-args - - $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) - $(InnerBuildArgs) /p:KeepNativeSymbols=true - $(InnerBuildArgs) -cmakeargs - $(InnerBuildArgs) -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE $(InnerBuildArgs) /p:BuildDebPackage=false - $(InnerBuildArgs) /p:BuildAllPackages=true - $(InnerBuildArgs) /p:RestoreAllBuildRids=false - $(InnerBuildArgs) /p:OutputRid=$(TargetRid) - $(InnerBuildArgs) --warnAsError false - $(InnerBuildArgs) --additional-args @@ -80,6 +52,7 @@ + diff --git a/eng/Subsets.props b/eng/Subsets.props index bf6b25bffc7317..58713238ff200f 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -25,6 +25,7 @@ clr+mono+libs+host+packs mono+libs+packs + clr+libs+host+packs clr+libs+host+packs @@ -43,13 +44,14 @@ clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages + clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages+clr.jit+clr.alljits mono.llvm+ mono.llvm+ $(DefaultMonoSubsets)mono.wasmruntime+ $(DefaultMonoSubsets)mono.aotcross+ $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages - + libs.native+ @@ -58,9 +60,11 @@ host.native+host.pkg+host.tools+host.tests host.native + host.native+host.tools packs.product $(DefaultPacksSubsets)+packs.tests + packs.product+packs.installers diff --git a/eng/build-source-build.sh b/eng/build-source-build.sh deleted file mode 100755 index 0e407e469e8a23..00000000000000 --- a/eng/build-source-build.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -source="${BASH_SOURCE[0]}" - -# resolve $SOURCE until the file is no longer a symlink -while [[ -h $source ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done - -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )/.." - -capture="common" -commonArgs= -coreclrArgs= -librariesArgs= -installerArgs= -additionalArgs= - -for arg do - shift - opt="$(echo "$arg" | awk '{print tolower($0)}')" - case $opt in - (--coreclr-args) - capture="coreclr" - arg="" - ;; - (--libraries-args) - capture="libraries" - arg="" - ;; - (--installer-args) - capture="installer" - arg="" - ;; - (--additional-args) - capture="additional" - arg="" - ;; - (*) ;; - esac - - if [ "$arg" != "" ]; then - case $capture in - (common) - commonArgs="$commonArgs $arg" - ;; - (coreclr) - coreclrArgs="$coreclrArgs $arg" - ;; - (libraries) - librariesArgs="$librariesArgs $arg" - ;; - (installer) - installerArgs="$installerArgs $arg" - ;; - (additional) - additionalArgs="$additionalArgs $arg" - ;; - (*) ;; - esac - fi -done - -echo "commonArgs = [$commonArgs]" -echo "coreclrArgs = [$coreclrArgs]" -echo "librariesArgs = [$librariesArgs]" -echo "installerArgs = [$installerArgs]" -echo "additionalAgs = [$additionalArgs]" - -# Runs a subset build and interprets exit code. -# $1: Arbitrary name for the subset. Names the log files. -# $@: Remaining args are passed along. -# -# In Arcade 6, in CI mode, the build will always exit 0. This is intentional: https://github.com/dotnet/arcade/pull/6635 -# To work around this (because we always build in CI mode for consistency), scan logs for the -# CI-style error reporting line so source-build can return the correct exit code. -subBuild() { - name=$1 - shift - - mkdir "$scriptroot/artifacts" || : - logFile="$scriptroot/artifacts/$name.log" - - # Exit NZEC if build command has NZEC *or* if the log file contains an error log command. - ( - set -x - "$scriptroot/build.sh" $commonArgs "$@" $additionalArgs | tee "$logFile" - ) && ( - # Grep exits 0 if there is a match. Negate, so we exit 0 if there is no match. - ! grep -F '##vso[task.complete result=Failed' "$logFile" - ) - - # Copy each subset binlog to its own file, rather than overwriting. - find $scriptroot/artifacts/ -type f -name sourcebuild.binlog -exec rename "sourcebuild.binlog" "${name}Build.binlog" * {} \; -} - -subBuild coreclr -subset clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages+Clr.Jit+Clr.AllJits $coreclrArgs - -ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) -subBuild libraries -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath - -subBuild installer -subset Host.Native+Host.Tools+Packs.Product+Packs.Installers $installerArgs /p:ILAsmToolPath=$ilasmPath diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index f166ddc4aadef0..d9490e2212d39e 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -52,6 +52,10 @@ '$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and ('$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true')">true + + + + From e0c3357bf7d88214a4572833ac0f148adf88559a Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 8 Jun 2021 17:47:53 +0000 Subject: [PATCH 29/42] ILAsm workaround --- eng/SourceBuild.props | 48 +++++++++++++++------------ src/libraries/Directory.Build.targets | 4 --- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 46c3b443214042..d708f750230211 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -21,27 +21,6 @@ $(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-')) minimal - - $(InnerBuildArgs) --arch $(TargetRidPlatform) - $(InnerBuildArgs) --configuration $(Configuration) - $(InnerBuildArgs) --ci - $(InnerBuildArgs) --runtimeConfiguration $(Configuration) - $(InnerBuildArgs) --verbosity $(LogVerbosity) - $(InnerBuildArgs) --nodereuse false - $(InnerBuildArgs) --warnAsError false - $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE - $(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 - $(InnerBuildArgs) /p:ContinuousIntegrationBuild=true - $(InnerBuildArgs) /p:PackageRid=$(TargetRid) - $(InnerBuildArgs) /p:NoPgoOptimize=true - $(InnerBuildArgs) /p:KeepNativeSymbols=true - $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) - $(InnerBuildArgs) /p:ConfigurationGroup=$(Configuration) - $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) - $(InnerBuildArgs) /p:BuildAllPackages=true - $(InnerBuildArgs) /p:BuildAllOOBPackages=true - $(InnerBuildArgs) /p:BuildDebPackage=false - @@ -52,6 +31,33 @@ + + + $(InnerBuildArgs) --arch $(TargetRidPlatform) + $(InnerBuildArgs) --configuration $(Configuration) + $(InnerBuildArgs) --ci + $(InnerBuildArgs) --runtimeConfiguration $(Configuration) + $(InnerBuildArgs) --verbosity $(LogVerbosity) + $(InnerBuildArgs) --nodereuse false + $(InnerBuildArgs) --warnAsError false + $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE + $(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 + $(InnerBuildArgs) /p:ContinuousIntegrationBuild=true + $(InnerBuildArgs) /p:PackageRid=$(TargetRid) + $(InnerBuildArgs) /p:NoPgoOptimize=true + $(InnerBuildArgs) /p:KeepNativeSymbols=true + $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) + $(InnerBuildArgs) /p:ConfigurationGroup=$(Configuration) + $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) + $(InnerBuildArgs) /p:BuildAllPackages=true + $(InnerBuildArgs) /p:BuildAllOOBPackages=true + $(InnerBuildArgs) /p:BuildDebPackage=false + + $(InnerBuildArgs) /p:ILAsmToolPath=$([MSBuild]::NormalizeDirectory('$(CurrentRepoSourceBuildArtifactsDir)', 'bin', 'coreclr', 'Linux.$(TargetArchitecture).$(Configuration)')) + + + true - - - - From de586df71073d589aef1138147b3f243ed33008c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 8 Jun 2021 18:36:28 +0000 Subject: [PATCH 30/42] patch updates --- ...-PackageVersionProps-from-eng-Vervsi.patch | 4 +- ...rapp5.0-versions-in-libraries-nupkgs.patch | 2 +- .../0010-remove-netcoreapp2.x-targetx.patch | 57 ------------------- ...itionally-set-PackageTargetFramework.patch | 25 -------- .../0033-Build-net4-in-source-build.patch | 4 +- 5 files changed, 5 insertions(+), 87 deletions(-) delete mode 100644 eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch delete mode 100644 eng/source-build-patches/0020-Conditionally-set-PackageTargetFramework.patch diff --git a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch index dda1478470cdc0..e9270a4a571c59 100644 --- a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch +++ b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch @@ -13,8 +13,8 @@ index cc4a7b62914..cef8de452b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,6 +167,4 @@ - 9.0.1-alpha.1.21267.1 - 9.0.1-alpha.1.21267.1 + 6.0.0-preview.6.21275.1 + $(MicrosoftNETRuntimeEmscripten2021Nodewinx64Version) - - diff --git a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch index 8628ba8d06a926..849f92cb6e4ff8 100644 --- a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch +++ b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch @@ -19,7 +19,7 @@ index 0548b4468af..7460e44616b 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -230,7 +230,7 @@ - + - true diff --git a/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch b/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch deleted file mode 100644 index e806f78ad3cf4b..00000000000000 --- a/eng/source-build-patches/0010-remove-netcoreapp2.x-targetx.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a0f215803f4739cdc2d7c596a5bed365220ac3ca Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Mon, 16 Nov 2020 16:49:49 +0100 -Subject: [PATCH] runtime: remove netcoreapp2.x targets - -dagood: (6.0) changed patch to remove netcoreapp2.0 centrally in -src/libraries/Directory.Build.props instead of a find-replace across -all files. ---- - eng/empty.csproj | 1 + - src/libraries/Directory.Build.props | 18 ++++++++++++++++++ - 2 files changed, 19 insertions(+) - -diff --git a/eng/empty.csproj b/eng/empty.csproj -index 6edde5507fc..68985aae3b6 100644 ---- a/eng/empty.csproj -+++ b/eng/empty.csproj -@@ -10,6 +10,7 @@ - - - netcoreapp2.0 -+ net5.0 - - - -diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props -index 3daf1a941be..94606e51460 100644 ---- a/src/libraries/Directory.Build.props -+++ b/src/libraries/Directory.Build.props -@@ -45,6 +45,24 @@ - false - - -+ -+ -+ ;$(TargetFrameworks); -+ -+ $(TargetFrameworks.Replace(';netcoreapp2.0;', ';')) -+ $(TargetFrameworks.Replace(';netcoreapp2.0-windows;', ';')) -+ $(TargetFrameworks.Replace(';netcoreapp2.0-Windows_NT;', ';')) -+ $(TargetFrameworks.Replace(';netcoreapp2.0-FreeBSD;', ';')) -+ $(TargetFrameworks.Replace(';netcoreapp2.0-Linux;', ';')) -+ $(TargetFrameworks.Replace(';netcoreapp2.0-OSX;', ';')) -+ -+ $(TargetFrameworks.Replace(';netcoreapp2.1;', ';')) -+ $(TargetFrameworks.Replace(';netcoreapp2.1-Windows_NT;', ';')) -+ $(TargetFrameworks.Replace(';netcoreapp2.1-Unix;', ';')) -+ -+ $(TargetFrameworks.Trim(';')) -+ -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0020-Conditionally-set-PackageTargetFramework.patch b/eng/source-build-patches/0020-Conditionally-set-PackageTargetFramework.patch deleted file mode 100644 index 5ed79230e1cd7b..00000000000000 --- a/eng/source-build-patches/0020-Conditionally-set-PackageTargetFramework.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c315609c4d93a7de32a765c768e56a9e14823528 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 2 Oct 2020 13:27:28 +0000 -Subject: [PATCH] Conditionally set PackageTargetFramework - ---- - .../System.IO.Pipelines/ref/System.IO.Pipelines.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj -index 7cb28689989..30b811fac8d 100644 ---- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj -+++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj -@@ -5,7 +5,7 @@ - true - -- netcoreapp2.0 -+ netcoreapp2.0 - true - - --- -2.25.4 - diff --git a/eng/source-build-patches/0033-Build-net4-in-source-build.patch b/eng/source-build-patches/0033-Build-net4-in-source-build.patch index 2d924b7283cc35..3b2744746efb53 100644 --- a/eng/source-build-patches/0033-Build-net4-in-source-build.patch +++ b/eng/source-build-patches/0033-Build-net4-in-source-build.patch @@ -41,9 +41,9 @@ index 94606e51460..807578c11ed 100644 -- net45;net451;net452;net46;net461;net462;net47;net471;net472 +- net461;net462;net47;net471;net472 - $(AdditionalBuildTargetFrameworks);netstandard2.0 -+ net45;net451;net452;net46;net461;net462;net47;net471;net472 ++ net461;net462;net47;net471;net472 + $(NETFrameworkTargetFrameworksExcept48) + $(AdditionalBuildTargetFrameworks);netstandard2.0 + $(NETFrameworkTargetFrameworksExcept48);net48;netstandard2.0 From e9b7fe452442f66347197ca2542c3c1c8e028ba3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 8 Jun 2021 23:06:59 +0000 Subject: [PATCH 31/42] Move logic to set ILAsmToolPath for source-build --- Directory.Build.props | 1 + eng/SourceBuild.props | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c0adfc01c6439b..8f4107e5833a69 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -83,6 +83,7 @@ $([MSBuild]::NormalizePath('$(WasmBuildTasksDir)', 'WasmBuildTasks.dll')) $([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll')) $([MSBuild]::NormalizePath('$(RuntimeConfigParserDir)', 'RuntimeConfigParser.dll')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)')) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index d708f750230211..5a91b2ad759447 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -53,8 +53,6 @@ $(InnerBuildArgs) /p:BuildAllPackages=true $(InnerBuildArgs) /p:BuildAllOOBPackages=true $(InnerBuildArgs) /p:BuildDebPackage=false - - $(InnerBuildArgs) /p:ILAsmToolPath=$([MSBuild]::NormalizeDirectory('$(CurrentRepoSourceBuildArtifactsDir)', 'bin', 'coreclr', 'Linux.$(TargetArchitecture).$(Configuration)')) From 469f6a11bf00c7e4f63b187f1a0a9f47bbc307aa Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 Jun 2021 11:23:07 -0500 Subject: [PATCH 32/42] Update eng/SourceBuild.props Co-authored-by: Viktor Hofer --- eng/SourceBuild.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 5a91b2ad759447..87cb426186c9e6 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -48,7 +48,6 @@ $(InnerBuildArgs) /p:NoPgoOptimize=true $(InnerBuildArgs) /p:KeepNativeSymbols=true $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) - $(InnerBuildArgs) /p:ConfigurationGroup=$(Configuration) $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) $(InnerBuildArgs) /p:BuildAllPackages=true $(InnerBuildArgs) /p:BuildAllOOBPackages=true From 6c2e477f7848b2fcc12896d25d15855c6ff6391b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 14 Jun 2021 17:45:46 +0200 Subject: [PATCH 33/42] Remove libraries specific patches --- eng/SourceBuild.props | 4 +- eng/packaging.props | 4 - ...trailing-path-separator-to-repo_root.patch | 25 ----- ...ult-nopgooptimize-in-build-scripts-u.patch | 35 ------- ...-PackageVersionProps-from-eng-Vervsi.patch | 24 ----- ...rapp5.0-versions-in-libraries-nupkgs.patch | 32 ------- .../0013-Remove--Browser-TFM.patch | 30 ------ ...15-Use-1.0-version-of-ref-assemblies.patch | 25 ----- ...1701-because-of-TFM-changes-in-sourc.patch | 54 ----------- ...ity.Cryptography.Cng-to-single-versi.patch | 30 ------ ...e-libraries-packages.proj-harvesting.patch | 27 ------ .../0033-Build-net4-in-source-build.patch | 96 ------------------- src/libraries/Directory.Build.props | 1 - src/libraries/libraries-packages.proj | 6 +- 14 files changed, 2 insertions(+), 391 deletions(-) delete mode 100644 eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch delete mode 100644 eng/source-build-patches/0006-Temporarily-default-nopgooptimize-in-build-scripts-u.patch delete mode 100644 eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch delete mode 100644 eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch delete mode 100644 eng/source-build-patches/0013-Remove--Browser-TFM.patch delete mode 100644 eng/source-build-patches/0015-Use-1.0-version-of-ref-assemblies.patch delete mode 100644 eng/source-build-patches/0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch delete mode 100644 eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch delete mode 100644 eng/source-build-patches/0027-Remove-libraries-packages.proj-harvesting.patch delete mode 100644 eng/source-build-patches/0033-Build-net4-in-source-build.patch diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 87cb426186c9e6..0f11d91b37ae68 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -37,7 +37,7 @@ $(InnerBuildArgs) --arch $(TargetRidPlatform) $(InnerBuildArgs) --configuration $(Configuration) $(InnerBuildArgs) --ci - $(InnerBuildArgs) --runtimeConfiguration $(Configuration) + $(InnerBuildArgs) --allconfigurations $(InnerBuildArgs) --verbosity $(LogVerbosity) $(InnerBuildArgs) --nodereuse false $(InnerBuildArgs) --warnAsError false @@ -49,8 +49,6 @@ $(InnerBuildArgs) /p:KeepNativeSymbols=true $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform) $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) - $(InnerBuildArgs) /p:BuildAllPackages=true - $(InnerBuildArgs) /p:BuildAllOOBPackages=true $(InnerBuildArgs) /p:BuildDebPackage=false diff --git a/eng/packaging.props b/eng/packaging.props index 87cecef871a697..534d3ddcf321b4 100644 --- a/eng/packaging.props +++ b/eng/packaging.props @@ -16,10 +16,6 @@ - - false - - true false diff --git a/eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch b/eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch deleted file mode 100644 index 2ca5735b76ea8e..00000000000000 --- a/eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7ad6f5dc44092c47cee1af32be0f6a061b8abb7c Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 24 Jan 2020 19:01:58 +0000 -Subject: [PATCH] Add trailing path separator to repo_root - ---- - eng/common/build.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/common/build.sh b/eng/common/build.sh -index 55b298f16cc..1b250d16018 100755 ---- a/eng/common/build.sh -+++ b/eng/common/build.sh -@@ -202,7 +202,7 @@ function Build { - MSBuild $_InitializeToolset \ - $bl \ - /p:Configuration=$configuration \ -- /p:RepoRoot="$repo_root" \ -+ /p:RepoRoot="$repo_root/" \ - /p:Restore=$restore \ - /p:Build=$build \ - /p:Rebuild=$rebuild \ --- -2.25.4 - diff --git a/eng/source-build-patches/0006-Temporarily-default-nopgooptimize-in-build-scripts-u.patch b/eng/source-build-patches/0006-Temporarily-default-nopgooptimize-in-build-scripts-u.patch deleted file mode 100644 index a91baf222e674e..00000000000000 --- a/eng/source-build-patches/0006-Temporarily-default-nopgooptimize-in-build-scripts-u.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ea2f8aed39d650f3a9a5791eb0858fe5ece3331c Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 25 Mar 2020 15:22:44 +0000 -Subject: [PATCH] Temporarily default nopgooptimize in build scripts until - https://github.com/dotnet/runtime/issues/34069 is fixed. - ---- - src/coreclr/build-runtime.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/build-runtime.sh b/src/coreclr/build-runtime.sh -index 25cf3e06ea6..cfc466fbed0 100755 ---- a/src/coreclr/build-runtime.sh -+++ b/src/coreclr/build-runtime.sh -@@ -173,7 +173,7 @@ __CrossBuild=0 - __DistroRid="" - __PgoInstrument=0 - __PgoOptDataPath="" --__PgoOptimize=1 -+__PgoOptimize=0 - __PortableBuild=1 - __ProjectDir="$__ProjectRoot" - __RootBinDir="$__RepoRootDir/artifacts" -@@ -184,7 +184,7 @@ __SkipCrossArchNative=0 - __SkipGenerateVersion=0 - __SkipManaged=0 - __SkipRestore="" --__SkipRestoreOptData=0 -+__SkipRestoreOptData=1 - __SourceDir="$__ProjectDir/src" - __StaticAnalyzer=0 - __UnprocessedBuildArgs= --- -2.25.4 - diff --git a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch b/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch deleted file mode 100644 index e9270a4a571c59..00000000000000 --- a/eng/source-build-patches/0008-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 42bb5cf46bbc21011822afeabda30eaee72d25cd Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 20 Apr 2020 15:09:58 +0000 -Subject: [PATCH] Remove import of PackageVersionProps from eng/Vervsions.props - It should be imported by Arcade SDK - ---- - eng/Versions.props | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index cc4a7b62914..cef8de452b4 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -167,6 +167,4 @@ - 6.0.0-preview.6.21275.1 - $(MicrosoftNETRuntimeEmscripten2021Nodewinx64Version) - -- -- - --- -2.25.4 - diff --git a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch b/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch deleted file mode 100644 index 849f92cb6e4ff8..00000000000000 --- a/eng/source-build-patches/0009-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b0080bd8a32d77a59b4c970d0107f98ec7a159ed Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 11 Jun 2020 12:15:06 -0400 -Subject: [PATCH] Include netcorapp5.0 versions in libraries nupkgs - -Assets for netcoreapp3.0 are not built in source-build because we don't -have references for past netcoreapp versions. That leaves the packages -built by the libraries build with a placeholder for netcoreapp3.0, which -causes issues with consumption of these packages in dependent repos. -Packages for netcoreapp5.0 are built but not packaged by design. This -patch includes these assets in the packages built by the libraries -build, only for the source-build build. ---- - src/libraries/Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets -index 0548b4468af..7460e44616b 100644 ---- a/src/libraries/Directory.Build.targets -+++ b/src/libraries/Directory.Build.targets -@@ -230,7 +230,7 @@ - - - -- true -+ true - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0013-Remove--Browser-TFM.patch b/eng/source-build-patches/0013-Remove--Browser-TFM.patch deleted file mode 100644 index 24863626d100eb..00000000000000 --- a/eng/source-build-patches/0013-Remove--Browser-TFM.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d7b8db6b071bf7bf30ff8ae54c08e5cb6aebc2ec Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 2 Sep 2020 08:24:20 -0500 -Subject: [PATCH] Remove -Browser TFM - -This gets treated the same as net5.0 for some reason, which causes -errors like -.dotnet/sdk/5.0.100-preview.8.20417.9/NuGet.RestoreEx.targets(10,5): -error : Invalid restore input. Duplicate frameworks found: 'net5.0, net5.0, net5.0'. Input files: -artifacts/src/runtime.bf456654f9a4f9a86c15d9d50095ff29cde5f0a4/src/libraries/Native/native-binplace.proj. -[artifacts/src/runtime.bf456654f9a4f9a86c15d9d50095ff29cde5f0a4/Build.proj] ---- - .../src/System.Security.Cryptography.OpenSsl.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj -index 133c02e..ad2eadd 100644 ---- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj -+++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj -@@ -1,6 +1,6 @@ - - -- $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) -+ $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent);$(NetFrameworkCurrent) - true - enable - --- -2.25.4 - diff --git a/eng/source-build-patches/0015-Use-1.0-version-of-ref-assemblies.patch b/eng/source-build-patches/0015-Use-1.0-version-of-ref-assemblies.patch deleted file mode 100644 index a8ec239a8b71ab..00000000000000 --- a/eng/source-build-patches/0015-Use-1.0-version-of-ref-assemblies.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a1d1e603e5ffc5cc0402725819ea3a29e71e6c7b Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Sat, 5 Sep 2020 02:46:44 -0500 -Subject: [PATCH] Use 1.0 version of ref assemblies - ---- - src/libraries/pkg/test/frameworkSettings/net/settings.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/pkg/test/frameworkSettings/net/settings.targets b/src/libraries/pkg/test/frameworkSettings/net/settings.targets -index e4e8ff23d68..edfeff17503 100644 ---- a/src/libraries/pkg/test/frameworkSettings/net/settings.targets -+++ b/src/libraries/pkg/test/frameworkSettings/net/settings.targets -@@ -8,7 +8,7 @@ - - -- -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch b/eng/source-build-patches/0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch deleted file mode 100644 index 207ddba77e55b6..00000000000000 --- a/eng/source-build-patches/0024-Don-t-warn-on-NU1701-because-of-TFM-changes-in-sourc.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f18656faeea52f86792c66a3cf36f82a0b937c70 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 13 Oct 2020 17:00:34 +0000 -Subject: [PATCH] Pin System.ComponentModel.Annotations to version that can be - added to sbrp - -dagood: (6.0) Note: this patch's filename doesn't match. ---- - .../src/Microsoft.Extensions.Options.DataAnnotations.csproj | 2 +- - .../ref/Microsoft.Extensions.Options.csproj | 2 +- - .../src/Microsoft.Extensions.Options.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj -index bcf5ce56123..41bd9555c45 100644 ---- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj -+++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj -@@ -11,7 +11,7 @@ - - - -- -+ - - - -diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj -index c441c3ec38a..24c3e885eec 100644 ---- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj -+++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj -@@ -12,6 +12,6 @@ - - - -- -+ - - -diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj -index ba7dcec688a..d3cfc425ac6 100644 ---- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj -+++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj -@@ -18,7 +18,7 @@ - - - -- -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch b/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch deleted file mode 100644 index 4a0cff6c5e025c..00000000000000 --- a/eng/source-build-patches/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 82678ff2bec86be98d9797f98dab99aa1e82c25c Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 30 Oct 2020 16:25:21 +0000 -Subject: [PATCH] Pin System.Security.Cryptography.Cng to single version - -If System.Security.Cryptography.Cng is restored using the PVP -version (5.0.0), this causes conflicts later in the restore which -results in an error: - An item with the same key has already been added. - Key: (System.Security.Cryptography.Cng, 5.0.0) ---- - .../src/System.Security.Cryptography.Pkcs.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj -index e9db368ef24..c396c21a798 100644 ---- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj -+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj -@@ -639,7 +639,7 @@ - - - -- -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0027-Remove-libraries-packages.proj-harvesting.patch b/eng/source-build-patches/0027-Remove-libraries-packages.proj-harvesting.patch deleted file mode 100644 index d9fa0aa5ab32fa..00000000000000 --- a/eng/source-build-patches/0027-Remove-libraries-packages.proj-harvesting.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7e470148fdae7a3a69a39a1c0de41034bb57926c Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Mon, 2 Nov 2020 11:54:57 -0600 -Subject: [PATCH] Remove libraries-packages.proj harvesting - -Remove some prebuilts by removing package harvesting. Package harvesting -is not compatible with the concept of a prebuiltless source-build. ---- - src/libraries/libraries-packages.proj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj -index cfbf75d8a4e..603d523df55 100644 ---- a/src/libraries/libraries-packages.proj -+++ b/src/libraries/libraries-packages.proj -@@ -25,7 +25,7 @@ - - - -- -+ - - -- net461;net462;net47;net471;net472 -- $(AdditionalBuildTargetFrameworks);netstandard2.0 -+ net461;net462;net47;net471;net472 -+ $(NETFrameworkTargetFrameworksExcept48) -+ $(AdditionalBuildTargetFrameworks);netstandard2.0 -+ $(NETFrameworkTargetFrameworksExcept48);net48;netstandard2.0 - - - -diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj -index e1dad4a470d..ac14aaad7d6 100644 ---- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj -+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj -@@ -10,6 +10,9 @@ - - - -+ -+ -+ - - - -diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj -index 4adc0b2edb5..66d4e2aa47d 100644 ---- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj -+++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj -@@ -10,7 +10,7 @@ - - - -- -+ - - - -diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj -index 50d5af47646..3451105192e 100644 ---- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj -+++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj -@@ -13,7 +13,7 @@ - - - -- -+ - - - -\ No newline at end of file --- -2.25.4 - diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index cc5a02e38691df..9e403d02d13b8a 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -28,7 +28,6 @@ net461;net462;net47;net471;net472 - $(AdditionalBuildTargetFrameworks);netstandard2.0 diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index 7c870d603ad8ab..ad900a581dd733 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -1,9 +1,5 @@ - - $(AdditionalBuildTargetFrameworks);package-$(Configuration) - - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\ $(PackagingTaskAssembly)netcoreapp3.1\ @@ -14,7 +10,7 @@ From e6f5d8f728f1da4d54620f23dda359368e42b735 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 14 Jun 2021 20:39:45 +0000 Subject: [PATCH 34/42] Patch updates necessary with latest main merge --- ...4-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch | 2 +- .../0035-cross-gen-corelib-no-mibc-files.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch b/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch index 714964bfa5e682..79ee836b02d01c 100644 --- a/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch +++ b/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch @@ -13,9 +13,9 @@ index c5f4d2e6da1..5493f19bc19 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props @@ -2,5 +2,8 @@ - hosting + windows + + true + false diff --git a/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch b/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch index 51500070a79b6d..62dffc8da2839a 100644 --- a/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch +++ b/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch @@ -20,8 +20,8 @@ index 53c4e57..0a8f17a 100644 + @(OptimizationMibcFiles->'-m:$(MergedMibcPath)', ' ') + $(CrossGenDllCmd) $(MibcArgs) --embed-pgo-data $(CrossGenDllCmd) -O + $(CrossGenDllCmd) --verify-type-and-field-layout $(CrossGenDllCmd) $(CoreLibInputPath) - -- 1.8.3.1 From f0266274c282f90f7b57c1046946ab58af8bd399 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 14 Jun 2021 21:23:46 +0000 Subject: [PATCH 35/42] Add back libraries-packages.proj harvesting patch --- src/libraries/libraries-packages.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index ad900a581dd733..38437a2702ff19 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -18,7 +18,7 @@ - + - - - - - - - - - - - - - - - + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*.tar.gz; + $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Crossgen2.*.nupkg" + Category="Crossgen2Pack" /> From 309421d5ae1f300bb12ac681439b2558eea7556a Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 15 Jun 2021 13:31:53 +0000 Subject: [PATCH 37/42] Integrate patch 0017 --- eng/Subsets.props | 27 ++++----- .../0017-trim-clr.tools.patch | 55 ------------------- 2 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 eng/source-build-patches/0017-trim-clr.tools.patch diff --git a/eng/Subsets.props b/eng/Subsets.props index 58713238ff200f..43cab57147bef1 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -25,9 +25,8 @@ clr+mono+libs+host+packs mono+libs+packs - clr+libs+host+packs - - clr+libs+host+packs + + clr+libs+host+packs @@ -43,8 +42,9 @@ - clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages - clr.tools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages+clr.jit+clr.alljits + clr.corelib+clr.tools+clr.nativecorelib+clr.packages+ + $(DefaultCoreClrSubsets)clr.native+linuxdac + $(DefaultCoreClrSubsets)clr.runtime+clr.jit+clr.alljits mono.llvm+ mono.llvm+ @@ -55,16 +55,17 @@ libs.native+ - $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.pretest+libs.packages + $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.packages + $(DefaultLibrariesSubsets)+libs.pretest - host.native+host.pkg+host.tools+host.tests + host.native+host.tools + $(DefaultHostSubsets)+host.pkg+host.tests host.native - host.native+host.tools packs.product $(DefaultPacksSubsets)+packs.tests - packs.product+packs.installers + $(DefaultPacksSubsets)+packs.installers @@ -208,12 +209,12 @@ + $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> + + Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64' and '$(DotNetBuildFromSource)' != 'true'"/> @@ -225,7 +226,7 @@ - + diff --git a/eng/source-build-patches/0017-trim-clr.tools.patch b/eng/source-build-patches/0017-trim-clr.tools.patch deleted file mode 100644 index ff94894cc8bb6b..00000000000000 --- a/eng/source-build-patches/0017-trim-clr.tools.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c23a864f1047e37521b9cd2a1b4788eba588398d Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Thu, 22 Oct 2020 10:07:49 +0200 -Subject: [PATCH] runtime: trim clr.tools - -dagood: (6.0) used '$(DotNetBuildFromSource)' != 'true' in fixup ---- - eng/Subsets.props | 9 ++++--- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/eng/Subsets.props b/eng/Subsets.props -index 24b4bd2..5e6e299 100644 ---- a/eng/Subsets.props -+++ b/eng/Subsets.props -@@ -52,8 +52,11 @@ - - libs.native+ -- $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.pretest+libs.packages -+ $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.packages -+ $(DefaultLibrariesSubsets)libs.pretest -+ - - host.native+host.pkg+host.tools+host.tests - -@@ -201,12 +202,12 @@ - -+ $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> -+ - - - -+ Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64' and '$(DotNetBuildFromSource)' != 'true'"/> - - - -@@ -218,7 +218,7 @@ - - - -- -+ - - - --- -2.25.4 - From 7230fa14ab6fb1248f74d638f033d1e85150f5b4 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 15 Jun 2021 13:37:13 +0000 Subject: [PATCH 38/42] Subsets update per code review --- eng/Subsets.props | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 43cab57147bef1..105b34254c6c2b 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -42,9 +42,7 @@ - clr.corelib+clr.tools+clr.nativecorelib+clr.packages+ - $(DefaultCoreClrSubsets)clr.native+linuxdac - $(DefaultCoreClrSubsets)clr.runtime+clr.jit+clr.alljits + clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages mono.llvm+ mono.llvm+ From 972035a5fff442af9b3f9c126e1dcaa46f0f9ecd Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 15 Jun 2021 14:36:30 +0000 Subject: [PATCH 39/42] Remove obsolete patch --- ...entifiers-tag-to-prevent-aspnet-pack.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch diff --git a/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch b/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch deleted file mode 100644 index 2f0126d4222303..00000000000000 --- a/eng/source-build-patches/0023-Remove-RuntimeIdentifiers-tag-to-prevent-aspnet-pack.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ff45a58b37e554bdf0ade6033ba2a1efe4c5798f Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 13 Oct 2020 16:56:31 +0000 -Subject: [PATCH] Remove tag to prevent aspnet pack from - loading - ---- - src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj | 1 - - 1 files changed, 1 deletions(-) - -diff --git a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj -index dbe495a3d24..781fd33ac42 100644 ---- a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj -+++ b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj -@@ -9,7 +9,6 @@ - $(RuntimeBinDir)/dotnet-pgo - true - false -- linux-x64;linux-musl-x64;win-x64 - true - true - dotnet-pgo --- -2.25.4 - From cf48c62094de3d69ed269d7ff4ab9d53db5546fc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 18 Jun 2021 15:31:33 +0000 Subject: [PATCH 40/42] Removed patches that were integrated into main --- ...0035-cross-gen-corelib-no-mibc-files.patch | 27 ------------------- ...eadyToRun.Experimental-NuGet-package.patch | 27 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch delete mode 100644 eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch diff --git a/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch b/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch deleted file mode 100644 index 62dffc8da2839a..00000000000000 --- a/eng/source-build-patches/0035-cross-gen-corelib-no-mibc-files.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b473825eaa9540131b9b7181274e3e6547eed02b Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Mon, 3 May 2021 15:29:02 +0000 -Subject: [PATCH] cross-gen-corelib.proj fix related to PR 50536 to handle no - mibc files - ---- - src/coreclr/crossgen-corelib.proj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj -index 53c4e57..0a8f17a 100644 ---- a/src/coreclr/crossgen-corelib.proj -+++ b/src/coreclr/crossgen-corelib.proj -@@ -100,7 +100,8 @@ - $(CrossGenDllCmd) -o:$(CoreLibOutputPath) - $(CrossGenDllCmd) -r:$([MSBuild]::NormalizePath('$(BinDir)', 'IL', '*.dll')) - $(CrossGenDllCmd) --targetarch:$(TargetArchitecture) -- $(CrossGenDllCmd) -m:$(MergedMibcPath) --embed-pgo-data -+ @(OptimizationMibcFiles->'-m:$(MergedMibcPath)', ' ') -+ $(CrossGenDllCmd) $(MibcArgs) --embed-pgo-data - $(CrossGenDllCmd) -O - $(CrossGenDllCmd) --verify-type-and-field-layout - $(CrossGenDllCmd) $(CoreLibInputPath) --- -1.8.3.1 - diff --git a/eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch b/eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch deleted file mode 100644 index 0813aba85574cf..00000000000000 --- a/eng/source-build-patches/0036-Exclude-ReadyToRun.Experimental-NuGet-package.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 39e09e379d1511bdf4d9484f1ae0efdd516894fa Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Mon, 3 May 2021 15:35:38 +0000 -Subject: [PATCH] Exclude ReadyToRun.Experimental NuGet package - -Not required by SDK and depends on non-SB components (e.g. r2rdump) ---- - src/coreclr/.nuget/coreclr-packages.proj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/coreclr/.nuget/coreclr-packages.proj b/src/coreclr/.nuget/coreclr-packages.proj -index 2f7d06a..b8aec3a 100644 ---- a/src/coreclr/.nuget/coreclr-packages.proj -+++ b/src/coreclr/.nuget/coreclr-packages.proj -@@ -13,6 +13,9 @@ - - - -+ -+ -+ - - - --- -1.8.3.1 - From 4211c038a1927064348730671af633f8bbf7f614 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 21 Jun 2021 19:35:24 +0200 Subject: [PATCH 41/42] Remove two additional patches --- eng/restore/harvestPackages.targets | 10 ++++++++ ...s-packages-use-net5.0-PackagingTaskA.patch | 25 ------------------- ...t.Extensions.Hosting.WindowsServices.patch | 25 ------------------- src/libraries/libraries-packages.proj | 10 ++------ 4 files changed, 12 insertions(+), 58 deletions(-) delete mode 100644 eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch delete mode 100644 eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch diff --git a/eng/restore/harvestPackages.targets b/eng/restore/harvestPackages.targets index a7fc8aa34655f5..07eb5a91a7a8ed 100644 --- a/eng/restore/harvestPackages.targets +++ b/eng/restore/harvestPackages.targets @@ -1,4 +1,14 @@  + + + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\ + $(PackagingTaskAssembly)netcoreapp3.1\ + $(PackagingTaskAssembly)net472\ + + $(PackagingTaskAssembly)net5.0\ + $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll + + diff --git a/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch b/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch deleted file mode 100644 index 67ef4da8da5a08..00000000000000 --- a/eng/source-build-patches/0029-libraries-packages-use-net5.0-PackagingTaskA.patch +++ /dev/null @@ -1,25 +0,0 @@ -From da5a2c2593df373d1fafa605e1d7ce3ba2ca38e7 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Wed, 18 Nov 2020 09:29:17 +0100 -Subject: [PATCH] runtime: libraries-packages: use net5.0 PackagingTaskAssembly - ---- - src/libraries/libraries-packages.proj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj -index 603d523df55..38cd7e74337 100644 ---- a/src/libraries/libraries-packages.proj -+++ b/src/libraries/libraries-packages.proj -@@ -7,7 +7,7 @@ - - - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\ -- $(PackagingTaskAssembly)netcoreapp3.1\ -+ $(PackagingTaskAssembly)net5.0\ - $(PackagingTaskAssembly)net472\ - $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll - --- -2.25.4 - diff --git a/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch b/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch deleted file mode 100644 index 79ee836b02d01c..00000000000000 --- a/eng/source-build-patches/0034-Exclude-Microsoft.Extensions.Hosting.WindowsServices.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6521f8a43f5c146efc72b72dd3b0e61344a71618 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 15 Mar 2021 19:00:55 +0000 -Subject: [PATCH] Exclude Microsoft.Extensions.Hosting.WindowsServices from - source-build - ---- - .../Directory.Build.props | 3 ++ - 1 file changed, 3 insertions(+) - -diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props -index c5f4d2e6da1..5493f19bc19 100644 ---- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props -+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props -@@ -2,5 +2,8 @@ - - hosting - windows -+ -+ true -+ false - - --- -2.25.4 diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index 696696b58f85a0..383dd088e127c0 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -1,13 +1,8 @@ - - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\ - $(PackagingTaskAssembly)netcoreapp3.1\ - $(PackagingTaskAssembly)net472\ - $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll - - + + - From 88a171531e100af32635cadc5d98c42ee102d77e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 21 Jun 2021 19:48:55 +0200 Subject: [PATCH 42/42] Remove remaining patches --- eng/SourceBuild.props | 15 ----------- ...ssing-crossgen2-for-non-portable-RID.patch | 25 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index b5bce2a24e7a87..7dfc80d41fd14c 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -53,21 +53,6 @@ - - - - - - - - - - diff --git a/eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch b/eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch deleted file mode 100644 index 89950b8698154e..00000000000000 --- a/eng/source-build-patches/0019-Fix-missing-crossgen2-for-non-portable-RID.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a3b356e19adaa1b001fdf6de79896ed85ec74df5 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 12 Feb 2021 11:11:04 -0600 -Subject: [PATCH] Fix missing crossgen2 for non-portable RID - ---- - .../Microsoft.NETCore.App.Crossgen2.sfxproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj -index ec198224a2e..51dc61d8783 100644 ---- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj -+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj -@@ -9,7 +9,8 @@ - $(SharedFrameworkName)$(PgoSuffix).$(RuntimeIdentifier) - dotnet-crossgen2 - crossgen2 -- linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm -+ -+ linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm - false - - AddRuntimeFilesToPackage; --- -2.25.4