Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Make.versions
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ MACCATALYST_NUGET_OS_VERSION=26.0

# The following are the OS versions we first supported with the current .NET version.
# These versions must *not* change with minor .NET updates, only major .NET releases.
IOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
TVOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
MACOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=26.0
IOS_TARGET_PLATFORM_VERSION_LIBRARY=18.0
TVOS_TARGET_PLATFORM_VERSION_LIBRARY=18.0
MACOS_TARGET_PLATFORM_VERSION_LIBRARY=15.0
MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=18.0

# In theory we should define the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
# * We release support for iOS 14.5 with .NET 6
Expand Down
5 changes: 3 additions & 2 deletions tests/dotnet/UnitTests/ApplePlatformExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ public void MajorTargetPlatformVersion (ApplePlatform platform)
{
var vLibrary = Version.Parse (platform.GetDefaultTargetPlatformVersionLibrary ());
var vExecutable = Version.Parse (platform.GetDefaultTargetPlatformVersionExecutable ());
// We might have to change the assert if we release support for a new major OS version within a .NET releases (this happened for .NET 8)
Assert.AreEqual (vExecutable.Major, vLibrary.Major, "The major version must be the same between the default TPV for library and executable projects.");
var vExpectedLibraryMajor = platform == ApplePlatform.MacOSX ? 15 : 18;
Assert.That (vLibrary.Major, Is.EqualTo (vExpectedLibraryMajor), "vLibrary");
Assert.That (vExecutable.Major, Is.EqualTo (26), "vExecutable");
}
}
}
8 changes: 4 additions & 4 deletions tools/common/SdkVersions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ static class SdkVersions {
public const string TargetPlatformVersionExecutablemacOS = "26.0";
public const string TargetPlatformVersionExecutableMacCatalyst = "26.0";

public const string TargetPlatformVersionLibraryiOS = "26.0";
public const string TargetPlatformVersionLibrarytvOS = "26.0";
public const string TargetPlatformVersionLibrarymacOS = "26.0";
public const string TargetPlatformVersionLibraryMacCatalyst = "26.0";
public const string TargetPlatformVersionLibraryiOS = "18.0";
public const string TargetPlatformVersionLibrarytvOS = "18.0";
public const string TargetPlatformVersionLibrarymacOS = "15.0";
public const string TargetPlatformVersionLibraryMacCatalyst = "18.0";

public static Version OSXVersion { get { return new Version (OSX); } }
public static Version iOSVersion { get { return new Version (iOS); } }
Expand Down
Loading