tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

EdmLib integrated

pull/1/head
Sebastian 10 years ago
parent
8caed29f9b
commit
0f74f4539c
15 changed files with 58 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Squidex.Core/Contents/ContentData.cs
  2. 12
      src/Squidex.Core/project.json
  3. 15
      src/Squidex.Events/project.json
  4. 8
      src/Squidex.Infrastructure.MongoDb/project.json
  5. 8
      src/Squidex.Infrastructure.RabbitMq/project.json
  6. 8
      src/Squidex.Infrastructure/project.json
  7. 15
      src/Squidex.Read/project.json
  8. 9
      src/Squidex.Store.MongoDb/project.json
  9. 15
      src/Squidex.Write/project.json
  10. 5
      src/Squidex/project.json
  11. 6
      tests/Squidex.Core.Tests/project.json
  12. 6
      tests/Squidex.Infrastructure.Tests/project.json
  13. 6
      tests/Squidex.Write.Tests/project.json
  14. 0
      tests/Squidex.Write.Tests/x.ClearAsync()
  15. 0
      tests/Squidex.Write.Tests/x.GetEventsAsync()

2
src/Squidex.Core/Contents/ContentData.cs
View File

@ -89,7 +89,7 @@ namespace Squidex.Core.Contents
{ {
Field field; 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; continue;
} }

12
src/Squidex.Core/project.json
View File

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

15
src/Squidex.Events/project.json
View File

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

8
src/Squidex.Infrastructure.MongoDb/project.json
View File

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

8
src/Squidex.Infrastructure.RabbitMq/project.json
View File

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

8
src/Squidex.Infrastructure/project.json
View File

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

15
src/Squidex.Read/project.json
View File

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

9
src/Squidex.Store.MongoDb/project.json
View File

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

15
src/Squidex.Write/project.json
View File

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

5
src/Squidex/project.json
View File

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

6
tests/Squidex.Core.Tests/project.json
View File

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

6
tests/Squidex.Infrastructure.Tests/project.json
View File

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

6
tests/Squidex.Write.Tests/project.json
View File

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

0
tests/Squidex.Write.Tests/x.ClearAsync()
View File

0
tests/Squidex.Write.Tests/x.GetEventsAsync()
View File

Write Preview
Loading…
Cancel
Save