Skip to content
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

Jump to bottom

Enable NativeAOT win-x86 runtime tests #99688

Merged
merged 5 commits into from
Apr 1, 2024
Merged

Enable NativeAOT win-x86 runtime tests #99688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10d0379
Enable NativeAOT/win-x86 Pri0 tests
filipnavara Mar 13, 2024
fdd1660
Enable Libs tests
filipnavara Mar 14, 2024
86c8457
Add x86 into supported platforms to unblock libs build
filipnavara Mar 14, 2024
34b33d1
Bump timeout
filipnavara Mar 18, 2024
9f47aed
Update ILCompilerRIDs.props
MichalStrehovsky Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ extends:
platforms:
- windows_x64
- windows_arm64
- windows_x86
- osx_x64
- osx_arm64
- linux_x64
Expand Down Expand Up @@ -164,6 +165,7 @@ extends:
buildConfig: Checked
platforms:
- windows_x64
- windows_x86
- linux_x64
- linux_arm
variables:
Expand All @@ -172,7 +174,7 @@ extends:
- name: timeoutPerTestCollectionInMinutes
value: 180
jobParameters:
timeoutInMinutes: 240
timeoutInMinutes: 300 # doesn't normally take this long, but we have had Helix queues backed up for over an hour
nameSuffix: NativeAOT_Pri0
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release /p:RunAnalyzers=false
postBuildSteps:
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(OS)' != 'Windows_NT' and '$(_targetOS)' == 'win'"
Text="Cross-OS native compilation is not supported." />

<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(_targetArchitecture)' != 'x64' and '$(_targetArchitecture)' != 'arm64' and '$(_targetArchitecture)' != 'arm'"
<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(_targetArchitecture)' != 'x64' and '$(_targetArchitecture)' != 'x86' and '$(_targetArchitecture)' != 'arm64' and '$(_targetArchitecture)' != 'arm'"
Text="Native compilation does not support targeting $(RuntimeIdentifier) yet." />

<Error Condition="'$(DisableUnsupportedError)' != 'true' and !('$(_hostArchitecture)' == 'x64' or '$(_hostArchitecture)' == 'arm64' or '$(_hostArchitecture)' == 'arm')"
Text="Native compilation can run on x64, arm64 and arm hosts only." />
<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(_hostArchitecture)' != 'x64' and '$(_hostArchitecture)' != 'x86' and '$(_hostArchitecture)' != 'arm64' and '$(_hostArchitecture)' != 'arm'"
Text="Native compilation can run on x64, x86, arm64 and arm hosts only." />

<Error Condition="'$(IlcHostPackagePath)' == '' and '$(RuntimePackagePath)' != '' and ('$(_hostArchitecture)' == 'x64' or '$(_hostArchitecture)' == 'arm64')"
Text="Add a PackageReference for '$(_hostPackageName)' to allow cross-compilation for $(_targetArchitecture)" />
Expand Down
1 change: 1 addition & 0 deletions src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<OfficialBuildRID Include="osx-arm64" Platform="arm64" />
<OfficialBuildRID Include="win-arm64" Platform="arm64" />
<OfficialBuildRID Include="win-x64" Platform="x64" />
<OfficialBuildRID Include="win-x86" Platform="x86" />
<OfficialBuildRID Include="freebsd-x64" Platform="x64" />
<OfficialBuildRID Include="freebsd-arm64" Platform="arm64" />
<OfficialBuildRID Include="$(OutputRID)" Platform="$(TargetArchitecture)" Exclude="@(OfficialBuildRID)" />
Expand Down