-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
@@ -28,15 +28,17 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Text;
using System.Reflection;
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
#else
using System.Linq;
#endif
using Newtonsoft.Json.Utilities;
namespace Newtonsoft.Json.Tests.TestObjects
{
#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || DNXCORE50 || PORTABLE40)
#if !(NETFX_CORE || NET35 || NET20 || PORTABLE || PORTABLE40)
[TypeConverter(typeof(MyInterfaceConverter))]
internal interface IMyInterface
{
@@ -121,9 +123,9 @@ namespace Newtonsoft.Json.Tests.TestObjects
{
private TypeConverter GetConverter(Type type)
{
var converters = type.GetCustomAttributes(typeof(TypeConverterAttribute), true).Union(
var converters = ReflectionUtils.GetAttributes(type, typeof(TypeConverterAttribute), true).Union(
from t in type.GetInterfaces()
from c in t.GetCustomAttributes(typeof(TypeConverterAttribute), true)
from c in ReflectionUtils.GetAttributes(t, typeof(TypeConverterAttribute), true)
select c).Distinct();
return
@@ -136,7 +138,6 @@ namespace Newtonsoft.Json.Tests.TestObjects
.FirstOrDefault();
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
var converter = GetConverter(value.GetType());
@@ -26,6 +26,7 @@
using System;
using System.Collections.Generic;
using Newtonsoft.Json.Utilities;
using System.Reflection;
namespace Newtonsoft.Json.Tests.TestObjects
{