Skip to content

[manual] Merge release/9.0-staging into release/9.0 (second pass) #111422

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
Merged
merged 3 commits into from
Jan 14, 2025
Merged

[manual] Merge release/9.0-staging into release/9.0 (second pass) #111422

merged 3 commits into from
Jan 14, 2025

Conversation

carlossanlop
Copy link
Contributor

@carlossanlop carlossanlop commented Jan 14, 2025 •
edited
Loading

MERGE COMMIT!

cc @wfurt @matouskozak

@mmitche this is the last bunch of changes to flow.

github-actions bot and others added 3 commits January 14, 2025 11:12
@github-actions @wfurt
[9.0] Guard against empty Accept address (#111366)
2b19745 
* guard agains empty Accept address

* remove assert

* add comment

---------

Co-authored-by: wfurt <[email protected]>
@github-actions @wfurt
fix FastOpen compilation (#111142)
01ad3ef 
Co-authored-by: wfurt <[email protected]>
@github-actions @matouskozak
[apple-mobile] Disable TLSWitLoadedDlls for Apple mobile (#111356)
1975912 
Co-authored-by: Matous Kozak <[email protected]>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Jan 14, 2025
@carlossanlop carlossanlop added this to the 9.0.2 milestone Jan 14, 2025
@carlossanlop carlossanlop self-assigned this Jan 14, 2025
@carlossanlop
Copy link
Contributor Author

@akoeplinger @lewing there is a build failure in mono - Libclang '' doesn't exist.. Can you please take a look? This is most likely pre-existing to the changes in this PR:

  -- Found Python3: /usr/bin/python3.12 (found version "3.12.3") found components: Interpreter
  -- Looking for accept4
  -- Looking for accept4 - found
  -- Found Python: /usr/bin/python3.12 (found version "3.12.3") found components: Interpreter
  -- Configuring done (14.8s)
  -- Generating done (0.2s)
  -- Build files have been written to: /__w/1/s/artifacts/obj/mono/android.x64.Release
  Running 'python3 /__w/1/s/src/mono/mono/tools/offsets-tool/offsets-tool.py --abi=x86_64-none-linux-android --netcore --targetdir="/__w/1/s/artifacts/obj/mono/android.x64.Release" --monodir="/__w/1/s/src/mono" --nativedir="/__w/1/s/src/native" --outfile="/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/offsets-x64-android.h" --libclang="" --sysroot="/usr/local/android-sdk/ndk/27.2.12479018/toolchains/llvm/prebuilt/linux-x86_64/sysroot"'
  Libclang '' doesn't exist.
/__w/1/s/src/mono/mono.proj(1008,5): error MSB3073: The command "python3 /__w/1/s/src/mono/mono/tools/offsets-tool/offsets-tool.py --abi=x86_64-none-linux-android --netcore --targetdir="/__w/1/s/artifacts/obj/mono/android.x64.Release" --monodir="/__w/1/s/src/mono" --nativedir="/__w/1/s/src/native" --outfile="/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/offsets-x64-android.h" --libclang="" --sysroot="/usr/local/android-sdk/ndk/27.2.12479018/toolchains/llvm/prebuilt/linux-x86_64/sysroot"" exited with code 1.
##[error]src/mono/mono.proj(1008,5): error MSB3073: (NETCORE_ENGINEERING_TELEMETRY=Build) The command "python3 /__w/1/s/src/mono/mono/tools/offsets-tool/offsets-tool.py --abi=x86_64-none-linux-android --netcore --targetdir="/__w/1/s/artifacts/obj/mono/android.x64.Release" --monodir="/__w/1/s/src/mono" --nativedir="/__w/1/s/src/native" --outfile="/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/offsets-x64-android.h" --libclang="" --sysroot="/usr/local/android-sdk/ndk/27.2.12479018/toolchains/llvm/prebuilt/linux-x86_64/sysroot"" exited with code 1.

Build FAILED.

/__w/1/s/src/mono/mono.proj(1008,5): error MSB3073: The command "python3 /__w/1/s/src/mono/mono/tools/offsets-tool/offsets-tool.py --abi=x86_64-none-linux-android --netcore --targetdir="/__w/1/s/artifacts/obj/mono/android.x64.Release" --monodir="/__w/1/s/src/mono" --nativedir="/__w/1/s/src/native" --outfile="/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/offsets-x64-android.h" --libclang="" --sysroot="/usr/local/android-sdk/ndk/27.2.12479018/toolchains/llvm/prebuilt/linux-x86_64/sysroot"" exited with code 1.
    0 Warning(s)
    1 Error(s

@carlossanlop carlossanlop mentioned this pull request Jan 14, 2025
Open
@akoeplinger
Copy link
Member

@steveisok is looking at that

@carlossanlop
Copy link
Contributor Author

@steveisok is looking at that

Awesome: #111426

@carlossanlop
Copy link
Contributor Author

/ba-g One failure is already fixed, the other has a known issue opened

@carlossanlop carlossanlop merged commit cbcec76 into dotnet:release/9.0 Jan 14, 2025
284 of 333 checks passed
@carlossanlop carlossanlop deleted the release/9.0-staging branch January 14, 2025 21:13
This was referenced Jan 14, 2025
Open
Open
@renovate renovate bot mentioned this pull request Feb 11, 2025
Open
1 task
@github-actions github-actions bot locked and limited conversation to collaborators Feb 14, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@carlossanlop carlossanlop

Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Milestone
9.0.2
Development

Successfully merging this pull request may close these issues.
2 participants
@carlossanlop @akoeplinger