From a42006d29539e534130dee74b4f38d3aa64b3cd5 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 16 Dec 2016 09:38:35 -0800 Subject: [PATCH] Workarond type collision Fixes compilation error "The type 'XmlNode' exists in both 'System.Xml.ReaderWriter, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' and 'System.Xml.XmlDocument, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'" --- test/Microsoft.AspNetCore.Mvc.Core.Test/project.json | 3 ++- test/Microsoft.AspNetCore.Mvc.Test/project.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json index 5fbef71ee6..759b771e5c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json @@ -30,7 +30,8 @@ "version": "1.2.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.4.0-*" + "System.Diagnostics.TraceSource": "4.4.0-*", + "System.Xml.XmlDocument": "4.4.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json index 0701bb0232..4ddaf58199 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json @@ -20,7 +20,8 @@ "version": "1.2.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.4.0-*" + "System.Diagnostics.TraceSource": "4.4.0-*", + "System.Xml.XmlDocument": "4.4.0-*" } }, "net451": {}