Re-enable AssemblyNameTests.Version test and fix merge conflicts

stephentoub · stephentoub · commit 69963dc961d8 · 2017-05-15T10:37:03.000-04:00
diff --git a/src/System.Reflection/tests/AssemblyNameTests.cs b/src/System.Reflection/tests/AssemblyNameTests.cs
@@ -282,7 +282,6 @@ public static IEnumerable<object[]> Version_TestData()
             yield return new object[] { new Version(1, 2, 0x1ffff, 4), "1.2" };
         }
 
-        [ActiveIssue(19179)]
         [Theory]
         [MemberData(nameof(Version_TestData))]
         public void Version(Version version, string versionString)

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,6 @@ public static IEnumerable<object[]> Version_TestData()`
`282`	`282`	`yield return new object[] { new Version(1, 2, 0x1ffff, 4), "1.2" };`
`283`	`283`	`}`
`284`	`284`
`285`		`- [ActiveIssue(19179)]`
`286`	`285`	`[Theory]`
`287`	`286`	`[MemberData(nameof(Version_TestData))]`
`288`	`287`	`public void Version(Version version, string versionString)`