Skip to content

Commit

Permalink
Bump min OS versions to what Xcode 14 supports. Fixes xamarin#15216.
Browse files Browse the repository at this point in the history
Bump min OS versions to:

* iOS 11.0
* tvOS 11.0
* watchOS 4.0 (not really relevant for .NET, but matches iOS 11.0)
* macOS 10.15

Also bump the min version to execute our tooling to the macOS min version (it
doesn't make sense to be able to run our tooling on an OS you can't run the
compiled results on).

Fixes xamarin#15216.
  • Loading branch information
rolfbjarne committed Feb 2, 2023
1 parent a4b4c21 commit c3278bb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 51 deletions.
22 changes: 11 additions & 11 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/7336f72c
# Minimum OSX versions for building XI/XM
MIN_OSX_BUILD_VERSION=12.5
# Minimum OSX version for executing XI/XM tooling.
MIN_OSX_VERSION_FOR_IOS=10.11
MIN_OSX_VERSION_FOR_MAC=10.11
MIN_OSX_VERSION_FOR_IOS=10.15
MIN_OSX_VERSION_FOR_MAC=10.15

# Bump the *_NUGET_VERSION variables in Make.versions instead, because that makes sure the computed commit distance for the version is correct.
IOS_SDK_VERSION=$(word 1, $(subst ., ,$(IOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(IOS_NUGET_VERSION)))
Expand All @@ -243,19 +243,19 @@ MAX_TVOS_SIMULATOR_VERSION=$(TVOS_SDK_VERSION)
MAX_WATCH_SIMULATOR_VERSION=$(WATCH_SDK_VERSION)

# Minimum OS versions for running XI/XM apps.
MIN_IOS_SDK_VERSION=7.0
MIN_MACOS_SDK_VERSION=10.9
MIN_WATCHOS_SDK_VERSION=2.0
MIN_IOS_SDK_VERSION=11.0
MIN_MACOS_SDK_VERSION=10.15
MIN_WATCHOS_SDK_VERSION=4.0
MIN_WATCHOS64_32_SDK_VERSION=5.1
MIN_WATCH_OS_VERSION=2.0
MIN_TVOS_SDK_VERSION=9.0
MIN_WATCH_OS_VERSION=4.0
MIN_TVOS_SDK_VERSION=11.0
MIN_MACCATALYST_SDK_VERSION=13.1

# Minimum OS versions for dotnet6 support
DOTNET_MIN_IOS_SDK_VERSION=10.0
DOTNET_MIN_TVOS_SDK_VERSION=10.0
# Minimum OS versions for .NET 8 support
DOTNET_MIN_IOS_SDK_VERSION=11.0
DOTNET_MIN_TVOS_SDK_VERSION=11.0
DOTNET_MIN_MACCATALYST_SDK_VERSION=13.1
DOTNET_MIN_MACOS_SDK_VERSION=10.14
DOTNET_MIN_MACOS_SDK_VERSION=10.15

# The min simulator version available in the Xcode we're using
MIN_IOS_SIMULATOR_VERSION=12.4
Expand Down
27 changes: 0 additions & 27 deletions Versions-ios.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,6 @@
<dict>
<key>iOS</key>
<array>
<string>7.0</string>
<string>7.1</string>
<string>8.0</string>
<string>8.1</string>
<string>8.2</string>
<string>8.3</string>
<string>8.4</string>
<string>9.0</string>
<string>9.1</string>
<string>9.2</string>
<string>9.3</string>
<string>10.0</string>
<string>10.1</string>
<string>10.2</string>
<string>10.3</string>
<string>11.0</string>
<string>11.1</string>
<string>11.2</string>
Expand Down Expand Up @@ -55,12 +40,6 @@
</array>
<key>tvOS</key>
<array>
<string>9.0</string>
<string>9.1</string>
<string>9.2</string>
<string>10.0</string>
<string>10.1</string>
<string>10.2</string>
<string>11.0</string>
<string>11.1</string>
<string>11.2</string>
Expand Down Expand Up @@ -88,12 +67,6 @@
</array>
<key>watchOS</key>
<array>
<string>2.0</string>
<string>2.1</string>
<string>2.2</string>
<string>3.0</string>
<string>3.1</string>
<string>3.2</string>
<string>4.0</string>
<string>4.1</string>
<string>4.2</string>
Expand Down
6 changes: 0 additions & 6 deletions Versions-mac.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
<dict>
<key>macOS</key>
<array>
<string>10.9</string>
<string>10.10</string>
<string>10.11</string>
<string>10.12</string>
<string>10.13</string>
<string>10.14</string>
<string>10.15</string>
<string>10.16</string>
<string>11.0</string>
Expand Down
14 changes: 7 additions & 7 deletions tools/common/SdkVersions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ static class SdkVersions {
public const string MacCatalyst = "16.2";

#if NET
public const string MinOSX = "10.14";
public const string MiniOS = "10.0";
public const string MinOSX = "10.15";
public const string MiniOS = "11.0";
public const string MinWatchOS = "99.99"; // TODO not supported, many changes required to remove it
public const string MinTVOS = "10.0";
public const string MinTVOS = "11.0";
public const string MinMacCatalyst = "13.1";
#else
public const string MinOSX = "10.9";
public const string MiniOS = "7.0";
public const string MinWatchOS = "2.0";
public const string MinTVOS = "9.0";
public const string MinOSX = "10.15";
public const string MiniOS = "11.0";
public const string MinWatchOS = "4.0";
public const string MinTVOS = "11.0";
public const string MinMacCatalyst = "13.1";
#endif

Expand Down

0 comments on commit c3278bb

Please sign in to comment.