From 640af61996387fb4d699e605a8130075ca113296 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Mon, 23 Apr 2012 21:27:18 +1200
Subject: [PATCH] -Portable build issue fixed for realz

---
 .../Newtonsoft.Json.Tests.Portable.csproj                 | 2 +-
 .../Serialization/TypeNameHandlingTests.cs                | 8 +++-----
 .../Utilities/ReflectionUtilsTests.cs                     | 8 +++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj
index b90bacd3..55a53492 100644
--- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj
+++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj
@@ -313,7 +313,7 @@
     <ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Portable.csproj">
       <Project>{959F7F85-C98B-4876-971A-9036224578E4}</Project>
       <Name>Newtonsoft.Json.Portable</Name>
-      <Aliases>global,NewtonsoftJson</Aliases>
+      <Aliases>global</Aliases>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
index d77812d5..c370515c 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
@@ -23,10 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-#if PORTABLE
-extern alias NewtonsoftJson;
-using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
-#endif
+#if !PORTABLE
 using global::System;
 using global::System.Collections;
 using global::System.Collections.Generic;
@@ -1243,4 +1240,5 @@ namespace Newtonsoft.Json.Tests.Serialization
     public string String { get; set; }
     public int Integer { get; set; }
   }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs
index 6a774eb6..a63f643a 100644
--- a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs
@@ -1,7 +1,4 @@
-#if PORTABLE
-extern alias NewtonsoftJson;
-using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
-#endif
+#if !PORTABLE
 using global::System;
 using global::System.Collections.Generic;
 using global::System.Runtime.Serialization.Formatters;
@@ -37,4 +34,5 @@ namespace Newtonsoft.Json.Tests.Utilities
       Assert.AreEqual("System.Collections.Generic.IDictionary`2, mscorlib", typeName);
     }
   }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file