-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Merge release/6.0-maui branch back into release/6.0 #64352
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.
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
Closed
Closed
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
30c3091
Brand release/6.0-maui branch appropriately (#61792)
directhex af20fce
[mono][interp] Remove hack for nint/nfloat (#62053)
BrzVlad 5e7fb16
Shrink version name due to nuget maximum (#62190)
directhex 6c8d2b0
[release/6.0-maui] Exclude the managed code around libproc on iOS/tvO…
MaximLipnin 3992fc3
Update timeout for sourcebuild (#61436) (#62300)
directhex 2ab2de4
[MonoAOTCompiler] more properties & custom WorkingDirectory (#62849)
github-actions[bot] 6523aa4
Merge branch 'release/6.0-maui' into merge/release/6.0-to-release/6.0…
akoeplinger d63fcb9
Disable package generation
akoeplinger 37e3ee4
Merge pull request #62850 from dotnet-maestro-bot/merge/release/6.0-t…
jkotas 7636d44
transform sgen_get_descriptor to parallel safe version in job_major_m…
github-actions[bot] b96f560
Bump SdkBandVersion prop to 6.0.200 (#62787)
steveisok a66e67b
Bump SdkVersionForWorkloadTesting to use a 200 band SDK (#63450)
steveisok a9d5ccd
[release/6.0-maui] Add back HAVE_SYS_ZLIB support (#63359)
lambdageek f36afb1
[release/6.0-maui] Backport MacCatalyst process start support (#62520)
simonrozsival 936a1c1
[automated] Merge branch 'release/6.0' => 'release/6.0-maui' (#63112)
dotnet-maestro-bot e08fc29
Merge branch 'release/6.0-maui' into merge/release/6.0-to-release/6.0…
akoeplinger 1ea69f9
Merge pull request #63807 from dotnet-maestro-bot/merge/release/6.0-t…
akoeplinger a54012e
[release/6.0-maui] Serialize SendPacketsAsync tests (#63896)
github-actions[bot] ffa6594
[release/6.0-maui] [Android] Prevent potential out of bounds write on…
github-actions[bot] 994a341
[release/6.0-maui] [debugger] Fix reading a byte without checking the…
thaystg 063054b
[release/6.0-maui] [mono][debugger] Fix step on ios when using interp…
github-actions[bot] fd2cdbb
[iOS/tvOS] Remove P/Invokes to libproc from System.Private.CoreLib (#…
akoeplinger 49d6db3
[release/6.0-maui] [Android] Fix accessing network interfaces informa…
simonrozsival 4f567e5
Take MacCatalyst into account in EnvironmentTests.WorkingSet_Valid te…
github-actions[bot] 6371525
[release/6.0-maui] Android remove backward timezones (#64228)
github-actions[bot] 059caa2
Merge pull request #64056 from dotnet-maestro-bot/merge/release/6.0-t…
akoeplinger 9e82981
[release/6.0-maui][mono] Recognize new names for Xamarin.iOS etc asse…
akoeplinger 2405c8e
Revert branch specific changes
safern File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[release/6.0-maui] [Android] Fix accessing network interfaces informa…
…tion (#63628) * [Android] Fix accessing network interfaces information (#62780) * Re-enable tests * Dynamically load getifaddrs if necessary * Prevent redeclaration of the ifaddrs struct * Fix typo * Do not close the dynamic library * Enable the fixed functional tests in CI * Reduce code duplication for obtaining libc file name * Simplify usage of the function pointers * Move typedefs * Rename the _ensure_ function * Remove fptr typedefs * Update comment * Add missing include * Update comment * Remove unnecessary comment * Move static variable * Remove unnecessary change * Move LIBC_FILENAME to the utilities header * Avoid error if constant is undefined * Conditionally include ifaddrs * Try to fix cmake_symbol_exists issue for browser * Minor tweaks * Try different way of detecting getifaddrs * Use the hack only for Android builds * Revert "Move LIBC_FILENAME to the utilities header" This reverts commit 4e67687. * Revert "Reduce code duplication for obtaining libc file name" This reverts commit aca15d1. * Simplify opening libc * Update code style * Fix race condition * Prevent race condition * Switch locking implementation for a lock-free implementation * Enable unit test for Android * Try using weak symbols * Fix function name * Revert "Fix function name" This reverts commit f927aae. * Revert "Try using weak symbols" This reverts commit 46d3ede. * Refactor code to use pthread_once * [Android] Throw PNSE for unavailable network information (#63633) * Update tests * Add android specific implementation * Add UnsupportedOSPlatform attributes * Fix typo * Remove unnecessary file reference * Clean-up code * Minor code clean-up * Remove dictionary * Refactoring * Revert comment change * Fix usage of Interop.Sys.GetNetworkInterfaces
- Loading branch information
commit 49d6db32b2f9bd371649298e71337e20c766dcf0
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...tem.Net.NetworkInformation/src/System/Net/NetworkInformation/AndroidIPGlobalProperties.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| namespace System.Net.NetworkInformation | ||
| { | ||
| internal sealed class AndroidIPGlobalProperties : UnixIPGlobalProperties | ||
| { | ||
| public override TcpConnectionInformation[] GetActiveTcpConnections() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override IPEndPoint[] GetActiveTcpListeners() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override IPEndPoint[] GetActiveUdpListeners() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override IcmpV4Statistics GetIcmpV4Statistics() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override IcmpV6Statistics GetIcmpV6Statistics() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override IPGlobalStatistics GetIPv4GlobalStatistics() | ||
| => new AndroidIPGlobalStatistics(ipv4: true); | ||
|
|
||
| public override IPGlobalStatistics GetIPv6GlobalStatistics() | ||
| => new AndroidIPGlobalStatistics(ipv4: false); | ||
|
|
||
| public override TcpStatistics GetTcpIPv4Statistics() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override TcpStatistics GetTcpIPv6Statistics() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override UdpStatistics GetUdpIPv4Statistics() => throw new PlatformNotSupportedException(); | ||
|
|
||
| public override UdpStatistics GetUdpIPv6Statistics() => throw new PlatformNotSupportedException(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.