diff options
author | Andy Gocke <angocke@microsoft.com> | 2022-04-27 02:56:10 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-27 02:56:10 +0300 |
commit | 7ff3ac64bbd82144c0c9a00d09763cfeeb3f438d (patch) | |
tree | 3070a482c2457765a0fc87bf62971fe56df769be /eng | |
parent | c10154087e734fa58f08f2797e5d99404e9cd96b (diff) |
Retry publish crossgen as AOT (#67636)
Brings back the earlier change to publish crossgen as AOT with a fix for restore flakiness (#65948)
Closes #60016
(cherry picked from commit 0d1e04ba2a9ebc9d21a7f65db00407dd0056b547)
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Subsets.props | 3 | ||||
-rw-r--r-- | eng/liveBuilds.targets | 1 | ||||
-rw-r--r-- | eng/testing/tests.singlefile.targets | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/eng/Subsets.props b/eng/Subsets.props index 524ef40f8a9..f967b3e50ec 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..77e9a90b97d 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"> 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'"> |