diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2017-01-25 17:03:30 +0100 |
|---|---|---|
| committer | Stephane Delcroix <stephane@delcroix.org> | 2017-01-25 17:04:10 +0100 |
| commit | 3546f819b06da4de5f47643c3fefdd086ac2317e (patch) | |
| tree | 625a34b7c244461484c621eb38e848d4b9221d2c /Xamarin.Forms.Build.Tasks | |
| parent | 385dc4c6480cd490eb67428145a02ae897d25b1a (diff) | |
| download | xamarin-forms-3546f819b06da4de5f47643c3fefdd086ac2317e.tar.gz xamarin-forms-3546f819b06da4de5f47643c3fefdd086ac2317e.tar.bz2 xamarin-forms-3546f819b06da4de5f47643c3fefdd086ac2317e.zip | |
[XamlC] use TypeRefComparer to compare TypeRef from different assemblies (#710)
Diffstat (limited to 'Xamarin.Forms.Build.Tasks')
| -rw-r--r-- | Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs b/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs index 464eeac4..b7386a8b 100644 --- a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs +++ b/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs @@ -40,25 +40,25 @@ namespace Xamarin.Forms.Build.Tasks return new [] { Instruction.Create(OpCodes.Ldsfld, fieldRef) }; //Constants can be numbers, Boolean values, strings, or a null reference. (https://msdn.microsoft.com/en-us/library/e6w8fe1b.aspx) - if (memberRef == module.TypeSystem.Boolean) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Boolean)) return new [] { Instruction.Create(((bool)fieldDef.Constant) ? OpCodes.Ldc_I4_1 : OpCodes.Ldc_I4_0) }; - if (memberRef == module.TypeSystem.String) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.String)) return new [] { Instruction.Create(OpCodes.Ldstr, (string)fieldDef.Constant) }; if (fieldDef.Constant == null) return new [] { Instruction.Create(OpCodes.Ldnull) }; - if (memberRef == module.TypeSystem.Char) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Char)) return new [] { Instruction.Create(OpCodes.Ldc_I4, (char)fieldDef.Constant) }; - if (memberRef == module.TypeSystem.Single) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Single)) return new [] { Instruction.Create(OpCodes.Ldc_R4, (float)fieldDef.Constant) }; - if (memberRef == module.TypeSystem.Double) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Double)) return new [] { Instruction.Create(OpCodes.Ldc_R8, (double)fieldDef.Constant) }; - if (memberRef == module.TypeSystem.Byte || memberRef == module.TypeSystem.Int16 || memberRef == module.TypeSystem.Int32) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Byte) || TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Int16) || TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Int32)) return new [] { Instruction.Create(OpCodes.Ldc_I4, (int)fieldDef.Constant) }; - if (memberRef == module.TypeSystem.SByte || memberRef == module.TypeSystem.UInt16 || memberRef == module.TypeSystem.UInt32) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.SByte) || TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.UInt16) || TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.UInt32)) return new [] { Instruction.Create(OpCodes.Ldc_I4, (uint)fieldDef.Constant) }; - if (memberRef == module.TypeSystem.Int64) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.Int64)) return new [] { Instruction.Create(OpCodes.Ldc_I8, (long)fieldDef.Constant) }; - if (memberRef == module.TypeSystem.UInt64) + if (TypeRefComparer.Default.Equals(memberRef, module.TypeSystem.UInt64)) return new [] { Instruction.Create(OpCodes.Ldc_I8, (ulong)fieldDef.Constant) }; //enum values |