Merge pull request #8962 from rolfbjarne/xcode12-merge-d16-7-2020-06-26

[xcode12] Merge d16-7 into xcode12

src/AVFoundation/AVAudioChannelLayout.cs

@@ -36,16 +36,6 @@ namespace AVFoundation {
 			}
 		}
 		
-		public override bool Equals (object  obj)
-		{
-			if (this == null){
-				return (obj == null);
-			}
-			if (!(obj is NSObject))
-				return false;
-			return IsEqual ((NSObject)obj);
-		}
-
 		public static bool operator == (AVAudioChannelLayout a, AVAudioChannelLayout b)
 		{
 			return a.Equals (b);
@@ -55,11 +45,5 @@ namespace AVFoundation {
 		{
 			return !a.Equals (b);
 		}
-
-		public override int GetHashCode ()
-		{
-			return (int) ChannelCount;
-		}
-		
 	}
 }

src/AVFoundation/AVAudioFormat.cs

@@ -12,16 +12,6 @@ using System.Runtime.CompilerServices;
 
 namespace AVFoundation {
 	public partial class AVAudioFormat {
-		public override bool Equals (object  obj)
-		{
-			if (this == null){
-				return (obj == null);
-			}
-			if (!(obj is NSObject))
-				return false;
-			return IsEqual ((NSObject)obj);
-		}
-
 		public static bool operator == (AVAudioFormat a, AVAudioFormat b)
 		{
 			return a.Equals (b);
@@ -31,11 +21,5 @@ namespace AVFoundation {
 		{
 			return !a.Equals (b);
 		}
-
-		public override int GetHashCode ()
-		{
-			return (int) ChannelCount;
-		}
-		
 	}
 }

src/Makefile

@@ -97,6 +97,11 @@ ARGS_64 = -define:ARCH_64
 CURRENT_BRANCH_SED_ESCAPED:=$(subst |,\|,$(subst &,\&,$(subst $$,\$$,$(subst /,\/,$(CURRENT_BRANCH))))))
 
 SHARED_SYSTEM_DRAWING_SOURCES = System.Drawing/PointSizeRectangleTypeForwarders.cs
+SHARED_RESX = $(TOP)/tools/mtouch/Errors.resx
+SHARED_DESIGNER_CS = $(BUILD_DIR)/common/Errors.Designer.cs
+
+$(SHARED_DESIGNER_CS): $(SHARED_RESX)
+	./generate-errors.csharp > $(SHARED_DESIGNER_CS)
 
 #
 # Xamarin.iOS
@@ -108,7 +113,7 @@ IOS_EXTRA_SOURCES = \
 	$(IOS_OPENTK_1_0_CORE_SOURCES)   \
 	$(IOS_BUILD_DIR)/Constants.cs    \
 	$(IOS_BUILD_DIR)/AssemblyInfo.cs \
-	$(TOP)/tools/mtouch/Errors.Designer.cs \
+	$(SHARED_DESIGNER_CS) \
 	$(SHARED_SYSTEM_DRAWING_SOURCES) \
 
 IOS_HTTP_SOURCES = \
@@ -410,7 +415,7 @@ MAC_SOURCES += \
 	$(MAC_BUILD_DIR)/AssemblyInfo.cs \
 	Darwin/KernelNotification.cs \
 	Darwin/SystemLog.cs \
-	$(TOP)/tools/mtouch/Errors.Designer.cs \
+	$(SHARED_DESIGNER_CS) \
 
 # CFNetwork is shipped:
 # * In a separate library (XamMac.CFNetwork.dll) for Classic.
@@ -692,7 +697,7 @@ WATCHOS_CORE_SOURCES +=           \
 WATCHOS_SOURCES +=                \
     $(WATCHOS_EXTRA_CORE_SOURCES) \
     $(WATCHOS_HTTP_SOURCES)        \
-    $(TOP)/tools/mtouch/Errors.Designer.cs \
+    $(SHARED_DESIGNER_CS) \
 
 $(WATCH_BUILD_DIR)/Constants.cs: $(TOP)/src/Constants.watch.cs.in Makefile $(TOP)/Make.config.inc | $(WATCH_BUILD_DIR)
 	$(call Q_PROF_GEN,watch) sed \
@@ -905,7 +910,7 @@ TVOS_HTTP_SOURCES = \
 	Foundation/NSUrlSessionHandler.cs \
 	System.Net.Http/CFContentStream.cs \
 	System.Net.Http/CFNetworkHandler.cs \
-	$(TOP)/tools/mtouch/Errors.Designer.cs \
+	$(SHARED_DESIGNER_CS) \
 
 TVOS_SOURCES +=                \
 	$(TVOS_EXTRA_CORE_SOURCES) \

src/generate-errors.csharp

@@ -0,0 +1,37 @@
+#!/usr/bin/env /Library/Frameworks/Mono.framework/Commands/csharp
+
+using System.IO;
+using System.Xml;
+
+var args = Environment.GetCommandLineArgs ();
+var dir = Path.GetDirectoryName (args [1]);
+var file = Path.Combine (dir, "..", "tools", "mtouch", "Errors.resx");
+var doc = new XmlDocument ();
+doc.Load (file);
+
+Console.Write (
+@"//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool: generate-errors.csharp
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Xamarin.Bundler {
+	internal class Errors {
+");
+
+foreach (XmlNode node in doc.SelectNodes ("/root/data")) {
+	var name = node.Attributes ["name"].InnerText;
+	if (name == "default") {
+		name = "@" + name;
+	}
+	var value = node.ChildNodes [1].InnerText
+		.Trim ()
+		.Replace ("\\", "\\\\")
+		.Replace ("\"", "\\\"");
+	Console.WriteLine ($"\t\tinternal const string {name} = \"{value}\";");
+}
+
+Console.WriteLine ("\t}\n}");
+
+Environment.Exit (0);