From 90773ab92548159b4ef202044c95e03e32d7b7ab Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@github.com>
Date: Sat, 21 Mar 2015 08:03:12 -0700
Subject: [PATCH] Enabled coreclr for functional tests and reverted back
 previous change to skipped tests. - skipped a new test. This is a known issue
 that I have reported to the respective team. - This also fixes #1987 :
 Investigate xml serializer test failures in Core CLR

---
 .../InputObjectValidationTests.cs                             | 2 ++
 .../SerializableErrorTests.cs                                 | 4 ----
 .../XmlSerializerFormattersWrappingTest.cs                    | 2 --
 test/Microsoft.AspNet.Mvc.FunctionalTests/project.json        | 2 ++
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs
index a286994446..1de284e68b 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs
@@ -44,6 +44,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             }
         }
 
+#if !DNXCORE50
         [Fact]
         public async Task CheckIfObjectIsDeserializedWithoutErrors()
         {
@@ -70,6 +71,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             Assert.Equal("User has been registerd : " + sampleName,
                 await response.Content.ReadAsStringAsync());
         }
+#endif
 
         [Fact]
         public async Task CheckIfObjectIsDeserialized_WithErrors()
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs
index 83a2d9d17d..aeac3c7950 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs
@@ -21,9 +21,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         private readonly Action<IServiceCollection> _configureServices = new XmlFormattersWebSite.Startup().ConfigureServices;
 
         [Theory]
-#if !DNXCORE50
         [InlineData("application/xml-xmlser")]
-#endif
         [InlineData("application/xml-dcs")]
         public async Task ModelStateErrors_AreSerialized(string acceptHeader)
         {
@@ -46,9 +44,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         }
 
         [Theory]
-#if !DNXCORE50
         [InlineData("application/xml-xmlser")]
-#endif
         [InlineData("application/xml-dcs")]
         public async Task PostedSerializableError_IsBound(string acceptHeader)
         {
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
index c034990722..edda4b9c0c 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
@@ -178,7 +178,6 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
                 result);
         }
 
-#if !DNXCORE50
         [Fact]
         public async Task CanWrite_IEnumerableOf_SerializableErrors()
         {
@@ -200,6 +199,5 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
                 "<key4>key2-error</key4></SerializableErrorWrapper></ArrayOfSerializableErrorWrapper>",
                 result);
         }
-#endif
     }
 }
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
index 252e1c02f5..871e0e71bb 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
@@ -68,6 +68,8 @@
             "dependencies": {
                 "AutofacWebSite": "1.0.0"
             }
+        },
+        "dnxcore50": {
         }
     }
 }