Skip to content

[libraries] Skip GetOpenSslVersion on Apple OS #37646

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
akoeplinger merged 2 commits into from
Jun 9, 2020
Merged

[libraries] Skip GetOpenSslVersion on Apple OS #37646

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
863ada5
[libraries] Skip GetOpenSslVersion on Apple OS
Jun 9, 2020
d64d9f2
Remove iOS and tvOS from reference
Jun 9, 2020
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
6 changes: 5 additions & 1 deletion src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,16 @@ public static partial class PlatformDetection
public static bool IsRedHatFamily7 => IsRedHatFamilyAndVersion(7);
public static bool IsNotFedoraOrRedHatFamily => !IsFedora && !IsRedHatFamily;
public static bool IsNotDebian10 => !IsDebian10;
public static bool IsNotApple =>
!RuntimeInformation.IsOSPlatform(OSPlatform.iOS) &&
!RuntimeInformation.IsOSPlatform(OSPlatform.OSX) &&
!RuntimeInformation.IsOSPlatform(OSPlatform.tvOS);

public static bool IsSuperUser => !IsWindows ?
libc.geteuid() == 0 :
throw new PlatformNotSupportedException();

public static Version OpenSslVersion => !IsOSX && !IsWindows ?
public static Version OpenSslVersion => IsNotApple && !IsWindows ?
GetOpenSslVersion() :
throw new PlatformNotSupportedException();

Expand Down
2 changes: 2 additions & 0 deletions ...teropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ public enum Architecture
private readonly int _dummyPrimitive;
public static System.Runtime.InteropServices.OSPlatform Browser { get { throw null; } }
public static System.Runtime.InteropServices.OSPlatform FreeBSD { get { throw null; } }
public static System.Runtime.InteropServices.OSPlatform iOS { get { throw null; } }
Copy link
Member

@akoeplinger akoeplinger Jun 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of adding this to the ref (which will be done in #36704 and needs API review), please instead use RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS")) in the usages.

Copy link
Member Author

@mdh1418 mdh1418 Jun 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should a follow up after #36704 be to change them back to RuntimeInformation.IsOSPlatform(OSPlatform.iOS) and RuntimeInformation.IsOSPlatform(OSPlatform.tvOS)?

Copy link
Member

@akoeplinger akoeplinger Jun 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ideally yes, but it's just a cosmetic cleanup

public static System.Runtime.InteropServices.OSPlatform Linux { get { throw null; } }
public static System.Runtime.InteropServices.OSPlatform OSX { get { throw null; } }
public static System.Runtime.InteropServices.OSPlatform tvOS { get { throw null; } }
public static System.Runtime.InteropServices.OSPlatform Windows { get { throw null; } }
public static System.Runtime.InteropServices.OSPlatform Create(string osPlatform) { throw null; }
public override bool Equals(object? obj) { throw null; }
Expand Down
4 changes: 4 additions & 0 deletions ...es.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/OSPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ namespace System.Runtime.InteropServices

public static OSPlatform FreeBSD { get; } = new OSPlatform("FREEBSD");

public static OSPlatform iOS { get; } = new OSPlatform("IOS");

public static OSPlatform Linux { get; } = new OSPlatform("LINUX");

public static OSPlatform OSX { get; } = new OSPlatform("OSX");

public static OSPlatform tvOS { get; } = new OSPlatform("TVOS");

public static OSPlatform Windows { get; } = new OSPlatform("WINDOWS");

private OSPlatform(string osPlatform)
Expand Down