From: dotnet-maestro[bot] Date: Tue, 21 May 2019 00:15:57 +0000 (-0700) Subject: [master] Update dependencies from dotnet/coreclr (dotnet/corefx#37746) X-Git-Tag: submit/tizen/20210909.063632~11031^2~1532 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc3491e2496429993583a6bc9aa939e2868afea1;p=platform%2Fupstream%2Fdotnet%2Fruntime.git [master] Update dependencies from dotnet/coreclr (dotnet/corefx#37746) * Update dependencies from https://github.com/dotnet/coreclr build 20190516.72 - Microsoft.NET.Sdk.IL - 3.0.0-preview6-27716-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview6-27716-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview6-27716-72 * Update dependencies from https://github.com/dotnet/coreclr build 20190517.72 - Microsoft.NET.Sdk.IL - 3.0.0-preview6-27717-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview6-27717-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview6-27717-72 * Update dependencies from https://github.com/dotnet/coreclr build 20190518.72 - Microsoft.NET.Sdk.IL - 3.0.0-preview6-27718-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview6-27718-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview6-27718-72 * Update dependencies from https://github.com/dotnet/coreclr build 20190519.72 - Microsoft.NET.Sdk.IL - 3.0.0-preview6-27719-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview6-27719-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview6-27719-72 * Fix ref assemblies due to change in coreclr * Fix serialization tests after TimeZone change Commit migrated from https://github.com/dotnet/corefx/commit/c85411a30c2c3a1d6ad3beea7be92b19b1e24df9 --- diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs index 144a7db..04b021b 100644 --- a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs +++ b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs @@ -56,9 +56,9 @@ namespace System.Reflection.Emit public virtual void ThrowException(System.Type excType) { } public virtual void UsingNamespace(string usingNamespace) { } } - public partial struct Label + public readonly partial struct Label { - private int _dummyPrimitive; + private readonly int _dummyPrimitive; public override bool Equals(object obj) { throw null; } public bool Equals(System.Reflection.Emit.Label obj) { throw null; } public override int GetHashCode() { throw null; } diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/src/ApiCompatBaseline.uap10.0.16299.txt b/src/libraries/System.Reflection.Emit.ILGeneration/src/ApiCompatBaseline.uap10.0.16299.txt new file mode 100644 index 0000000..20a5381 --- /dev/null +++ b/src/libraries/System.Reflection.Emit.ILGeneration/src/ApiCompatBaseline.uap10.0.16299.txt @@ -0,0 +1,4 @@ +Compat issues with assembly System.Reflection.Emit.ILGeneration: +CannotRemoveAttribute : Attribute 'System.Runtime.CompilerServices.IsReadOnlyAttribute' exists on 'System.Reflection.Emit.Label' in the contract but not the implementation. +TypeCannotChangeClassification : Type 'System.Reflection.Emit.Label' is marked as readonly in the contract so it must also be marked readonly in the implementation. +Total Issues: 2 diff --git a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.cs b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.cs index cb4c623..84557f4 100644 --- a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.cs +++ b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.cs @@ -20,9 +20,9 @@ namespace System.Reflection.Emit Return = 7, Throw = 8, } - public partial struct OpCode + public readonly partial struct OpCode : IEquatable { - private object _dummy; + private readonly object _dummy; public System.Reflection.Emit.FlowControl FlowControl { get { throw null; } } public string Name { get { throw null; } } public System.Reflection.Emit.OpCodeType OpCodeType { get { throw null; } } diff --git a/src/libraries/System.Reflection.Primitives/src/ApiCompatBaseline.uapaot.txt b/src/libraries/System.Reflection.Primitives/src/ApiCompatBaseline.uapaot.txt new file mode 100644 index 0000000..fe64061 --- /dev/null +++ b/src/libraries/System.Reflection.Primitives/src/ApiCompatBaseline.uapaot.txt @@ -0,0 +1,5 @@ +Compat issues with assembly System.Reflection.Primitives: +CannotRemoveAttribute : Attribute 'System.Runtime.CompilerServices.IsReadOnlyAttribute' exists on 'System.Reflection.Emit.OpCode' in the contract but not the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Reflection.Emit.OpCode' does not implement interface 'System.IEquatable' in the implementation but it does in the contract. +TypeCannotChangeClassification : Type 'System.Reflection.Emit.OpCode' is marked as readonly in the contract so it must also be marked readonly in the implementation. +Total Issues: 3 diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs index ff40a8e..7e6febf 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs @@ -869,7 +869,7 @@ namespace System.Runtime.Serialization.Formatters.Tests yield return new object[] { new DateTime(1990, 11, 23), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAA9TeXN0ZW0uRGF0ZVRpbWUCAAAABXRpY2tzCGRhdGVEYXRhAAAJEADA9z1t7LYIAMD3PW3stggL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAA9TeXN0ZW0uRGF0ZVRpbWUCAAAABXRpY2tzCGRhdGVEYXRhAAAJEADA9z1t7LYIAMD3PW3stggL", TargetFrameworkMoniker.netfx461) } }; yield return new object[] { new[] { new DateTime(1990, 11, 24, 0, 0, 0, DateTimeKind.Local), new DateTime(1990, 11, 25, 0, 0, 0, DateTimeKind.Utc), new DateTime(1990, 11, 26, 0, 0, 0, DateTimeKind.Unspecified) }, new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAPAQAAAAMAAAANAIBhaDbttogAQMuS/+22SAAANb3I7rYICw==", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAPAQAAAAMAAAANAIBhaDbttogAQMuS/+22SAAANb3I7rYICw==", TargetFrameworkMoniker.netfx461) } }; yield return new object[] { new DateTimeOffset(1990, 11, 23, 03, 30, 00, 00, TimeSpan.FromMinutes(30)), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAABVTeXN0ZW0uRGF0ZVRpbWVPZmZzZXQCAAAACERhdGVUaW1lDU9mZnNldE1pbnV0ZXMAAA0HAPhEY4bstggeAAs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAABVTeXN0ZW0uRGF0ZVRpbWVPZmZzZXQCAAAACERhdGVUaW1lDU9mZnNldE1pbnV0ZXMAAA0HAPhEY4bstggeAAs=", TargetFrameworkMoniker.netfx461) } }; - yield return new object[] { TimeZoneInfo.Utc, new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uQ29yZSwgVmVyc2lvbj0zLjUuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABNTeXN0ZW0uVGltZVpvbmVJbmZvBwAAAAJJZAtEaXNwbGF5TmFtZQxTdGFuZGFyZE5hbWUMRGF5bGlnaHROYW1lDUJhc2VVdGNPZmZzZXQPQWRqdXN0bWVudFJ1bGVzGlN1cHBvcnRzRGF5bGlnaHRTYXZpbmdUaW1lAQEBAQACAAwBAgAAAAYDAAAAA1VUQwkDAAAACQMAAAAJAwAAAAAAAAAAAAAACgAL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uQ29yZSwgVmVyc2lvbj0zLjUuMC4wLCBDdWx0dXJlPU5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABNTeXN0ZW0uVGltZVpvbmVJbmZvBwAAAAJJZAtEaXNwbGF5TmFtZQxTdGFuZGFyZE5hbWUMRGF5bGlnaHROYW1lDUJhc2VVdGNPZmZzZXQPQWRqdXN0bWVudFJ1bGVzGlN1cHBvcnRzRGF5bGlnaHRTYXZpbmdUaW1lAQEBAQACAAwBAgAAAAYDAAAAA1VUQwkDAAAACQMAAAAJAwAAAAAAAAAAAAAACgAL", TargetFrameworkMoniker.netfx461) } }; + yield return new object[] { TimeZoneInfo.Utc, new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uQ29yZSwgVmVyc2lvbj0zLjUuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABNTeXN0ZW0uVGltZVpvbmVJbmZvBwAAAAJJZAtEaXNwbGF5TmFtZQxTdGFuZGFyZE5hbWUMRGF5bGlnaHROYW1lDUJhc2VVdGNPZmZzZXQPQWRqdXN0bWVudFJ1bGVzGlN1cHBvcnRzRGF5bGlnaHRTYXZpbmdUaW1lAQEBAQACAAwBAgAAAAYDAAAAA1VUQwYEAAAAIChVVEMpIENvb3JkaW5hdGVkIFVuaXZlcnNhbCBUaW1lBgUAAAAaQ29vcmRpbmF0ZWQgVW5pdmVyc2FsIFRpbWUJBQAAAAAAAAAAAAAACgAL", TargetFrameworkMoniker.netcoreapp30), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uQ29yZSwgVmVyc2lvbj0zLjUuMC4wLCBDdWx0dXJlPU5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABNTeXN0ZW0uVGltZVpvbmVJbmZvBwAAAAJJZAtEaXNwbGF5TmFtZQxTdGFuZGFyZE5hbWUMRGF5bGlnaHROYW1lDUJhc2VVdGNPZmZzZXQPQWRqdXN0bWVudFJ1bGVzGlN1cHBvcnRzRGF5bGlnaHRTYXZpbmdUaW1lAQEBAQACAAwBAgAAAAYDAAAAA1VUQwkDAAAACQMAAAAJAwAAAAAAAAAAAAAACgAL", TargetFrameworkMoniker.netfx461) } }; yield return new object[] { TimeZoneInfo.TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, 2, 0, 0), 3, 15), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAACJTeXN0ZW0uVGltZVpvbmVJbmZvK1RyYW5zaXRpb25UaW1lBgAAAAlUaW1lT2ZEYXkFTW9udGgEV2VlawNEYXkJRGF5T2ZXZWVrD0lzRml4ZWREYXRlUnVsZQAAAAADAA0CAgIQU3lzdGVtLkRheU9mV2VlawEA0IjDEAAAAAMBDwT+////EFN5c3RlbS5EYXlPZldlZWsBAAAAB3ZhbHVlX18ACAAAAAABCw==", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uQ29yZSwgVmVyc2lvbj0zLjUuMC4wLCBDdWx0dXJlPU5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0ZW0uVGltZVpvbmVJbmZvK1RyYW5zaXRpb25UaW1lBgAAAAlUaW1lT2ZEYXkFTW9udGgEV2VlawNEYXkJRGF5T2ZXZWVrD0lzRml4ZWREYXRlUnVsZQAAAAADAA0CAgIQU3lzdGVtLkRheU9mV2VlawECAAAAANCIwxAAAAADAQ8E/f///xBTeXN0ZW0uRGF5T2ZXZWVrAQAAAAd2YWx1ZV9fAAgAAAAAAQs=", TargetFrameworkMoniker.netfx461) } }; var adjustmentRule = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule( diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/EqualityExtensions.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/EqualityExtensions.cs index 028610c..6da0daf 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/EqualityExtensions.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/EqualityExtensions.cs @@ -959,9 +959,15 @@ namespace System.Runtime.Serialization.Formatters.Tests Assert.NotNull(@this); Assert.NotNull(other); Assert.Equal(@this.Id, other.Id); - Assert.Equal(@this.DisplayName, other.DisplayName); - Assert.Equal(@this.StandardName, other.StandardName); - Assert.Equal(@this.DaylightName, other.DaylightName); + + if (isSamePlatform) + { + // These properties can change in between TFMs. + Assert.Equal(@this.DisplayName, other.DisplayName); + Assert.Equal(@this.StandardName, other.StandardName); + Assert.Equal(@this.DaylightName, other.DaylightName); + } + Assert.Equal(@this.BaseUtcOffset, other.BaseUtcOffset); Assert.Equal(@this.SupportsDaylightSavingTime, other.SupportsDaylightSavingTime); }