Skip to content

[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' #74205

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 8 commits into from
Aug 20, 2022
Merged

[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' #74205

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f908dbc
[Ppc64le] bug fixes (#74131)
alhad-deshpande Aug 19, 2022
195178b
Improve ControlledExecution tests (#74186)
github-actions[bot] Aug 19, 2022
1af9cfd
Shorten the workload name even more (#74176)
github-actions[bot] Aug 19, 2022
d9c1700
[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…
github-actions[bot] Aug 20, 2022
39d767a
Don't NativeAOT crossgen on ARM64 (#74221)
github-actions[bot] Aug 20, 2022
c7cab43
[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)
github-actions[bot] Aug 20, 2022
37193fd
Don't track current field of state machines (#74216)
github-actions[bot] Aug 20, 2022
3c73d4d
[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)
hoyosjs Aug 20, 2022
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 NativeAOT crossgen on ARM64 (#74221) 
Lets us make #72645 a non-blocking-release issue.

We also set NativeAotSupported to false for Mac on the line above. Crossgen2 will still ship NativeAOT compiled on x64 Linux and Windows. R2R+SingleFile+Trimmed elsewhere.

Co-authored-by: Michal Strehovský <[email protected]>
  • Loading branch information
@github-actions @MichalStrehovsky
github-actions[bot] and MichalStrehovsky authored Aug 20, 2022
commit 39d767a3248b8e7d7f2f3b76cb522e736878e4e6
4 changes: 4 additions & 0 deletions src/coreclr/tools/aot/crossgen2/crossgen2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<!-- Can't use NativeAOT in source build yet https://github.com/dotnet/runtime/issues/66859 and we
don't want to ship using NativeAOT on MacOS -->
<NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetOS)' == 'osx'">false</NativeAotSupported>

<!-- Work around https://github.com/dotnet/runtime/issues/72645 -->
<NativeAotSupported Condition="'$(TargetArchitecture)' == 'arm64'">false</NativeAotSupported>

<!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
<PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
<RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
Expand Down