Skip to content
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

Jump to bottom

[net9.0] Bump min macOS to 12.0 and min Mac Catalyst to 15.0. Fixes #19392. #20186

Merged
merged 8 commits into from
Feb 29, 2024
Merged

[net9.0] Bump min macOS to 12.0 and min Mac Catalyst to 15.0. Fixes #19392. #20186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8a2b69
[net9.0] Bump min macOS to 12.0 and min Mac Catalyst to 15.0.
rolfbjarne Feb 22, 2024
9cd3e86
[tests] Bump min OS versions in all tests.
rolfbjarne Feb 22, 2024
7942e50
[dotnet] Bump min OS versions in templates.
rolfbjarne Feb 22, 2024
b77ab62
[tests] Update generator tests.
rolfbjarne Feb 22, 2024
a21040c
[src] Remove redundant availability attributes.
rolfbjarne Feb 22, 2024
ae91a78
[tests] Remove the CatalystAppOptimizedForMacOS_InvalidMinOS test
rolfbjarne Feb 23, 2024
a46a61d
[test] Ignore mmp test that doesn't work anymore.
rolfbjarne Feb 26, 2024
5e8fdc3
[devops] Don't do anything on macOS 11 anymore.
rolfbjarne Feb 27, 2024
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.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,18 +287,18 @@ MAX_WATCH_SIMULATOR_VERSION=$(WATCH_SDK_VERSION)

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

# Minimum OS versions for .NET 9 support
DOTNET_MIN_IOS_SDK_VERSION=12.2
DOTNET_MIN_TVOS_SDK_VERSION=12.2
DOTNET_MIN_MACCATALYST_SDK_VERSION=13.1
DOTNET_MIN_MACOS_SDK_VERSION=10.15
DOTNET_MIN_MACCATALYST_SDK_VERSION=15.0
DOTNET_MIN_MACOS_SDK_VERSION=12.0

# The min simulator version available in the Xcode we're using
MIN_IOS_SIMULATOR_VERSION=14.3
Expand Down
9 changes: 0 additions & 9 deletions Versions-ios.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,6 @@
</array>
<key>MacCatalyst</key>
<array>
<string>13.1</string>
<string>13.2</string>
<string>13.3</string>
<string>13.4</string>
<string>13.5</string>
<string>14.2</string>
<string>14.3</string>
<string>14.4</string>
<string>14.5</string>
<string>15.0</string>
<string>15.2</string>
<string>15.4</string>
Expand Down
6 changes: 0 additions & 6 deletions Versions-mac.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
<dict>
<key>macOS</key>
<array>
<string>10.15</string>
<string>10.16</string>
<string>11.0</string>
<string>11.1</string>
<string>11.2</string>
<string>11.3</string>
<string>12.0</string>
<string>12.1</string>
<string>12.3</string>
Expand Down
9 changes: 0 additions & 9 deletions builds/Versions-MacCatalyst.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@
<dict>
<key>MacCatalyst</key>
<array>
<string>13.1</string>
<string>13.2</string>
<string>13.3</string>
<string>13.4</string>
<string>13.5</string>
<string>14.2</string>
<string>14.3</string>
<string>14.4</string>
<string>14.5</string>
<string>15.0</string>
<string>15.2</string>
<string>15.4</string>
Expand Down
6 changes: 0 additions & 6 deletions builds/Versions-macOS.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
<dict>
<key>macOS</key>
<array>
<string>10.15</string>
<string>10.16</string>
<string>11.0</string>
<string>11.1</string>
<string>11.2</string>
<string>11.3</string>
<string>12.0</string>
<string>12.1</string>
<string>12.3</string>
Expand Down
2 changes: 1 addition & 1 deletion ...mplates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"description": "Overrides SupportedOSPlatformVersion in the project file",
"replaces": "minOSVersion",
"datatype": "string",
"defaultValue": "14.2"
"defaultValue": "15.0"
}
},
"defaultName": "MacCatalystApp1"
Expand Down
2 changes: 1 addition & 1 deletion ...es/Microsoft.MacCatalyst.Templates/maccatalyst/visualbasic/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"description": "Overrides SupportedOSPlatformVersion in the project file",
"replaces": "minOSVersion",
"datatype": "string",
"defaultValue": "14.2"
"defaultValue": "15.0"
}
},
"defaultName": "MacCatalystApp1"
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Templates/Microsoft.macOS.Templates/macos-storyboard/Storyboard1.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="bU7-R8-ocO">
<dependencies>
<deployment identifier="macosx"/>
<deployment version="120000" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Templates/Microsoft.macOS.Templates/macos-view/View1.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<deployment version="120000" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Templates/Microsoft.macOS.Templates/macos-viewcontroller/ViewController1.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment version="101500" identifier="macosx"/>
<deployment version="120000" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Templates/Microsoft.macOS.Templates/macos/csharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"description": "Overrides SupportedOSPlatformVersion in the project file",
"replaces": "minOSVersion",
"datatype": "string",
"defaultValue": "10.15"
"defaultValue": "12.0"
}
},
"defaultName": "macOSApp1"
Expand Down
14 changes: 8 additions & 6 deletions dotnet/Templates/Microsoft.macOS.Templates/macos/csharp/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
<deployment version="120000" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Application-->
Expand Down Expand Up @@ -673,7 +675,7 @@
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider=""/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
Expand All @@ -683,7 +685,7 @@
<scene sceneID="R2V-B0-nI4">
<objects>
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="YES" animationBehavior="default" id="IQv-IB-iLA">
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="IQv-IB-iLA">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
Expand All @@ -703,7 +705,7 @@
<!--View Controller-->
<scene sceneID="hIz-AP-VOD">
<objects>
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<viewController id="XfG-lQ-9wD" customClass="ViewController" sceneMemberID="viewController">
<view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Templates/Microsoft.macOS.Templates/macos/visualbasic/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"description": "Overrides SupportedOSPlatformVersion in the project file",
"replaces": "minOSVersion",
"datatype": "string",
"defaultValue": "10.15"
"defaultValue": "12.0"
}
},
"defaultName": "macOSApp1"
Expand Down
14 changes: 8 additions & 6 deletions dotnet/Templates/Microsoft.macOS.Templates/macos/visualbasic/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
<deployment version="120000" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Application-->
Expand Down Expand Up @@ -673,7 +675,7 @@
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider=""/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
Expand All @@ -683,7 +685,7 @@
<scene sceneID="R2V-B0-nI4">
<objects>
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="YES" animationBehavior="default" id="IQv-IB-iLA">
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="IQv-IB-iLA">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
Expand All @@ -703,7 +705,7 @@
<!--View Controller-->
<scene sceneID="hIz-AP-VOD">
<objects>
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<viewController id="XfG-lQ-9wD" customClass="ViewController" sceneMemberID="viewController">
<view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down
4 changes: 2 additions & 2 deletions src/AVFoundation/AVSampleBufferExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
namespace AVFoundation {
public static class AVSampleBufferExtensions {

[iOS (14, 5), Mac (11, 3), TV (14, 5), Watch (7,4)]
[iOS (14, 5), TV (14, 5), Watch (7,4)]
[DllImport (Constants.AVFoundationLibrary)]
[return: MarshalAs (UnmanagedType.I1)]
static extern /* BOOL */ bool AVSampleBufferAttachContentKey (
/* CMSampleBufferRef */ CMSampleBufferRef sbuf,
/* AVContentKey */ AVContentKey contentKey,
/* NSError * _Nullable * _Nullable */ out NSErrorPtr outError);

[iOS (14, 5), Mac (11, 3), TV (14, 5), Watch (7,4)]
[iOS (14, 5), TV (14, 5), Watch (7,4)]
public static bool AttachContentKey (this CMSampleBuffer sampleBuffer, AVContentKey contentKey, out NSError error)
{
if (sampleBuffer is null)
Expand Down
14 changes: 5 additions & 9 deletions src/AVFoundation/AVTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ public struct AVSampleCursorChunkInfo {

#if NET
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("maccatalyst15.0")]
[SupportedOSPlatform ("maccatalyst")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVSampleCursorAudioDependencyInfo {
Expand All @@ -423,15 +423,14 @@ public struct AVSampleCursorAudioDependencyInfo {
#if MONOMAC

#if NET
[SupportedOSPlatform ("macos12.0")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[NoWatch]
[NoTV]
[NoiOS]
[Mac (12,0)]
[NoMacCatalyst]
#endif
[Native]
Expand All @@ -442,15 +441,14 @@ public enum AVCaptionUnitsType : long {
}

#if NET
[SupportedOSPlatform ("macos12.0")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[NoWatch]
[NoTV]
[NoiOS]
[Mac (12,0)]
[NoMacCatalyst]
#endif
[StructLayout (LayoutKind.Sequential)]
Expand All @@ -471,15 +469,14 @@ public static AVCaptionDimension Create (nfloat dimension, AVCaptionUnitsType un
}

#if NET
[SupportedOSPlatform ("macos12.0")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[NoWatch]
[NoTV]
[NoiOS]
[Mac (12,0)]
[NoMacCatalyst]
#endif
[StructLayout (LayoutKind.Sequential)]
Expand All @@ -495,15 +492,14 @@ public static AVCaptionPoint Create (AVCaptionDimension x, AVCaptionDimension y)
}

#if NET
[SupportedOSPlatform ("macos12.0")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[NoWatch]
[NoTV]
[NoiOS]
[Mac (12,0)]
[NoMacCatalyst]
#endif
[StructLayout (LayoutKind.Sequential)]
Expand Down
Loading
Loading