From 55168121bb3ddbe95be136bd5cd71cdc7198f262 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 14 Nov 2022 07:52:14 -0800 Subject: [PATCH] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#14723) * Adding ppc64le arch for source build (#14631) * Remove llvm-project from source-build as we have removed this dependency in runtime. (#14697) * Remove llvm-project from source-build as we have removed this dependency in runtime. * Add patch for the backport PR to get this to build for now. * Remove unneeded copy of this patch. * [release/7.0.1xx] Update dependencies from dotnet/sdk (#14705) [release/7.0.1xx] Update dependencies from dotnet/sdk - Remove backported command-line-api patch * Don't use the MSBuild server process for init-build.proj. (#14643) * Don't use the MSBuild server process for init-build.proj. This appears to fix an issue where our SdkResolver is not loaded because there are still lingering dotnet processes when we try to binplace the resolver DLL. * Address code review feedback. * Update patch backport comments and remove obsolete patch (#14710) * [release/7.0.1xx] .NET Source-Build 7.0.100-rc.2 October 2022 Updates (#14728) * Update source-build to 7.0 RC2 * Also update tarball global.json * Don't touch root global.json in case it is managed by automation * Add back source-build patch that is still required in this branch Co-authored-by: Swapnali911 Co-authored-by: Chris Rummel Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- Directory.Build.props | 1 + eng/Version.Details.xml | 5 - eng/Versions.props | 2 +- .../tarball/content/Directory.Build.props | 1 + src/SourceBuild/tarball/content/build.sh | 2 + src/SourceBuild/tarball/content/global.json | 2 +- .../tarball/content/repos/known-good.proj | 1 - .../tarball/content/repos/llvm-project.proj | 24 -- .../content/repos/runtime-portable.proj | 1 - .../tarball/content/repos/runtime.proj | 1 - ...m-LLVM-directory-to-root-directory-t.patch | 298 ------------------ .../0004-Add-SourceBuild.props.patch | 26 -- .../nuget-client/0002-Add-CA2213-NoWarn.patch | 23 -- ...ilt-assets-during-source-build-for-r.patch | 2 +- ...ObjWriter-dependency-in-source-build.patch | 40 +++ ...02-Look-for-msbuild-net7.0-artifacts.patch | 3 +- src/redist/targets/Crossgen.targets | 4 +- .../targets/GenerateBundledVersions.targets | 9 +- 18 files changed, 56 insertions(+), 389 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/repos/llvm-project.proj delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/Directory.Build.props b/Directory.Build.props index 15c9d27b7..b87eeccca 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,6 +11,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8e16bc24..7f980082c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,11 +17,6 @@ https://github.com/dotnet/windowsdesktop ae2bcebe032a50af14ac0b05efcaa8477b049834 - - https://github.com/dotnet/llvm-project - 78c9eaec7cec210dfaee9a0443d5816b59683697 - - https://github.com/dotnet/runtime 5147f6fc78520db322118cc8287651cb54a506df diff --git a/eng/Versions.props b/eng/Versions.props index 77ed7e54d..ef9ce22a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100-rc.1 + 7.0.100-rc.2 diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 61cc6ff67..860785575 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -19,6 +19,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 false diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 0d6bbb91e..e899d2f80 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -178,6 +178,8 @@ if [ "$alternateTarget" == "true" ]; then "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver + $CLI_ROOT/dotnet build-server shutdown $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@" fi diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d6aba31b..8d9568376 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12" + "dotnet": "7.0.100-rc.2.22477.23" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 937ab8f54..50720cc4c 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -33,7 +33,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/llvm-project.proj b/src/SourceBuild/tarball/content/repos/llvm-project.proj deleted file mode 100644 index addb0457c..000000000 --- a/src/SourceBuild/tarball/content/repos/llvm-project.proj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - $(BuildCommandArgs) /p:OutputRid=$(PortableRid) - $(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/runtime-portable.proj b/src/SourceBuild/tarball/content/repos/runtime-portable.proj index 6c3939492..09b4625e9 100644 --- a/src/SourceBuild/tarball/content/repos/runtime-portable.proj +++ b/src/SourceBuild/tarball/content/repos/runtime-portable.proj @@ -9,7 +9,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repos/runtime.proj index 04ff19ab1..59ea1d6fc 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.proj +++ b/src/SourceBuild/tarball/content/repos/runtime.proj @@ -18,7 +18,6 @@ - diff --git a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch b/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch deleted file mode 100644 index 868911a22..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 10 Aug 2022 23:16:19 -0500 -Subject: [PATCH] Copy license form LLVM directory to root directory to satisfy - license checker. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - LICENSE.TXT | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 279 insertions(+) - create mode 100644 LICENSE.TXT - -diff --git a/LICENSE.TXT b/LICENSE.TXT -new file mode 100644 -index 000000000000..fa6ac5400070 ---- /dev/null -+++ b/LICENSE.TXT -@@ -0,0 +1,279 @@ -+============================================================================== -+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions: -+============================================================================== -+ -+ Apache License -+ Version 2.0, January 2004 -+ http://www.apache.org/licenses/ -+ -+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -+ -+ 1. Definitions. -+ -+ "License" shall mean the terms and conditions for use, reproduction, -+ and distribution as defined by Sections 1 through 9 of this document. -+ -+ "Licensor" shall mean the copyright owner or entity authorized by -+ the copyright owner that is granting the License. -+ -+ "Legal Entity" shall mean the union of the acting entity and all -+ other entities that control, are controlled by, or are under common -+ control with that entity. For the purposes of this definition, -+ "control" means (i) the power, direct or indirect, to cause the -+ direction or management of such entity, whether by contract or -+ otherwise, or (ii) ownership of fifty percent (50%) or more of the -+ outstanding shares, or (iii) beneficial ownership of such entity. -+ -+ "You" (or "Your") shall mean an individual or Legal Entity -+ exercising permissions granted by this License. -+ -+ "Source" form shall mean the preferred form for making modifications, -+ including but not limited to software source code, documentation -+ source, and configuration files. -+ -+ "Object" form shall mean any form resulting from mechanical -+ transformation or translation of a Source form, including but -+ not limited to compiled object code, generated documentation, -+ and conversions to other media types. -+ -+ "Work" shall mean the work of authorship, whether in Source or -+ Object form, made available under the License, as indicated by a -+ copyright notice that is included in or attached to the work -+ (an example is provided in the Appendix below). -+ -+ "Derivative Works" shall mean any work, whether in Source or Object -+ form, that is based on (or derived from) the Work and for which the -+ editorial revisions, annotations, elaborations, or other modifications -+ represent, as a whole, an original work of authorship. For the purposes -+ of this License, Derivative Works shall not include works that remain -+ separable from, or merely link (or bind by name) to the interfaces of, -+ the Work and Derivative Works thereof. -+ -+ "Contribution" shall mean any work of authorship, including -+ the original version of the Work and any modifications or additions -+ to that Work or Derivative Works thereof, that is intentionally -+ submitted to Licensor for inclusion in the Work by the copyright owner -+ or by an individual or Legal Entity authorized to submit on behalf of -+ the copyright owner. For the purposes of this definition, "submitted" -+ means any form of electronic, verbal, or written communication sent -+ to the Licensor or its representatives, including but not limited to -+ communication on electronic mailing lists, source code control systems, -+ and issue tracking systems that are managed by, or on behalf of, the -+ Licensor for the purpose of discussing and improving the Work, but -+ excluding communication that is conspicuously marked or otherwise -+ designated in writing by the copyright owner as "Not a Contribution." -+ -+ "Contributor" shall mean Licensor and any individual or Legal Entity -+ on behalf of whom a Contribution has been received by Licensor and -+ subsequently incorporated within the Work. -+ -+ 2. Grant of Copyright License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ copyright license to reproduce, prepare Derivative Works of, -+ publicly display, publicly perform, sublicense, and distribute the -+ Work and such Derivative Works in Source or Object form. -+ -+ 3. Grant of Patent License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ (except as stated in this section) patent license to make, have made, -+ use, offer to sell, sell, import, and otherwise transfer the Work, -+ where such license applies only to those patent claims licensable -+ by such Contributor that are necessarily infringed by their -+ Contribution(s) alone or by combination of their Contribution(s) -+ with the Work to which such Contribution(s) was submitted. If You -+ institute patent litigation against any entity (including a -+ cross-claim or counterclaim in a lawsuit) alleging that the Work -+ or a Contribution incorporated within the Work constitutes direct -+ or contributory patent infringement, then any patent licenses -+ granted to You under this License for that Work shall terminate -+ as of the date such litigation is filed. -+ -+ 4. Redistribution. You may reproduce and distribute copies of the -+ Work or Derivative Works thereof in any medium, with or without -+ modifications, and in Source or Object form, provided that You -+ meet the following conditions: -+ -+ (a) You must give any other recipients of the Work or -+ Derivative Works a copy of this License; and -+ -+ (b) You must cause any modified files to carry prominent notices -+ stating that You changed the files; and -+ -+ (c) You must retain, in the Source form of any Derivative Works -+ that You distribute, all copyright, patent, trademark, and -+ attribution notices from the Source form of the Work, -+ excluding those notices that do not pertain to any part of -+ the Derivative Works; and -+ -+ (d) If the Work includes a "NOTICE" text file as part of its -+ distribution, then any Derivative Works that You distribute must -+ include a readable copy of the attribution notices contained -+ within such NOTICE file, excluding those notices that do not -+ pertain to any part of the Derivative Works, in at least one -+ of the following places: within a NOTICE text file distributed -+ as part of the Derivative Works; within the Source form or -+ documentation, if provided along with the Derivative Works; or, -+ within a display generated by the Derivative Works, if and -+ wherever such third-party notices normally appear. The contents -+ of the NOTICE file are for informational purposes only and -+ do not modify the License. You may add Your own attribution -+ notices within Derivative Works that You distribute, alongside -+ or as an addendum to the NOTICE text from the Work, provided -+ that such additional attribution notices cannot be construed -+ as modifying the License. -+ -+ You may add Your own copyright statement to Your modifications and -+ may provide additional or different license terms and conditions -+ for use, reproduction, or distribution of Your modifications, or -+ for any such Derivative Works as a whole, provided Your use, -+ reproduction, and distribution of the Work otherwise complies with -+ the conditions stated in this License. -+ -+ 5. Submission of Contributions. Unless You explicitly state otherwise, -+ any Contribution intentionally submitted for inclusion in the Work -+ by You to the Licensor shall be under the terms and conditions of -+ this License, without any additional terms or conditions. -+ Notwithstanding the above, nothing herein shall supersede or modify -+ the terms of any separate license agreement you may have executed -+ with Licensor regarding such Contributions. -+ -+ 6. Trademarks. This License does not grant permission to use the trade -+ names, trademarks, service marks, or product names of the Licensor, -+ except as required for reasonable and customary use in describing the -+ origin of the Work and reproducing the content of the NOTICE file. -+ -+ 7. Disclaimer of Warranty. Unless required by applicable law or -+ agreed to in writing, Licensor provides the Work (and each -+ Contributor provides its Contributions) on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -+ implied, including, without limitation, any warranties or conditions -+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -+ PARTICULAR PURPOSE. You are solely responsible for determining the -+ appropriateness of using or redistributing the Work and assume any -+ risks associated with Your exercise of permissions under this License. -+ -+ 8. Limitation of Liability. In no event and under no legal theory, -+ whether in tort (including negligence), contract, or otherwise, -+ unless required by applicable law (such as deliberate and grossly -+ negligent acts) or agreed to in writing, shall any Contributor be -+ liable to You for damages, including any direct, indirect, special, -+ incidental, or consequential damages of any character arising as a -+ result of this License or out of the use or inability to use the -+ Work (including but not limited to damages for loss of goodwill, -+ work stoppage, computer failure or malfunction, or any and all -+ other commercial damages or losses), even if such Contributor -+ has been advised of the possibility of such damages. -+ -+ 9. Accepting Warranty or Additional Liability. While redistributing -+ the Work or Derivative Works thereof, You may choose to offer, -+ and charge a fee for, acceptance of support, warranty, indemnity, -+ or other liability obligations and/or rights consistent with this -+ License. However, in accepting such obligations, You may act only -+ on Your own behalf and on Your sole responsibility, not on behalf -+ of any other Contributor, and only if You agree to indemnify, -+ defend, and hold each Contributor harmless for any liability -+ incurred by, or claims asserted against, such Contributor by reason -+ of your accepting any such warranty or additional liability. -+ -+ END OF TERMS AND CONDITIONS -+ -+ APPENDIX: How to apply the Apache License to your work. -+ -+ To apply the Apache License to your work, attach the following -+ boilerplate notice, with the fields enclosed by brackets "[]" -+ replaced with your own identifying information. (Don't include -+ the brackets!) The text should be enclosed in the appropriate -+ comment syntax for the file format. We also recommend that a -+ file or class name and description of purpose be included on the -+ same "printed page" as the copyright notice for easier -+ identification within third-party archives. -+ -+ Copyright [yyyy] [name of copyright owner] -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. -+ -+ -+---- LLVM Exceptions to the Apache 2.0 License ---- -+ -+As an exception, if, as a result of your compiling your source code, portions -+of this Software are embedded into an Object form of such source code, you -+may redistribute such embedded portions in such Object form without complying -+with the conditions of Sections 4(a), 4(b) and 4(d) of the License. -+ -+In addition, if you combine or link compiled forms of this Software with -+software that is licensed under the GPLv2 ("Combined Software") and if a -+court of competent jurisdiction determines that the patent provision (Section -+3), the indemnity provision (Section 9) or other Section of the License -+conflicts with the conditions of the GPLv2, you may retroactively and -+prospectively choose to deem waived or otherwise exclude such Section(s) of -+the License, but only in their entirety and only with respect to the Combined -+Software. -+ -+============================================================================== -+Software from third parties included in the LLVM Project: -+============================================================================== -+The LLVM Project contains third party software which is under different license -+terms. All such code will be identified clearly using at least one of two -+mechanisms: -+1) It will be in a separate directory tree with its own `LICENSE.txt` or -+ `LICENSE` file at the top containing the specific license and restrictions -+ which apply to that software, or -+2) It will contain specific license and restriction terms at the top of every -+ file. -+ -+============================================================================== -+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy): -+============================================================================== -+University of Illinois/NCSA -+Open Source License -+ -+Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign. -+All rights reserved. -+ -+Developed by: -+ -+ LLVM Team -+ -+ University of Illinois at Urbana-Champaign -+ -+ http://llvm.org -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal with -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: -+ -+ * Redistributions of source code must retain the above copyright notice, -+ this list of conditions and the following disclaimers. -+ -+ * Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimers in the -+ documentation and/or other materials provided with the distribution. -+ -+ * Neither the names of the LLVM Team, University of Illinois at -+ Urbana-Champaign, nor the names of its contributors may be used to -+ endorse or promote products derived from this Software without specific -+ prior written permission. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE -+SOFTWARE. -+ diff --git a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch b/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch deleted file mode 100644 index 02d7b7b61..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 11 Aug 2022 01:08:46 -0500 -Subject: [PATCH] Add SourceBuild.props. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - eng/SourceBuild.props | 8 ++++++++ - 1 file changed, 8 insertions(+) - create mode 100644 eng/SourceBuild.props - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -new file mode 100644 -index 000000000000..93e2809599f6 ---- /dev/null -+++ b/eng/SourceBuild.props -@@ -0,0 +1,8 @@ -+ -+ -+ -+ llvm-project -+ true -+ -+ -+ diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch deleted file mode 100644 index 4625e0e9a..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 25 Jul 2022 15:53:59 +0000 -Subject: [PATCH] Add CA2213 NoWarn - -Workaround until NuGet updates to build with latest .NET toolset. ---- - build/common.project.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 93287fdde..9d1fb3bce 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -52,7 +52,7 @@ - $(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.21378.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll - $(NoWarn);NU5105;MSB3277 - -- $(NoWarn);CS1998;CA1416;CS0618;CS1574 -+ $(NoWarn);CS1998;CA1416;CS0618;CS1574;CA2213 - - - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index d1ae9b05d..eec487f1b 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -15,7 +15,7 @@ This is taking the approach used in previous versions of source-build: update th Contributes to https://github.com/dotnet/source-build/issues/2420 Contributes to https://github.com/dotnet/source-build/issues/2527 -Backport: https://github.com/dotnet/source-build/issues/2708 +Backport: https://github.com/dotnet/source-build/issues/3049 --- eng/Versions.props | 14 -------------- src/Directory.Build.targets | 5 +++-- diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch new file mode 100644 index 000000000..02e49eec9 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Mon, 26 Sep 2022 14:25:33 -0500 +Subject: Remove LLVM ObjWriter dependency in source-build + +Backport PR: https://github.com/dotnet/runtime/pull/76206. + +--- + src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +index 8c4fce523906e..4fd1db03e8a48 100644 +--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props ++++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +@@ -48,12 +48,14 @@ + + + true ++ ++ true + + + + + +- ++ + $(ObjWriterVersion) + + +@@ -62,7 +64,7 @@ + $(NetStandardLibraryVersion) + + +- ++ + PreserveNewest + false + false diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch index cf69f8b84..dd0d19c7a 100644 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch @@ -3,8 +3,7 @@ From: Logan Bussell Date: Tue, 20 Sep 2022 10:10:29 -0700 Subject: [PATCH] Look for msbuild net7.0 artifacts -This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows -into dotnet/sdk, at which point that repo will need this change. +Backport: https://github.com/dotnet/sdk/pull/28425 --- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index c7a7642e4..da7d186a1 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,7 +1,7 @@ - + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 275ec3a11..c9718bef9 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -168,6 +168,7 @@ linux-bionic-arm64; linux-bionic-x64; linux-bionic-x86; + linux-ppc64le; "/> - + + @@ -444,7 +447,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore70RuntimePackRids, '%3B')" RuntimePackExcludedRuntimeIdentifiers="android" /> @@ -569,7 +572,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(_AspNet60TargetingPackVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')" />