-Portable build issue fixed (hopefully)

This commit is contained in:
James Newton-King
2012-04-23 21:18:21 +12:00
parent 6268d00a0d
commit d086c841db
2 changed files with 88 additions and 88 deletions
@@ -27,25 +27,25 @@
extern alias NewtonsoftJson; extern alias NewtonsoftJson;
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle; using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
#endif #endif
using System; using global::System;
using System.Collections; using global::System.Collections;
using System.Collections.Generic; using global::System.Collections.Generic;
using System.Globalization; using global::System.Globalization;
using System.Runtime.Serialization.Formatters; using global::System.Runtime.Serialization.Formatters;
using Newtonsoft.Json.Linq; using global::Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization; using global::Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using global::Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using global::NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using global::Microsoft.VisualStudio.TestTools.UnitTesting;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Utilities; using global::Newtonsoft.Json.Utilities;
using System.Net; using global::System.Net;
using System.Runtime.Serialization; using global::System.Runtime.Serialization;
using System.IO; using global::System.IO;
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
{ {
@@ -2,17 +2,17 @@
extern alias NewtonsoftJson; extern alias NewtonsoftJson;
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle; using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
#endif #endif
using System; using global::System;
using System.Collections.Generic; using global::System.Collections.Generic;
using System.Runtime.Serialization.Formatters; using global::System.Runtime.Serialization.Formatters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using global::NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using global::Microsoft.VisualStudio.TestTools.UnitTesting;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Utilities; using global::Newtonsoft.Json.Utilities;
namespace Newtonsoft.Json.Tests.Utilities namespace Newtonsoft.Json.Tests.Utilities
{ {