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 | |
| 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')
| -rw-r--r-- | eng/Subsets.props | 3 | ||||
| -rw-r--r-- | eng/liveBuilds.targets | 15 | ||||
| -rw-r--r-- | eng/testing/tests.singlefile.targets | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/eng/Subsets.props b/eng/Subsets.props index b556df68ea6..bd1cda47e06 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -71,8 +71,7 @@ <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == '' or '$(BuildAllConfigurations)' == 'true'">libs.native+</DefaultLibrariesSubsets> - <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob</DefaultLibrariesSubsets> - <DefaultLibrariesSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultLibrariesSubsets)+libs.pretest</DefaultLibrariesSubsets> + <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob+libs.pretest</DefaultLibrariesSubsets> <DefaultHostSubsets>host.native+host.tools</DefaultHostSubsets> <DefaultHostSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultHostSubsets)+host.pkg+host.tests</DefaultHostSubsets> 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> diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets index e5f12a683a9..f95e1957de0 100644 --- a/eng/testing/tests.singlefile.targets +++ b/eng/testing/tests.singlefile.targets @@ -16,8 +16,6 @@ <PublishSingleFile>true</PublishSingleFile> <UseAppHost>true</UseAppHost> <SelfContained>true</SelfContained> - <SingleFileHostSourcePath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)', 'corehost'))/singlefilehost</SingleFileHostSourcePath> - <SingleFileHostSourcePath Condition="'$(TargetOS)' == 'windows'">$(SingleFileHostSourcePath).exe</SingleFileHostSourcePath> </PropertyGroup> <PropertyGroup Condition="'$(TestNativeAot)' == 'true'"> |