Skip to content

Fix nullability issues in MacCatalystSupport #109

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
rolfbjarne merged 2 commits into from
Dec 1, 2022
Merged

Fix nullability issues in MacCatalystSupport #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7edee
Fix nullability issues in MacCatalystSupport
rolfbjarne Nov 28, 2022
85254aa
Auto-format source code
Nov 28, 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
22 changes: 18 additions & 4 deletions Xamarin.MacDev/MacCatalystSupport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
#nullable enable

using System;
#if NET
using System.Diagnostics.CodeAnalysis;
#endif
using System.Collections.Generic;
using System.IO;

Expand Down Expand Up @@ -58,7 +61,7 @@ public static void LoadVersionMaps (string sdkDirectory, out Dictionary<string,
}
}

public static bool TryGetMacOSVersion (string sdkDirectory, Version iOSVersion, out Version? macOSVersion, out ICollection<string> knowniOSVersions)
public static bool TryGetMacOSVersion (string sdkDirectory, Version iOSVersion, [NotNullWhen (true)] out Version? macOSVersion, out ICollection<string> knowniOSVersions)
{
macOSVersion = null;

Expand All @@ -68,7 +71,7 @@ public static bool TryGetMacOSVersion (string sdkDirectory, Version iOSVersion,
return Version.TryParse (strValue, out macOSVersion);
}

public static bool TryGetMacOSVersion (string sdkDirectory, string iOSVersion, out string macOSVersion, out ICollection<string> knowniOSVersions)
public static bool TryGetMacOSVersion (string sdkDirectory, string iOSVersion, [NotNullWhen (true)] out string? macOSVersion, out ICollection<string> knowniOSVersions)
{
LoadVersionMaps (sdkDirectory, out var map, out var _);

Expand All @@ -77,7 +80,7 @@ public static bool TryGetMacOSVersion (string sdkDirectory, string iOSVersion, o
return map.TryGetValue (iOSVersion.ToString (), out macOSVersion);
}

public static bool TryGetiOSVersion (string sdkDirectory, Version macOSVersion, out Version? iOSVersion, out ICollection<string> knownMacOSVersions)
public static bool TryGetiOSVersion (string sdkDirectory, Version macOSVersion, [NotNullWhen (true)] out Version? iOSVersion, out ICollection<string> knownMacOSVersions)
{
iOSVersion = null;

Expand All @@ -87,7 +90,7 @@ public static bool TryGetiOSVersion (string sdkDirectory, Version macOSVersion,
return Version.TryParse (strValue, out iOSVersion);
}

public static bool TryGetiOSVersion (string sdkDirectory, string macOSVersion, out string iOSVersion, out ICollection<string> knownMacOSVersions)
public static bool TryGetiOSVersion (string sdkDirectory, string macOSVersion, [NotNullWhen (true)] out string? iOSVersion, out ICollection<string> knownMacOSVersions)
{
LoadVersionMaps (sdkDirectory, out var _, out var map);

Expand All @@ -97,3 +100,14 @@ public static bool TryGetiOSVersion (string sdkDirectory, string macOSVersion, o
}
}
}

#if !NET
namespace System.Diagnostics.CodeAnalysis {
// from: https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
[AttributeUsage (AttributeTargets.Parameter, Inherited = false)]
internal sealed class NotNullWhenAttribute : Attribute {
public NotNullWhenAttribute (bool returnValue) => ReturnValue = returnValue;
public bool ReturnValue { get; }
}
}
#endif // !NET