From 0f74f4539c072bad1aca6d87d36cd63dde2157f1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 23 Jan 2017 21:19:44 +0100 Subject: [PATCH] EdmLib integrated --- src/Squidex.Core/Contents/ContentData.cs | 2 +- src/Squidex.Core/project.json | 12 +++++++----- src/Squidex.Events/project.json | 15 ++++++--------- src/Squidex.Infrastructure.MongoDb/project.json | 8 ++++---- src/Squidex.Infrastructure.RabbitMq/project.json | 8 ++++---- src/Squidex.Infrastructure/project.json | 8 ++++---- src/Squidex.Read/project.json | 15 ++++++--------- src/Squidex.Store.MongoDb/project.json | 9 +++++---- src/Squidex.Write/project.json | 15 ++++++--------- src/Squidex/project.json | 5 +++-- tests/Squidex.Core.Tests/project.json | 6 ++++-- tests/Squidex.Infrastructure.Tests/project.json | 6 ++++-- tests/Squidex.Write.Tests/project.json | 6 ++++-- tests/Squidex.Write.Tests/x.ClearAsync() | 0 tests/Squidex.Write.Tests/x.GetEventsAsync() | 0 15 files changed, 58 insertions(+), 57 deletions(-) delete mode 100644 tests/Squidex.Write.Tests/x.ClearAsync() delete mode 100644 tests/Squidex.Write.Tests/x.GetEventsAsync() diff --git a/src/Squidex.Core/Contents/ContentData.cs b/src/Squidex.Core/Contents/ContentData.cs index 25b442f02..829d47fd3 100644 --- a/src/Squidex.Core/Contents/ContentData.cs +++ b/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; } diff --git a/src/Squidex.Core/project.json b/src/Squidex.Core/project.json index 2c6cef21c..a4dacab8c 100644 --- a/src/Squidex.Core/project.json +++ b/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": { diff --git a/src/Squidex.Events/project.json b/src/Squidex.Events/project.json index b60240b54..65c3f8364 100644 --- a/src/Squidex.Events/project.json +++ b/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-*" } diff --git a/src/Squidex.Infrastructure.MongoDb/project.json b/src/Squidex.Infrastructure.MongoDb/project.json index c9f998b8d..6575b64ac 100644 --- a/src/Squidex.Infrastructure.MongoDb/project.json +++ b/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": { diff --git a/src/Squidex.Infrastructure.RabbitMq/project.json b/src/Squidex.Infrastructure.RabbitMq/project.json index 4590de87d..516756a3d 100644 --- a/src/Squidex.Infrastructure.RabbitMq/project.json +++ b/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": { diff --git a/src/Squidex.Infrastructure/project.json b/src/Squidex.Infrastructure/project.json index beb4df819..165fc8f5d 100644 --- a/src/Squidex.Infrastructure/project.json +++ b/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": { diff --git a/src/Squidex.Read/project.json b/src/Squidex.Read/project.json index baae26cbe..c3aefdd63 100644 --- a/src/Squidex.Read/project.json +++ b/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-*" } diff --git a/src/Squidex.Store.MongoDb/project.json b/src/Squidex.Store.MongoDb/project.json index 88ce1d837..dc2b77bb6 100644 --- a/src/Squidex.Store.MongoDb/project.json +++ b/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-*" diff --git a/src/Squidex.Write/project.json b/src/Squidex.Write/project.json index 433ca07ab..9da89dcad 100644 --- a/src/Squidex.Write/project.json +++ b/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-*" } diff --git a/src/Squidex/project.json b/src/Squidex/project.json index c334570ee..632a3a11e 100644 --- a/src/Squidex/project.json +++ b/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": { diff --git a/tests/Squidex.Core.Tests/project.json b/tests/Squidex.Core.Tests/project.json index 0f8324962..fb3b556c4 100644 --- a/tests/Squidex.Core.Tests/project.json +++ b/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", diff --git a/tests/Squidex.Infrastructure.Tests/project.json b/tests/Squidex.Infrastructure.Tests/project.json index e8cea3da6..cb395e84e 100644 --- a/tests/Squidex.Infrastructure.Tests/project.json +++ b/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", diff --git a/tests/Squidex.Write.Tests/project.json b/tests/Squidex.Write.Tests/project.json index e99c4f9e2..763cab0c5 100644 --- a/tests/Squidex.Write.Tests/project.json +++ b/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", diff --git a/tests/Squidex.Write.Tests/x.ClearAsync() b/tests/Squidex.Write.Tests/x.ClearAsync() deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/Squidex.Write.Tests/x.GetEventsAsync() b/tests/Squidex.Write.Tests/x.GetEventsAsync() deleted file mode 100644 index e69de29bb..000000000