-
Notifications
You must be signed in to change notification settings - Fork 5.3k
ArPow stage 1: local source-build infrastructure #53294
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
1054536
Initial arcade-powered source-build infra
dagood 7d0c956
Add patches, fixup from 5.0
dagood 376c10c
Rename patches to match 6.0-p1 work
dagood 8a4c258
Add source-build specific build script
dseefeld 9d474ce
Incorporate build-source-build.sh, into eng/
dagood 06f1d5e
Run inner build script, through coreclr
dagood 0e4d155
Initial source-build args based on live build (not props file)
dagood cc4124f
Cleanup: add RID comments, rm empty/absolute args
dagood 59fb50e
Fix subsets
dagood ad4201b
Disable sourcelink in env, not args
dagood 1c87b39
Fix CI NZEC
dagood c4f711d
Revert "Use same code to DetectCiphersuiteConfiguration for portable …
dagood 479c95a
Fix portability
dagood 2565431
Fix AllJits build
dagood cd313cd
Fix missing crossgen2 for non-portable RID
dagood 2b5307d
Create supplemental intermediate nupkgs
dagood d7546c5
Tweak category names
dagood d6602eb
Use centralized supplemental nupkg infra
dagood 843caa7
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons a7d8b95
Add additional 6.0 patches
MichaelSimons 18d9616
Patch updates after merging in main
MichaelSimons f8e8475
SourceBuild.props cleanup
MichaelSimons aa13d3c
Fix issue with incorrect patch merge
MichaelSimons 38cea15
Patch updates
MichaelSimons f5445ee
Edit clr.tools patch
MichaelSimons 4d94fd4
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons 0a8059d
patch updates
MichaelSimons 9b2c5b3
Revert patch integration
MichaelSimons 1b2d9b1
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons 23e4735
Patch updates
MichaelSimons 5a12eaf
Edits per code review feedback
MichaelSimons e0c3357
ILAsm workaround
MichaelSimons 658dea4
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons de586df
patch updates
MichaelSimons e9b7fe4
Move logic to set ILAsmToolPath for source-build
MichaelSimons 469f6a1
Update eng/SourceBuild.props
MichaelSimons 6c2e477
Remove libraries specific patches
ViktorHofer 1c97495
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons e6f5d8f
Patch updates necessary with latest main merge
MichaelSimons f026627
Add back libraries-packages.proj harvesting patch
MichaelSimons 371a532
Refactor intermediate package split to be chunkier
MichaelSimons 58bb935
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons 309421d
Integrate patch 0017
MichaelSimons 7230fa1
Subsets update per code review
MichaelSimons 972035a
Remove obsolete patch
MichaelSimons f905b0e
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons 0124b4f
Merge branch 'main' of https://github.com/dotnet/runtime into arpow-s…
MichaelSimons cf48c62
Removed patches that were integrated into main
MichaelSimons 4211c03
Remove two additional patches
ViktorHofer 88a1715
Remove remaining patches
ViktorHofer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <GitHubRepositoryName>runtime</GitHubRepositoryName> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Set up the dotnet/runtime source-build command. --> | ||
| <PropertyGroup> | ||
| <BaseInnerSourceBuildCommand>./build.sh</BaseInnerSourceBuildCommand> | ||
|
|
||
| <SourceBuildPortable>true</SourceBuildPortable> | ||
| <SourceBuildPortable Condition="'$(SourceBuildNonPortable)' == 'true'">false</SourceBuildPortable> | ||
|
|
||
| <!-- If TargetRid not specified, detect RID based on portability. --> | ||
| <TargetRid Condition="'$(TargetRid)' == '' and '$(SourceBuildNonPortable)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid> | ||
| <TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid> | ||
|
|
||
| <!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. --> | ||
| <_targetRidPlatformIndex>$(TargetRid.LastIndexOfAny("-"))</_targetRidPlatformIndex> | ||
| <TargetRidWithoutPlatform>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</TargetRidWithoutPlatform> | ||
| <TargetRidPlatform>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetRidPlatform> | ||
|
|
||
| <LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- Work around issue where local clone may cause failure using non-origin remote fallback: https://github.com/dotnet/sourcelink/issues/629 --> | ||
| <InnerBuildEnv Include="EnableSourceControlManagerQueries=false" /> | ||
| <InnerBuildEnv Include="EnableSourceLink=false" /> | ||
| <InnerBuildEnv Include="DisableSourceLink=true" /> | ||
| <InnerBuildEnv Include="DeterministicSourcePaths=false" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="GetRuntimeSourceBuildCommandConfiguration" | ||
| BeforeTargets="GetSourceBuildCommandConfiguration"> | ||
| <PropertyGroup> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --arch $(TargetRidPlatform)</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --configuration $(Configuration)</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --ci</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --allconfigurations</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:ContinuousIntegrationBuild=true</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:PackageRid=$(TargetRid)</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform)</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable)</InnerBuildArgs> | ||
| <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="CategorizeRuntimeSupplementalArtifacts" | ||
| BeforeTargets="GetCategorizedIntermediateNupkgContents"> | ||
| <ItemGroup> | ||
| <!-- | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. FYI - I logged an issue for having the ArPOW infrastructure handle large packages. |
||
| Runtime artifacts are too large to fit into a single package (Azure DevOps feeds 500 mb constraint). | ||
| Split large components into separate packages. | ||
| --> | ||
| <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-*.tar.gz" Category="runtime" /> | ||
|
|
||
| <IntermediateNupkgArtifactFile | ||
| Include=" | ||
| $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*.tar.gz; | ||
| $(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\Microsoft.NETCore.App.Crossgen2.*.nupkg" | ||
| Category="Crossgen2Pack" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <UsageData> | ||
| <IgnorePatterns> | ||
| <UsagePattern IdentityGlob="*/*" /> | ||
ViktorHofer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </IgnorePatterns> | ||
| </UsageData> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.