diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d7526c22842..d334de595cf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,6 +17,11 @@ https://github.com/dotnet/windowsdesktop d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 + + https://github.com/dotnet/llvm-project + 75e182c26dbf5d9f8ccca0ac68ee63b0bebb17b8 + + https://github.com/dotnet/runtime f52d8c59bb49360eb2cbeeb863c5856ebd62adda diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 2cf4ad6288ce..32d8df03b737 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -12,7 +12,7 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- - centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b @@ -38,16 +38,16 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - CentOS7-Online: + CentOSStream8-Online: _BootstrapPrep: false - _Container: ${{ parameters.centOS7Container }} + _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - CentOS7-Offline: + CentOSStream8-Offline: _BootstrapPrep: false - _Container: ${{ parameters.centOS7Container }} + _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: false diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 85bd5f8e64d9..7d907a9f177d 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -33,6 +33,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/llvm-project.proj b/src/SourceBuild/tarball/content/repos/llvm-project.proj new file mode 100644 index 000000000000..c2c23cba4cad --- /dev/null +++ b/src/SourceBuild/tarball/content/repos/llvm-project.proj @@ -0,0 +1,21 @@ + + + + + $(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) + + $(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 09b4625e9d29..6c3939492b3e 100644 --- a/src/SourceBuild/tarball/content/repos/runtime-portable.proj +++ b/src/SourceBuild/tarball/content/repos/runtime-portable.proj @@ -9,6 +9,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repos/runtime.proj index 59ea1d6fc3f0..04ff19ab1026 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.proj +++ b/src/SourceBuild/tarball/content/repos/runtime.proj @@ -18,6 +18,7 @@ + diff --git a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch new file mode 100644 index 000000000000..57846fba6367 --- /dev/null +++ b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 10 Aug 2022 13:44:31 -0500 +Subject: [PATCH] Upgrade to an MS.Build.Traversal version we have a ref + package for. + +Backport PR is https://github.com/dotnet/llvm-project/pull/241. + +--- + global.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/global.json b/global.json +index df77e9a199d6..19b99be1f71b 100644 +--- a/global.json ++++ b/global.json +@@ -5,6 +5,6 @@ + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1", +- "Microsoft.Build.Traversal": "2.0.2" ++ "Microsoft.Build.Traversal": "2.0.34" + } + } diff --git a/src/SourceBuild/tarball/patches/llvm-project/0002-Update-for-new-MSBuild-warning.patch b/src/SourceBuild/tarball/patches/llvm-project/0002-Update-for-new-MSBuild-warning.patch new file mode 100644 index 000000000000..62677c12d965 --- /dev/null +++ b/src/SourceBuild/tarball/patches/llvm-project/0002-Update-for-new-MSBuild-warning.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 10 Aug 2022 21:30:49 -0500 +Subject: [PATCH] Update for new MSBuild warning. + +Backport PR: https://github.com/dotnet/llvm-project/pull/241. + +--- + nuget/packages.builds | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nuget/packages.builds b/nuget/packages.builds +index a4d2bc03d454..85d860081e53 100644 +--- a/nuget/packages.builds ++++ b/nuget/packages.builds +@@ -31,7 +31,7 @@ + + + ++ AdditionalProperties="%(ProjectReference.AdditionalProperties);FileVersion=$(FileVersion)" /> + + + 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 new file mode 100644 index 000000000000..868911a22ff5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch @@ -0,0 +1,298 @@ +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 new file mode 100644 index 000000000000..02d7b7b616e3 --- /dev/null +++ b/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch @@ -0,0 +1,26 @@ +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 ++ ++ ++