-Added additional frameworks to project.json files

This commit is contained in:
James Newton-King
2015-08-22 19:08:40 +12:00
parent 6b02abe20c
commit a9ea63da59
142 changed files with 1090 additions and 222 deletions
@@ -23,6 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(DNXCORE50 || NET20)
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -40,4 +41,5 @@ namespace Newtonsoft.Json.Tests.LinqToSql
{
}
}
}
}
#endif
@@ -23,9 +23,15 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || DNXCORE50)
using System;
using System.Collections.Generic;
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
#else
using System.Linq;
#endif
using System.Text;
using Newtonsoft.Json.Linq;
@@ -60,4 +66,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql
return (objectType == typeof(Department));
}
}
}
}
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || DNXCORE50)
using System;
using System.Collections.Generic;
using System.Linq;
@@ -50,4 +52,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql
return (objectType == typeof(Guid));
}
}
}
}
#endif
@@ -1,4 +1,6 @@
#pragma warning disable 1591
#if !(DNXCORE50 || NET20)
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -724,3 +726,5 @@ namespace Newtonsoft.Json.Tests.LinqToSql
}
}
#pragma warning restore 1591
#endif
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(DNXCORE50 || NETFX_CORE || PORTABLE40 || PORTABLE40)
#if !(DNXCORE50 || NETFX_CORE || PORTABLE40 || PORTABLE40 || NET20)
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -23,10 +23,11 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || DNXCORE50)
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
namespace Newtonsoft.Json.Tests.LinqToSql
@@ -40,4 +41,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql
public string FirstName { get; set; }
}
}
}
}
#endif
+5 -1
View File
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || DNXCORE50)
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -44,4 +46,6 @@ namespace Newtonsoft.Json.Tests.LinqToSql
public EntitySet<PersonRole> PersonRoles { get; set; }
}
}
}
}
#endif