Skip to content

Clean up the crossgen2_publish project and local/live packs references #92826

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.

Sign up for GitHub

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
ViktorHofer merged 16 commits into from
Oct 3, 2023
Merged

Clean up the crossgen2_publish project and local/live packs references #92826

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d4dffde
Inline some of the options for the new crossgen2_publish project.
jkoritzinsky Sep 29, 2023
47325f7
Resolve TODOs in targetingpacks.targets
jkoritzinsky Sep 29, 2023
1a4402d
Crossgen1 is long gone. Don't try to discover it in our override targ…
jkoritzinsky Sep 29, 2023
affe0fd
Move ReadyToRun.targets infra into the shared repo infrastructure and…
jkoritzinsky Sep 29, 2023
bfc601d
Remove extraneous property set (the same value is calculated automati…
jkoritzinsky Sep 29, 2023
0b69d8d
Remove outdated comment.
jkoritzinsky Sep 29, 2023
cffdb4d
Fix NativeAOT and installer legs
jkoritzinsky Sep 29, 2023
0e3c720
Condition turning off pack downloads based on opt-in to local pack us…
jkoritzinsky Sep 29, 2023
09eaab4
Use the LKG host instead of the 7.0 host as the fallback for NativeEx…
jkoritzinsky Sep 29, 2023
de2f5e2
Apply suggestions from code review
jkoritzinsky Sep 30, 2023
c47bb43
Merge branch 'main' of github.com:dotnet/runtime into crossgen2-publi…
jkoritzinsky Oct 2, 2023
6620cc6
Remove AdditionalProperties as they aren't needed (global properties …
jkoritzinsky Oct 2, 2023
6a29dc3
PR feedback
jkoritzinsky Oct 2, 2023
8d32750
Hook into the targets pipeline to avoid overridding targets for R2Rin…
jkoritzinsky Oct 2, 2023
aac7ba1
Don't set CoreCLRArtifactsPath manually.
jkoritzinsky Oct 2, 2023
fdf9b1b
PR feedback
jkoritzinsky Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't set CoreCLRArtifactsPath manually.
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Oct 2, 2023
commit aac7ba1598bbfc1329d060862ad4c95cd90df3c3
6 changes: 2 additions & 4 deletions src/coreclr/tools/aot/crossgen2/crossgen2.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,16 @@
<TargetArchitectureForSharedLibraries Condition="'$(TargetArchitectureForSharedLibraries)'=='armel'">arm</TargetArchitectureForSharedLibraries>

<JitInterfaceLibraryName>$(LibPrefix)jitinterface_$(TargetArchitectureForSharedLibraries)$(LibSuffix)</JitInterfaceLibraryName>
<!-- This will be provided when using the liveBuild, and unset otherwise. -->
<CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$(RuntimeBinDir)$(CrossHostArch)</CoreCLRArtifactsPath>
</PropertyGroup>

<ItemGroup>
<Content Include="$(CoreCLRArtifactsPath)/$(JitInterfaceLibraryName)"
<Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(JitInterfaceLibraryName)"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="PreserveNewest"
Link="%(FileName)%(Extension)"
/>

<Content Include="$(CoreCLRArtifactsPath)/$(LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(LibSuffix)"
<Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(LibSuffix)"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="PreserveNewest"
Link="%(FileName)%(Extension)"
Expand Down