-Portable build issue fixed for realz
This commit is contained in:
@@ -313,7 +313,7 @@
|
|||||||
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Portable.csproj">
|
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Portable.csproj">
|
||||||
<Project>{959F7F85-C98B-4876-971A-9036224578E4}</Project>
|
<Project>{959F7F85-C98B-4876-971A-9036224578E4}</Project>
|
||||||
<Name>Newtonsoft.Json.Portable</Name>
|
<Name>Newtonsoft.Json.Portable</Name>
|
||||||
<Aliases>global,NewtonsoftJson</Aliases>
|
<Aliases>global</Aliases>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
|
|||||||
@@ -23,10 +23,7 @@
|
|||||||
// OTHER DEALINGS IN THE SOFTWARE.
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#if PORTABLE
|
#if !PORTABLE
|
||||||
extern alias NewtonsoftJson;
|
|
||||||
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
|
|
||||||
#endif
|
|
||||||
using global::System;
|
using global::System;
|
||||||
using global::System.Collections;
|
using global::System.Collections;
|
||||||
using global::System.Collections.Generic;
|
using global::System.Collections.Generic;
|
||||||
@@ -1243,4 +1240,5 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
public string String { get; set; }
|
public string String { get; set; }
|
||||||
public int Integer { get; set; }
|
public int Integer { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
#if PORTABLE
|
#if !PORTABLE
|
||||||
extern alias NewtonsoftJson;
|
|
||||||
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
|
|
||||||
#endif
|
|
||||||
using global::System;
|
using global::System;
|
||||||
using global::System.Collections.Generic;
|
using global::System.Collections.Generic;
|
||||||
using global::System.Runtime.Serialization.Formatters;
|
using global::System.Runtime.Serialization.Formatters;
|
||||||
@@ -37,4 +34,5 @@ namespace Newtonsoft.Json.Tests.Utilities
|
|||||||
Assert.AreEqual("System.Collections.Generic.IDictionary`2, mscorlib", typeName);
|
Assert.AreEqual("System.Collections.Generic.IDictionary`2, mscorlib", typeName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user