[StoreKit] Fix all availability attributes in this framework.

src/StoreKit/Enums.cs

@@ -54,10 +54,6 @@ public enum SKError : long {
 		// iOS 10.3
 		/// <summary>To be added.</summary>
 		CloudServiceRevoked,
-#if !NET
-		[Obsolete ("Use 'SKError.CloudServiceRevoked' instead.")]
-		Revoked = CloudServiceRevoked,
-#endif
 		// iOS 12.2
 		/// <summary>To be added.</summary>
 		PrivacyAcknowledgementRequired,

src/StoreKit/NativeMethods.cs

@@ -7,14 +7,12 @@
 namespace StoreKit {
 
 	partial class SKReceiptRefreshRequest {
-#if NET
 		/// <summary>To be added.</summary>
 		///         <remarks>To be added.</remarks>
 		[SupportedOSPlatform ("ios")]
 		[SupportedOSPlatform ("macos")]
 		[SupportedOSPlatform ("maccatalyst")]
 		[SupportedOSPlatform ("tvos")]
-#endif
 		[DllImport (Constants.StoreKitLibrary, EntryPoint = "SKTerminateForInvalidReceipt")]
 		static extern public void TerminateForInvalidReceipt ();
 	}

src/StoreKit/SKReceiptProperty.cs

@@ -22,6 +22,14 @@
 namespace StoreKit {
 	/// <summary>Defines test properties for the <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=C:StoreKit.SKReceiptRefreshRequest(Foundation.NSDictionary)&amp;scope=Xamarin" title="C:StoreKit.SKReceiptRefreshRequest(Foundation.NSDictionary)">C:StoreKit.SKReceiptRefreshRequest(Foundation.NSDictionary)</a></format> constructor.</summary>
 	///     <remarks>To be added.</remarks>
+	[SupportedOSPlatform ("maccatalyst")]
+	[SupportedOSPlatform ("ios")]
+	[SupportedOSPlatform ("macos")]
+	[SupportedOSPlatform ("tvos")]
+	[ObsoletedOSPlatform ("ios18.0")]
+	[ObsoletedOSPlatform ("maccatalyst18.0")]
+	[ObsoletedOSPlatform ("macos15.0")]
+	[ObsoletedOSPlatform ("tvos18.0")]
 	public partial class SKReceiptProperties : DictionaryContainer {
 #if !COREBUILD
 		/// <summary>To be added.</summary>

src/frameworks.sources

@@ -1693,7 +1693,6 @@ STOREKIT_CORE_SOURCES = \
 
 STOREKIT_SOURCES = \
 	StoreKit/NativeMethods.cs \
-	StoreKit/SKAdNetworkCompat.cs \
 	StoreKit/SKCloudServiceSetupOptions.cs \
 	StoreKit/SKPayment.cs \
 	StoreKit/SwiftAPI.cs \

src/storekit.cs

@@ -26,10 +26,6 @@
 #endif
 using System;
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 #nullable enable
 
 namespace StoreKit {
@@ -167,9 +163,7 @@ partial interface SKDownload {
 	[Deprecated (PlatformName.TvOS, 18, 0 /* Apple's replacement requires Swift */ )]
 	[MacCatalyst (13, 1)]
 	[BaseType (typeof (NSObject))]
-#if NET
 	[DisableDefaultCtor]
-#endif
 	partial interface SKPayment : NSMutableCopying {
 		[Static]
 		[Export ("paymentWithProduct:")]
@@ -214,9 +208,7 @@ partial interface SKPayment : NSMutableCopying {
 	[Deprecated (PlatformName.TvOS, 18, 0 /* Apple's replacement requires Swift */ )]
 	[MacCatalyst (13, 1)]
 	[BaseType (typeof (SKPayment))]
-#if NET
 	[DisableDefaultCtor]
-#endif
 	interface SKMutablePayment {
 		[Static]
 		[Export ("paymentWithProduct:")]
@@ -388,25 +380,14 @@ interface SKProduct {
 		[Deprecated (PlatformName.MacOSX, 10, 15, message: "Use 'IsDownloadable' instead.")]
 		[Export ("downloadable")]
 		bool Downloadable { get; }
-#elif !NET
-		[NoMac]
-		[Obsolete ("Use 'IsDownloadable' instead.")]
-		bool Downloadable {
-			[Wrap ("IsDownloadable")]
-			get;
-		}
 #endif
 
 		[MacCatalyst (13, 1)]
 		[Export ("isDownloadable")]
 		bool IsDownloadable { get; }
 
 		[NoiOS]
-#if NET
 		[NoTV]
-#else
-		[Deprecated (PlatformName.TvOS, 9, 0, message: "Use 'DownloadContentLengths' instead.")]
-#endif
 		[Deprecated (PlatformName.MacOSX, 10, 14, message: "Use 'DownloadContentLengths' instead.")]
 		[NoMacCatalyst]
 		[Export ("contentLengths")]
@@ -765,13 +746,6 @@ interface SKProductsRequestDelegate {
 		   Delegates = new string [] { "WeakDelegate" },
 		   Events = new Type [] { typeof (SKStoreProductViewControllerDelegate) })]
 	interface SKStoreProductViewController {
-#if !NET
-		// SKStoreProductViewController is an OS View Controller which can't be customized
-		[Export ("initWithNibName:bundle:")]
-		[PostGet ("NibBundle")]
-		NativeHandle Constructor ([NullAllowed] string nibName, [NullAllowed] NSBundle bundle);
-#endif
-
 		[Export ("delegate", ArgumentSemantic.Assign), NullAllowed]
 		NSObject WeakDelegate { get; set; }
 
@@ -1533,12 +1507,7 @@ interface ISKPaymentQueueDelegate { }
 	[Deprecated (PlatformName.TvOS, 18, 0 /* Apple's replacement requires Swift */ )]
 	[iOS (13, 0)]
 	[MacCatalyst (13, 1)]
-#if NET
 	[Protocol, Model]
-#else
-	[Protocol]
-	[Model (AutoGeneratedName = true)]
-#endif
 	[BaseType (typeof (NSObject))]
 	interface SKPaymentQueueDelegate {
 		[Export ("paymentQueue:shouldContinueTransaction:inStorefront:")]
@@ -1695,11 +1664,7 @@ interface ISKOverlayDelegate { }
 
 	[NoTV, NoMac, iOS (14, 0)]
 	[MacCatalyst (14, 0)]
-#if NET
 	[Protocol, Model]
-#else
-	[Protocol, Model (AutoGeneratedName = true)]
-#endif
 	[BaseType (typeof (NSObject))]
 	interface SKOverlayDelegate {
 		[Export ("storeOverlay:didFailToLoadWithError:")]

tests/cecil-tests/ApiAvailabilityTest.KnownFailures.cs

@@ -39,9 +39,6 @@ public partial class ApiAvailabilityTest {
 			"/src/Foundation/NSUrlSessionHandler.cs has 4 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. 'SslProtocol.Tls_1_2' is obsoleted on: 'ios' 13.0 and later (Use 'TlsProtocolVersion' instead.), 'maccatalyst' 13.0 and later (Use 'TlsProtocolVersion' instead.), 'macOS/OSX' 10.15 and later (Use 'TlsProtocolVersion' instead.), 'tvos' 13.0 and later (Use 'TlsProtocolVersion' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
 			"/src/Foundation/NSUrlSessionHandler.cs has 4 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. 'SslProtocol.Tls_1_3' is obsoleted on: 'ios' 13.0 and later (Use 'TlsProtocolVersion' instead.), 'maccatalyst' 13.0 and later (Use 'TlsProtocolVersion' instead.), 'macOS/OSX' 10.15 and later (Use 'TlsProtocolVersion' instead.), 'tvos' 13.0 and later (Use 'TlsProtocolVersion' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
 			"/src/GameController/GCExtendedGamepadSnapshot.cs has 4 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. 'GCExtendedGamepadSnapShotDataV100' is obsoleted on: 'ios' 12.2 and later (Use 'GCExtendedGamepadSnapshotData' instead.), 'maccatalyst' 12.2 and later (Use 'GCExtendedGamepadSnapshotData' instead.), 'macOS/OSX' 10.14.4 and later (Use 'GCExtendedGamepadSnapshotData' instead.), 'tvos' 12.2 and later (Use 'GCExtendedGamepadSnapshotData' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
-			"/src/StoreKit/SKReceiptProperty.cs has 8 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. '_SKReceiptProperty.IsExpired' is obsoleted on: 'ios' 18.0 and later, 'maccatalyst' 18.0 and later, 'macOS/OSX' 15.0 and later, 'tvos' 18.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
-			"/src/StoreKit/SKReceiptProperty.cs has 8 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. '_SKReceiptProperty.IsRevoked' is obsoleted on: 'ios' 18.0 and later, 'maccatalyst' 18.0 and later, 'macOS/OSX' 15.0 and later, 'tvos' 18.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
-			"/src/StoreKit/SKReceiptProperty.cs has 8 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. '_SKReceiptProperty.IsVolumePurchase' is obsoleted on: 'ios' 18.0 and later, 'maccatalyst' 18.0 and later, 'macOS/OSX' 15.0 and later, 'tvos' 18.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
 			"/src/System.Net.Http/CFNetworkHandler.cs has 4 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. 'CFHTTPStream.GetResponseHeader()' is obsoleted on: 'ios' 9.0 and later (Use 'NSUrlSession'.), 'maccatalyst' 9.0 and later (Use 'NSUrlSession'.), 'macOS/OSX' 10.11 and later (Use 'NSUrlSession'.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
 			"/src/System.Net.Http/CFNetworkHandler.cs has 4 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. 'CFHTTPStream.SetProxy(CFProxySettings)' is obsoleted on: 'ios' 9.0 and later (Use 'NSUrlSession'.), 'maccatalyst' 9.0 and later (Use 'NSUrlSession'.), 'macOS/OSX' 10.11 and later (Use 'NSUrlSession'.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",
 			"/src/System.Net.Http/CFNetworkHandler.cs has 4 occurrences of This call site is reachable on: 'ios' 12.2 and later, 'maccatalyst' 12.2 and later, 'macOS/OSX' 12.0 and later, 'tvos' 12.2 and later. 'CFHTTPStream.ShouldAutoredirect' is obsoleted on: 'ios' 9.0 and later (Use 'NSUrlSession'.), 'maccatalyst' 9.0 and later (Use 'NSUrlSession'.), 'macOS/OSX' 10.11 and later (Use 'NSUrlSession'.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422)",

tests/cecil-tests/ApiAvailabilityTest.cs

@@ -69,7 +69,7 @@ public void Warnings ()
 			} finally {
 				Console.WriteLine ($"There's a total of {totalWarnings} warnings.");
 			}
-			Assert.AreEqual (351, totalWarnings, "Total warnings"); // this is just to see how the warning count changes as issues are fixed.
+			Assert.AreEqual (327, totalWarnings, "Total warnings"); // this is just to see how the warning count changes as issues are fixed.
 		}
 
 		public record ObsoletedFailure : IComparable {