EdmLib integrated

src/Squidex.Core/Contents/ContentData.cs

@@ -89,7 +89,7 @@ namespace Squidex.Core.Contents
             {
                 Field field;
                 
-                if (!schema.FieldsByName.TryGetValue(fieldValue.Key, out field) || (!excludeHidden && field.IsHidden))
+                if (!schema.FieldsByName.TryGetValue(fieldValue.Key, out field) || (excludeHidden && field.IsHidden))
                 {
                     continue;
                 }

src/Squidex.Core/project.json

@@ -3,14 +3,16 @@
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Infrastructure": "1.0.0-*",
     "protobuf-net": "2.1.0",
-    "NETStandard.Library": "1.6.1",
-    "Microsoft.NETCore.App": "1.1.0",
-    "NJsonSchema": "7.3.6214.20986"
+    "NJsonSchema": "7.3.6214.20986",
+    "System.Collections.Immutable": "1.3.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1",
+        "Microsoft.OData.Core": "6.15.0"
+      },
+      "imports": "dnxcore50"
     }
   },
   "tooling": {

src/Squidex.Events/project.json

@@ -1,22 +1,19 @@
 {
-  "version": "1.0.0-*",
-
   "dependencies": {
-    "Microsoft.NETCore.App": "1.1.0",
-    "NETStandard.Library": "1.6.1",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Infrastructure": "1.0.0-*"
   },
-
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1"
+      },
+      "imports": "dnxcore50"
     }
   },
-
   "tooling": {
     "defaultNamespace": "Squidex.Events"
-  }
+  },
+  "version": "1.0.0-*"
 }

src/Squidex.Infrastructure.MongoDb/project.json

@@ -3,9 +3,7 @@
   "dependencies": {
     "Autofac": "4.2.1",
     "Microsoft.Extensions.Logging": "1.1.0",
-    "Microsoft.NETCore.App": "1.1.0",
     "MongoDB.Driver": "2.4.1",
-    "NETStandard.Library": "1.6.1",
     "Newtonsoft.Json": "9.0.2-beta1",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Infrastructure": "1.0.0-*",
@@ -15,9 +13,11 @@
     "System.Security.Claims": "4.3.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1"
+      },
+      "imports": "dnxcore50"
     }
   },
   "buildOptions": {

src/Squidex.Infrastructure.RabbitMq/project.json

@@ -3,8 +3,6 @@
   "dependencies": {
     "Autofac": "4.2.1",
     "Microsoft.Extensions.Logging": "1.1.0",
-    "Microsoft.NETCore.App": "1.1.0",
-    "NETStandard.Library": "1.6.1",
     "Newtonsoft.Json": "9.0.2-beta1",
     "NodaTime": "2.0.0-alpha20160729",
     "RabbitMQ.Client": "5.0.0-pre2",
@@ -15,9 +13,11 @@
     "System.Security.Claims": "4.3.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1"
+      },
+      "imports": "dnxcore50"
     }
   },
   "buildOptions": {

src/Squidex.Infrastructure/project.json

@@ -3,8 +3,6 @@
   "dependencies": {
     "Autofac": "4.2.1",
     "Microsoft.Extensions.Logging": "1.1.0",
-    "Microsoft.NETCore.App": "1.1.0",
-    "NETStandard.Library": "1.6.1",
     "Newtonsoft.Json": "9.0.2-beta1",
     "NodaTime": "2.0.0-alpha20160729",
     "protobuf-net": "2.1.0",
@@ -14,9 +12,11 @@
     "System.Security.Claims": "4.3.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1"
+      },
+      "imports": "dnxcore50"
     }
   },
   "buildOptions": {

src/Squidex.Read/project.json

@@ -1,25 +1,22 @@
 {
-  "version": "1.0.0-*",
-
   "dependencies": {
     "Microsoft.Extensions.Caching.Memory": "1.1.0",
-    "Microsoft.NETCore.App": "1.1.0",
     "MongoDB.Driver": "2.4.1",
-    "NETStandard.Library": "1.6.1",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Events": "1.0.0-*",
     "Squidex.Infrastructure": "1.0.0-*"
   },
-
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1"
+      },
+      "imports": "dnxcore50"
     }
   },
-
   "tooling": {
     "defaultNamespace": "Squidex.Read"
-  }
+  },
+  "version": "1.0.0-*"
 }

src/Squidex.Store.MongoDb/project.json

@@ -4,9 +4,7 @@
     "IdentityServer4": "1.0.0",
     "Microsoft.AspNetCore.Identity": "1.1.0",
     "Microsoft.AspNetCore.Identity.MongoDB": "1.0.2",
-    "Microsoft.NETCore.App": "1.1.0",
     "MongoDB.Driver": "2.4.1",
-    "NETStandard.Library": "1.6.1",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Events": "1.0.0-*",
     "Squidex.Infrastructure": "1.0.0-*",
@@ -14,9 +12,12 @@
     "Squidex.Read": "1.0.0-*"
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1",
+        "Microsoft.OData.Core": "6.15.0"
+      },
+      "imports": "dnxcore50"
     }
   },
   "version": "1.0.0-*"

src/Squidex.Write/project.json

@@ -1,10 +1,6 @@
 {
-  "version": "1.0.0-*",
-
   "dependencies": {
     "Microsoft.AspNetCore.Identity": "1.1.0",
-    "Microsoft.NETCore.App": "1.1.0",
-    "NETStandard.Library": "1.6.1",
     "NodaTime": "2.0.0-alpha20160729",
     "Squidex.Core": "1.0.0-*",
     "Squidex.Events": "1.0.0-*",
@@ -12,15 +8,16 @@
     "Squidex.Read": "1.0.0-*",
     "System.Linq": "4.3.0"
   },
-
   "frameworks": {
-    "netcoreapp1.0": {
+    "netstandard1.6": {
       "dependencies": {
-      }
+        "NETStandard.Library": "1.6.1"
+      },
+      "imports": "dnxcore50"
     }
   },
-
   "tooling": {
     "defaultNamespace": "Squidex.Write"
-  }
+  },
+  "version": "1.0.0-*"
 }

src/Squidex/project.json

@@ -45,14 +45,15 @@
   "frameworks": {
     "netcoreapp1.1": {
       "dependencies": {
+        "Microsoft.OData.Core": "6.15.0",
         "Microsoft.NETCore.App": {
-          "type": "platform", "version": "1.1.0"
+          "type": "platform",
+          "version": "1.1.0"
         }
       },
       "imports": "dnxcore50"
     }
   },
-
   "nowarn": [ "1591" ],
 
   "buildOptions": {

tests/Squidex.Core.Tests/project.json

@@ -18,9 +18,11 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "type": "platform", "version": "1.1.0"
+          "type": "platform",
+          "version": "1.1.0"
         }
-      }
+      },
+      "imports": "dnxcore50"
     }
   },
   "testRunner": "xunit",

tests/Squidex.Infrastructure.Tests/project.json

@@ -16,9 +16,11 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "type": "platform", "version": "1.1.0"
+          "type": "platform",
+          "version": "1.1.0"
         }
-      }
+      },
+      "imports": "dnxcore50"
     }
   },
   "testRunner": "xunit",

tests/Squidex.Write.Tests/project.json

@@ -19,9 +19,11 @@
     "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "type": "platform", "version": "1.1.0"
+          "type": "platform",
+          "version": "1.1.0"
         }
-      }
+      },
+      "imports": "dnxcore50"
     }
   },
   "testRunner": "xunit",