diff options
| author | Andy Gocke <angocke@microsoft.com> | 2022-04-01 20:22:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 20:22:28 +0300 |
| commit | 0d1e04ba2a9ebc9d21a7f65db00407dd0056b547 (patch) | |
| tree | 4573dbbeaf5462713c652add4f1f620bbec31636 /eng/liveBuilds.targets | |
| parent | 7d562f9d2a4285881ae1c412aecb164dc9370013 (diff) | |
Publish crossgen as AOT if supported by the target platform (#65948)
Publishes crossgen as an AOT binary on Windows+Linux x64+ARM64, otherwise publishes as an R2R single file.
Closes #60016
Diffstat (limited to 'eng/liveBuilds.targets')
| -rw-r--r-- | eng/liveBuilds.targets | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index a8e8fffe470..0583f48aed5 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -49,6 +49,7 @@ <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsWindows)' == 'true'">x86</CoreCLRCrossTargetComponentDirName> <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName> <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'armel' and '$(BuildArchitecture)' != 'armel' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName> + <SingleFileHostSourcePath>$(CoreCLRArtifactsPath)/corehost/singlefilehost$(ExeSuffix)</SingleFileHostSourcePath> </PropertyGroup> <Target Name="ResolveRuntimeFilesFromLocalBuild"> @@ -222,4 +223,18 @@ <PropertyGroup> <BundledRuntimeIdentifierGraphFile>$(RuntimeIdGraphDefinitionFile)</BundledRuntimeIdentifierGraphFile> </PropertyGroup> + + <Target Name="RewriteRuntimePackDir" + Condition="'$(RunningPublish)' == 'true'" + DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" + BeforeTargets="ResolveRuntimePackAssets"> + <ItemGroup> + <!-- Remove AspNetCore runtime pack since we don't build it locally --> + <ResolvedRuntimePack Remove="Microsoft.AspNetCore.App.Runtime.$(RuntimeIdentifier)" /> + + <ResolvedRuntimePack Update="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"> + <PackageDirectory>$(MicrosoftNetCoreAppRuntimePackDir)</PackageDirectory> + </ResolvedRuntimePack> + </ItemGroup> + </Target> </Project> |