-Added dotnet build

-Removed WinRT files
-Updated solution files to VS2015
-Updated psake
This commit is contained in:
James Newton-King
2015-08-02 23:56:26 +12:00
parent 7bad8a73c4
commit fe7b7a6c7b
102 changed files with 507 additions and 1247 deletions
@@ -25,10 +25,10 @@
using System;
using System.Collections.Generic;
#if !(NET20 || NETFX_CORE || DNXCORE50)
#if !(NET20 || DNXCORE50)
using System.Data.Linq;
#endif
#if !(NETFX_CORE || DNXCORE50)
#if !DNXCORE50
using System.Data.SqlTypes;
#endif
using System.Text;
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Converters
public byte[] NullByteArray { get; set; }
}
#if !(NET20 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50)
#if !(NET20 || PORTABLE || PORTABLE40 || DNXCORE50)
[Test]
public void DeserializeBinaryClass()
{
@@ -124,7 +124,7 @@ namespace Newtonsoft.Json.Tests.Converters
}", json);
}
#if !(NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50)
#if !(PORTABLE || PORTABLE40 || DNXCORE50)
public class SqlBinaryClass
{
public SqlBinary SqlBinary { get; set; }
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50)
#if !(NET35 || NET20 || DNXCORE50)
using System.Diagnostics;
using System.Reflection;
using Microsoft.FSharp.Core;