-
-
Save vs-mobiletools-engineering-service2/f49e4229e8541017674e670b643ec439 to your computer and use it in GitHub Desktop.
generator-diff/generator.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/old/common/Errors.Designer.cs b/new/common/Errors.Designer.cs | |
| index 69fdc70..1c05836 100644 | |
| --- a/old/common/Errors.Designer.cs | |
| +++ b/new/common/Errors.Designer.cs | |
| @@ -252,7 +252,6 @@ namespace Xamarin.Bundler { | |
| internal const string MM2106 = "Could not optimize the call to BlockLiteral.{2} in {0} at offset {1} because the previous instruction was unexpected ({3})"; | |
| internal const string MM2106_A = "Could not optimize the call to BlockLiteral.{2} in {0} at offset {1} because could not determine the type of the delegate type of the first argument (instruction: {3})"; | |
| internal const string MM2106_B = "Could not optimize the call to BlockLiteral.{2} in {0} because the type of the value passed as the first argument (the trampoline) is {1}, which makes it impossible to compute the block signature."; | |
| - internal const string MM2106_C = "Could not optimize the call to BlockLiteral.SetupBlock in {0} at offset {1} because no [UserDelegateType] attribute could be found on {2}."; | |
| internal const string MM2106_D = "Could not optimize the call to BlockLiteral.SetupBlock in {0} at offset {1}: {2}."; | |
| internal const string MX2106_E = "Could not optimize the call to BlockLiteral.{2} in {0} at offset {1} because the more than one method named '{3}' was found in the type '{4}."; | |
| internal const string MX2106_F = "Could not optimize the call to BlockLiteral.{2} in {0} at offset {1} because the method '{3}' must have at least one parameter."; | |
| @@ -366,6 +365,8 @@ namespace Xamarin.Bundler { | |
| internal const string MT4184 = "Internal error in the registrar (BindAs parameters can't be ref/out: {0}). Please file a bug report at https://github.com/xamarin/xamarin-macios/issues/new"; | |
| internal const string MT4185 = "The registrar can't compute the block signature for the delegate of type {0} in the method {1} because it couldn't find the Invoke method of the delegate type."; | |
| internal const string MT4186 = "The registrar found a non-optimal type `{0}`: the type does not have a constructor that takes two (ObjCRuntime.NativeHandle, bool) arguments. However, a constructor that takes two (System.IntPtr, bool) arguments was found (and will be used instead). It's highly recommended to change the signature of the (System.IntPtr, bool) constructor to be (ObjCRuntime.NativeHandle, bool)."; | |
| + internal const string MX4187 = "Could not find a [UserDelegateType] attribute on the type '{0}'."; | |
| + internal const string MX4188 = "Unable to compute the block signature for the type '{0}': {1}"; | |
| internal const string MT5101 = "Missing '{0}' compiler. Please install Xcode 'Command-Line Tools' component"; | |
| internal const string MT5103 = "Could not find neither the '{0}' nor the '{1}' compiler. Please install Xcode 'Command-Line Tools' component"; | |
| internal const string MM5103 = "Failed to compile. Error code - {0}. Please file a bug report at https://github.com/xamarin/xamarin-macios/issues/new"; | |
| @@ -429,5 +430,8 @@ namespace Xamarin.Bundler { | |
| internal const string MX8050 = "BlockLiteral.GetBlockSignature is not supported when the dynamic registrar has been linked away."; | |
| internal const string MX8051 = "The trampoline method {0} must have an [UnmanagedCallersOnly] attribute."; | |
| internal const string MX8052 = "The signature must be a non-empty string."; | |
| + internal const string MX8053 = "Could not resolve the module in the assembly {0}."; | |
| + internal const string MX8054 = "Can't resolve metadata tokens for methods when using the managed static registrar (token: 0x{0})."; | |
| + internal const string MX8055 = "Could not find the type 'ObjCRuntime.__Registrar__' in the assembly '{0}'."; | |
| } | |
| } | |
| diff --git a/old/dotnet/ios/ILLink.Substitutions.xml b/new/dotnet/ios/ILLink.Substitutions.xml | |
| index af423bf..00e9e50 100644 | |
| --- a/old/dotnet/ios/ILLink.Substitutions.xml | |
| +++ b/new/dotnet/ios/ILLink.Substitutions.xml | |
| @@ -7,6 +7,8 @@ | |
| <method signature="System.Boolean get_IsCoreCLR()" body="stub" value="false" /> | |
| <method signature="System.Int32 GetRuntimeArch()" body="stub" feature="ObjCRuntime.Runtime.Arch.IsSimulator" featurevalue="false" value="0" /> | |
| <method signature="System.Int32 GetRuntimeArch()" body="stub" feature="ObjCRuntime.Runtime.Arch.IsSimulator" featurevalue="true" value="1" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="false" value="false" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="true" value="true" /> | |
| </type> | |
| <type fullname="UIKit.UIApplication"> | |
| <method signature="System.Void EnsureEventAndDelegateAreNotMismatched(System.Object,System.Type)" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" /> | |
| diff --git a/old/dotnet/maccatalyst/ILLink.Substitutions.xml b/new/dotnet/maccatalyst/ILLink.Substitutions.xml | |
| index 0b9d639..82dfcf9 100644 | |
| --- a/old/dotnet/maccatalyst/ILLink.Substitutions.xml | |
| +++ b/new/dotnet/maccatalyst/ILLink.Substitutions.xml | |
| @@ -5,6 +5,8 @@ | |
| </type> | |
| <type fullname="ObjCRuntime.Runtime"> | |
| <method signature="System.Boolean get_IsCoreCLR()" body="stub" value="false" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="false" value="false" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="true" value="true" /> | |
| </type> | |
| <type fullname="UIKit.UIApplication"> | |
| <method signature="System.Void EnsureEventAndDelegateAreNotMismatched(System.Object,System.Type)" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" /> | |
| diff --git a/old/dotnet/macos/ILLink.Substitutions.xml b/new/dotnet/macos/ILLink.Substitutions.xml | |
| index 75d6785..a0fd782 100644 | |
| --- a/old/dotnet/macos/ILLink.Substitutions.xml | |
| +++ b/new/dotnet/macos/ILLink.Substitutions.xml | |
| @@ -5,6 +5,8 @@ | |
| </type> | |
| <type fullname="ObjCRuntime.Runtime"> | |
| <method signature="System.Boolean get_IsCoreCLR()" body="stub" value="true" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="false" value="false" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="true" value="true" /> | |
| </type> | |
| <type fullname="AppKit.NSApplication"> | |
| <method signature="System.Void EnsureEventAndDelegateAreNotMismatched(System.Object,System.Type)" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" /> | |
| diff --git a/old/dotnet/projects/MacCatalyst/MacCatalyst.csproj b/new/dotnet/projects/MacCatalyst/MacCatalyst.csproj | |
| index 74d28f7..8fcd075 100644 | |
| --- a/old/dotnet/projects/MacCatalyst/MacCatalyst.csproj | |
| +++ b/new/dotnet/projects/MacCatalyst/MacCatalyst.csproj | |
| @@ -786,6 +786,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ArgumentSemantic.cs" Link="sources/ObjCRuntime/ArgumentSemantic.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BackingField.cs" Link="sources/ObjCRuntime/BackingField.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BaseWrapper.cs" Link="sources/ObjCRuntime/BaseWrapper.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/BindAs.cs" Link="sources/ObjCRuntime/BindAs.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindAsAttribute.cs" Link="sources/ObjCRuntime/BindAsAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindingImplAttribute.cs" Link="sources/ObjCRuntime/BindingImplAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BlockProxyAttribute.cs" Link="sources/ObjCRuntime/BlockProxyAttribute.cs"/> | |
| @@ -803,6 +804,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ErrorHelper.runtime.cs" Link="sources/ObjCRuntime/ErrorHelper.runtime.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ExceptionMode.cs" Link="sources/ObjCRuntime/ExceptionMode.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Exceptions.cs" Link="sources/ObjCRuntime/Exceptions.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/IManagedRegistrar.cs" Link="sources/ObjCRuntime/IManagedRegistrar.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/INativeObject.cs" Link="sources/ObjCRuntime/INativeObject.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/LinkWithAttribute.cs" Link="sources/ObjCRuntime/LinkWithAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Messaging.cs" Link="sources/ObjCRuntime/Messaging.cs"/> | |
| @@ -818,6 +820,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/Protocol.cs" Link="sources/ObjCRuntime/Protocol.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.core.cs" Link="sources/ObjCRuntime/Registrar.core.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.cs" Link="sources/ObjCRuntime/Registrar.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/RegistrarHelper.cs" Link="sources/ObjCRuntime/RegistrarHelper.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ReleaseAttribute.cs" Link="sources/ObjCRuntime/ReleaseAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiredFrameworkAttribute.cs" Link="sources/ObjCRuntime/RequiredFrameworkAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiresSuperAttribute.cs" Link="sources/ObjCRuntime/RequiresSuperAttribute.cs"/> | |
| diff --git a/old/dotnet/projects/iOS/iOS.csproj b/new/dotnet/projects/iOS/iOS.csproj | |
| index 6a5ed51..142de83 100644 | |
| --- a/old/dotnet/projects/iOS/iOS.csproj | |
| +++ b/new/dotnet/projects/iOS/iOS.csproj | |
| @@ -731,6 +731,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ArgumentSemantic.cs" Link="sources/ObjCRuntime/ArgumentSemantic.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BackingField.cs" Link="sources/ObjCRuntime/BackingField.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BaseWrapper.cs" Link="sources/ObjCRuntime/BaseWrapper.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/BindAs.cs" Link="sources/ObjCRuntime/BindAs.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindAsAttribute.cs" Link="sources/ObjCRuntime/BindAsAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindingImplAttribute.cs" Link="sources/ObjCRuntime/BindingImplAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BlockProxyAttribute.cs" Link="sources/ObjCRuntime/BlockProxyAttribute.cs"/> | |
| @@ -748,6 +749,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ErrorHelper.runtime.cs" Link="sources/ObjCRuntime/ErrorHelper.runtime.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ExceptionMode.cs" Link="sources/ObjCRuntime/ExceptionMode.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Exceptions.cs" Link="sources/ObjCRuntime/Exceptions.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/IManagedRegistrar.cs" Link="sources/ObjCRuntime/IManagedRegistrar.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/INativeObject.cs" Link="sources/ObjCRuntime/INativeObject.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/LinkWithAttribute.cs" Link="sources/ObjCRuntime/LinkWithAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Messaging.cs" Link="sources/ObjCRuntime/Messaging.cs"/> | |
| @@ -763,6 +765,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/Protocol.cs" Link="sources/ObjCRuntime/Protocol.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.core.cs" Link="sources/ObjCRuntime/Registrar.core.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.cs" Link="sources/ObjCRuntime/Registrar.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/RegistrarHelper.cs" Link="sources/ObjCRuntime/RegistrarHelper.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ReleaseAttribute.cs" Link="sources/ObjCRuntime/ReleaseAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiredFrameworkAttribute.cs" Link="sources/ObjCRuntime/RequiredFrameworkAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiresSuperAttribute.cs" Link="sources/ObjCRuntime/RequiresSuperAttribute.cs"/> | |
| diff --git a/old/dotnet/projects/macOS/macOS.csproj b/new/dotnet/projects/macOS/macOS.csproj | |
| index c0c26a7..3f53808 100644 | |
| --- a/old/dotnet/projects/macOS/macOS.csproj | |
| +++ b/new/dotnet/projects/macOS/macOS.csproj | |
| @@ -776,6 +776,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ArgumentSemantic.cs" Link="sources/ObjCRuntime/ArgumentSemantic.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BackingField.cs" Link="sources/ObjCRuntime/BackingField.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BaseWrapper.cs" Link="sources/ObjCRuntime/BaseWrapper.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/BindAs.cs" Link="sources/ObjCRuntime/BindAs.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindAsAttribute.cs" Link="sources/ObjCRuntime/BindAsAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindingImplAttribute.cs" Link="sources/ObjCRuntime/BindingImplAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BlockProxyAttribute.cs" Link="sources/ObjCRuntime/BlockProxyAttribute.cs"/> | |
| @@ -793,6 +794,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ErrorHelper.runtime.cs" Link="sources/ObjCRuntime/ErrorHelper.runtime.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ExceptionMode.cs" Link="sources/ObjCRuntime/ExceptionMode.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Exceptions.cs" Link="sources/ObjCRuntime/Exceptions.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/IManagedRegistrar.cs" Link="sources/ObjCRuntime/IManagedRegistrar.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/INativeObject.cs" Link="sources/ObjCRuntime/INativeObject.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/LinkWithAttribute.cs" Link="sources/ObjCRuntime/LinkWithAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Messaging.cs" Link="sources/ObjCRuntime/Messaging.cs"/> | |
| @@ -808,6 +810,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/Protocol.cs" Link="sources/ObjCRuntime/Protocol.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.core.cs" Link="sources/ObjCRuntime/Registrar.core.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.cs" Link="sources/ObjCRuntime/Registrar.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/RegistrarHelper.cs" Link="sources/ObjCRuntime/RegistrarHelper.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ReleaseAttribute.cs" Link="sources/ObjCRuntime/ReleaseAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiredFrameworkAttribute.cs" Link="sources/ObjCRuntime/RequiredFrameworkAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiresSuperAttribute.cs" Link="sources/ObjCRuntime/RequiresSuperAttribute.cs"/> | |
| diff --git a/old/dotnet/projects/tvOS/tvOS.csproj b/new/dotnet/projects/tvOS/tvOS.csproj | |
| index 5f6791e..2f1abb2 100644 | |
| --- a/old/dotnet/projects/tvOS/tvOS.csproj | |
| +++ b/new/dotnet/projects/tvOS/tvOS.csproj | |
| @@ -650,6 +650,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ArgumentSemantic.cs" Link="sources/ObjCRuntime/ArgumentSemantic.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BackingField.cs" Link="sources/ObjCRuntime/BackingField.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BaseWrapper.cs" Link="sources/ObjCRuntime/BaseWrapper.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/BindAs.cs" Link="sources/ObjCRuntime/BindAs.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindAsAttribute.cs" Link="sources/ObjCRuntime/BindAsAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BindingImplAttribute.cs" Link="sources/ObjCRuntime/BindingImplAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/BlockProxyAttribute.cs" Link="sources/ObjCRuntime/BlockProxyAttribute.cs"/> | |
| @@ -667,6 +668,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/ErrorHelper.runtime.cs" Link="sources/ObjCRuntime/ErrorHelper.runtime.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ExceptionMode.cs" Link="sources/ObjCRuntime/ExceptionMode.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Exceptions.cs" Link="sources/ObjCRuntime/Exceptions.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/IManagedRegistrar.cs" Link="sources/ObjCRuntime/IManagedRegistrar.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/INativeObject.cs" Link="sources/ObjCRuntime/INativeObject.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/LinkWithAttribute.cs" Link="sources/ObjCRuntime/LinkWithAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Messaging.cs" Link="sources/ObjCRuntime/Messaging.cs"/> | |
| @@ -682,6 +684,7 @@ | |
| <Compile Include="../../../../ObjCRuntime/Protocol.cs" Link="sources/ObjCRuntime/Protocol.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.core.cs" Link="sources/ObjCRuntime/Registrar.core.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/Registrar.cs" Link="sources/ObjCRuntime/Registrar.cs"/> | |
| + <Compile Include="../../../../ObjCRuntime/RegistrarHelper.cs" Link="sources/ObjCRuntime/RegistrarHelper.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/ReleaseAttribute.cs" Link="sources/ObjCRuntime/ReleaseAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiredFrameworkAttribute.cs" Link="sources/ObjCRuntime/RequiredFrameworkAttribute.cs"/> | |
| <Compile Include="../../../../ObjCRuntime/RequiresSuperAttribute.cs" Link="sources/ObjCRuntime/RequiresSuperAttribute.cs"/> | |
| diff --git a/old/dotnet/tvos/ILLink.Substitutions.xml b/new/dotnet/tvos/ILLink.Substitutions.xml | |
| index 50fcf04..e03cc08 100644 | |
| --- a/old/dotnet/tvos/ILLink.Substitutions.xml | |
| +++ b/new/dotnet/tvos/ILLink.Substitutions.xml | |
| @@ -7,6 +7,8 @@ | |
| <method signature="System.Boolean get_IsCoreCLR()" body="stub" value="false" /> | |
| <method signature="System.Int32 GetRuntimeArch()" body="stub" feature="ObjCRuntime.Runtime.Arch.IsSimulator" featurevalue="false" value="0" /> | |
| <method signature="System.Int32 GetRuntimeArch()" body="stub" feature="ObjCRuntime.Runtime.Arch.IsSimulator" featurevalue="true" value="1" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="false" value="false" /> | |
| + <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="true" value="true" /> | |
| </type> | |
| <type fullname="UIKit.UIApplication"> | |
| <method signature="System.Void EnsureEventAndDelegateAreNotMismatched(System.Object,System.Type)" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" /> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment