[src] Remove legacy build logic. (#21353)

xamarin · Oct 19, 2024 · 86db6e3 · 86db6e3
1 parent 5cb8335
commit 86db6e3
Show file tree

Hide file tree

Showing 53 changed files with 51 additions and 3,346 deletions.
diff --git a/src/.gitignore b/src/.gitignore
@@ -1,15 +1,5 @@
 build
-MonoTouch.NUnitLite.csproj
-MonoTouch.NUnitLite.tvos.csproj
-MonoTouch.NUnitLite.unified.csproj
-MonoTouch.NUnitLite.watchos.csproj
-MonoTouch.NUnitLite.maccatalyst.csproj
-xamios.csproj
-xammac.csproj
-xamtvos.csproj
-xamwatch.csproj
-xammaccatalyst.csproj
-generator.csproj.inc
+bgen.csproj.inc
 *~
 *.rsp
 MinimumVersions.cs

diff --git a/src/AddressBook/ABPerson.cs b/src/AddressBook/ABPerson.cs
@@ -1021,11 +1021,7 @@ public void SetRelatedNames (ABMultiValue<string>? value)
 
 		public NSData? GetImage (ABPersonImageFormat format)
 		{
-#if ARCH_32
-			return Runtime.GetNSObject<NSData> (ABPersonCopyImageDataWithFormat (Handle, (nint)(int)format));
-#else
 			return Runtime.GetNSObject<NSData> (ABPersonCopyImageDataWithFormat (Handle, (nint) (long) format));
-#endif
 		}
 
 		[DllImport (Constants.AddressBookLibrary)]

diff --git a/src/AssemblyInfo.cs.in b/src/AssemblyInfo.cs.in
@@ -10,26 +10,15 @@ using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-#if NET
 [assembly: AssemblyInformationalVersion ("@NUGET_VERSION_NO_METADATA@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")]
 [assembly: AssemblyTitle ("Microsoft.@DOTNET_PLATFORM@")]
 [assembly: AssemblyProduct ("Microsoft.@DOTNET_PLATFORM@")]
-#else
-[assembly: AssemblyInformationalVersion ("@PACKAGE_VERSION_MAJOR@.@PACKAGE_VERSION_MINOR@.@PACKAGE_VERSION_REV@.@PACKAGE_VERSION_BUILD@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")]
-[assembly: AssemblyTitle ("@PRODUCT_NAME@")]
-[assembly: AssemblyProduct ("@PRODUCT_NAME@")]
-#endif
 // FIXME: Probably need to add Copyright 2009-2011 Novell Inc.
 // [assembly: AssemblyCopyright ("Copyright 2011-2014 Xamarin Inc.")]
 [assembly: AssemblyCompany ("Microsoft Corp.")]
 
 [assembly: AssemblyMetadata ("IsTrimmable", "True")]
 
-#if !NET
-[assembly: InternalsVisibleTo ("System.Net.Http,PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-#endif
-
-#if NET
 // Use a two-part version, because there shouldn't be any API changes when the third or fourth digit changes (according to Semver 2.0 rules).
 // In other words: the following scenario is safe:
 // - Assembly A builds against Microsoft.*.dll v1.0.1
@@ -38,8 +27,7 @@ using System.Runtime.CompilerServices;
 // To avoid scenarios where everybody would have to update to the latest patch version of Microsoft.*.dll
 // in order to compile stuff, we erase the third and fourth number and only use 0 for both.
 [assembly: AssemblyVersion ("@NUGET_VERSION_MAJOR@.@NUGET_VERSION_MINOR@.0.0")]
-#endif
 
-#if NET && !XCODE_IS_STABLE && !COREBUILD
+#if !XCODE_IS_STABLE && !COREBUILD
 [assembly: Experimental("XCODE_@XCODE_VERSION@_PREVIEW", UrlFormat = "https://github.com/xamarin/xamarin-macios/blob/main/docs/preview-apis.md")]
 #endif
diff --git a/src/Constants.watch.cs.in b/src/Constants.watch.cs.in
diff --git a/src/Foundation/NSIndexPath.cs b/src/Foundation/NSIndexPath.cs
@@ -40,12 +40,7 @@ public unsafe static NSIndexPath Create (params int [] indexes)
 			if (indexes is null)
 				throw new ArgumentNullException ("indexes");
 
-#if ARCH_32
-			fixed (int* ptr = indexes)
-#else
 			fixed (nint* ptr = Array.ConvertAll<int, nint> (indexes, (v) => v))
-#endif
-
 				return _FromIndex ((IntPtr) ptr, indexes.Length);
 		}
 
@@ -54,12 +49,7 @@ public unsafe static NSIndexPath Create (params uint [] indexes)
 			if (indexes is null)
 				throw new ArgumentNullException ("indexes");
 
-#if ARCH_32
-			fixed (uint* ptr = indexes)
-#else
 			fixed (nuint* ptr = Array.ConvertAll<uint, nuint> (indexes, (v) => v))
-#endif
-
 				return _FromIndex ((IntPtr) ptr, indexes.Length);
 		}
 

diff --git a/src/Foundation/NSNumber2.cs b/src/Foundation/NSNumber2.cs
@@ -131,31 +131,19 @@ public static explicit operator bool (NSNumber source)
 		}
 
 		public NSNumber (nfloat value) :
-#if ARCH_64
-			this ((double)value)
-#else
-			this ((float) value)
-#endif
+			this ((double) value)
 		{
 		}
 
 		public nfloat NFloatValue {
 			get {
-#if ARCH_64
-				return (nfloat)DoubleValue;
-#else
-				return (nfloat) FloatValue;
-#endif
+				return (nfloat) DoubleValue;
 			}
 		}
 
 		public static NSNumber FromNFloat (nfloat value)
 		{
-#if ARCH_64
-			return (FromDouble ((double)value));
-#else
-			return (FromFloat ((float) value));
-#endif
+			return (FromDouble ((double) value));
 		}
 
 		public override string ToString ()

diff --git a/src/ImageIO/CGImageAnimation.cs b/src/ImageIO/CGImageAnimation.cs
@@ -67,9 +67,6 @@ public static class CGImageAnimation {
 		[BindingImpl (BindingImplOptions.Optimizable)]
 		public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOptions options, CGImageSourceAnimationHandler handler)
 		{
-#if IOS && ARCH_32
-            throw new PlatformNotSupportedException ("This API is not supported on this version of iOS");
-#else
 			if (url is null)
 				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (url));
 			if (handler is null)
@@ -85,7 +82,6 @@ public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOp
 #endif
 				return CGAnimateImageAtURLWithBlock (url.Handle, options.GetHandle (), &block);
 			}
-#endif
 		}
 
 #if NET
@@ -101,9 +97,6 @@ public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOp
 		[BindingImpl (BindingImplOptions.Optimizable)]
 		public static CGImageAnimationStatus AnimateImage (NSData data, CGImageAnimationOptions options, CGImageSourceAnimationHandler handler)
 		{
-#if IOS && ARCH_32
-            throw new PlatformNotSupportedException ("This API is not supported on this version of iOS");
-#else
 			if (data is null)
 				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (data));
 			if (handler is null)
@@ -119,7 +112,6 @@ public static CGImageAnimationStatus AnimateImage (NSData data, CGImageAnimation
 #endif
 				return CGAnimateImageDataWithBlock (data.Handle, options.GetHandle (), &block);
 			}
-#endif
 		}
 
 		//