Merge pull request #4641 from tmat/FXUnifyTest

Enable FX 4.6 specific unification tests

Merge pull request #4641 from tmat/FXUnifyTest
Enable FX 4.6 specific unification tests
47a2d30c · Tomáš Matoušek · ecb97d46 · 04b356a3 · 47a2d30c
隐藏空白更改
内联并排

Showing with 9 addition and 11 deletion

src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyIdentityComparerTests.cs ...sTest/MetadataReferences/AssemblyIdentityComparerTests.cs +9 -11

未找到文件。
--- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyIdentityComparerTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyIdentityComparerTests.cs
@@ -534,12 +534,11 @@ public void IgnoreOrFwUnifyVersion()
                AssemblyIdentityComparer.ComparisonResult.Equivalent,
                unificationApplied: true);

-            // TODO (bug 1090947):
-            //TestMatch(
-            //    "System.Numerics.Vectors, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
-            //    "System.Numerics.Vectors, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
-            //    AssemblyIdentityComparer.ComparisonResult.Equivalent,
-            //    unificationApplied: true);
+            TestMatch(
+                "System.Numerics.Vectors, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+                "System.Numerics.Vectors, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+                AssemblyIdentityComparer.ComparisonResult.Equivalent,
+                unificationApplied: true);

            // greater version than FW version (4.0)
            TestMatch(
@@ -552,11 +551,10 @@ public void IgnoreOrFwUnifyVersion()
                "System.Runtime.Handles, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
                AssemblyIdentityComparer.ComparisonResult.NotEquivalent);

-            // TODO (bug 1090947):
-            //TestMatch(
-            //    "System.Numerics.Vectors, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
-            //    "System.Numerics.Vectors, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
-            //    AssemblyIdentityComparer.ComparisonResult.NotEquivalent);
+            TestMatch(
+                "System.Numerics.Vectors, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+                "System.Numerics.Vectors, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+                AssemblyIdentityComparer.ComparisonResult.NotEquivalent);

            // works correctly for names with CLR invalid characters:
            foreach (var c in AssemblyIdentityTests.ClrInvalidCharacters)