Schema DTOs fixed

src/Squidex/Controllers/Api/Schemas/Models/Converters/SchemaConverter.cs

@@ -11,7 +11,6 @@ using System.Collections.Generic;
 using Squidex.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Read.Schemas.Repositories;
-using Dtos = Squidex.Controllers.Api.Schemas.Models.Fields;
 
 namespace Squidex.Controllers.Api.Schemas.Models.Converters
 {
@@ -21,11 +20,11 @@ namespace Squidex.Controllers.Api.Schemas.Models.Converters
         {
             {
                 typeof(NumberFieldProperties),
-                p => SimpleMapper.Map((NumberFieldProperties)p, new Dtos.NumberField())
+                p => SimpleMapper.Map((NumberFieldProperties)p, new NumberFieldPropertiesDto())
             },
             {
                 typeof(StringFieldProperties),
-                p => SimpleMapper.Map((StringFieldProperties)p, new Dtos.StringField())
+                p => SimpleMapper.Map((StringFieldProperties)p, new StringFieldPropertiesDto())
             }
         };
 

src/Squidex/Controllers/Api/Schemas/Models/FieldPropertiesDto.cs

@@ -11,13 +11,12 @@ using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using NJsonSchema.Converters;
 using Squidex.Core.Schemas;
-using Dtos = Squidex.Controllers.Api.Schemas.Models.Fields;
 
 namespace Squidex.Controllers.Api.Schemas.Models
 {
     [JsonConverter(typeof(JsonInheritanceConverter), "fieldType")]
-    [KnownType(typeof(Dtos.NumberField))]
+    [KnownType(typeof(NumberFieldPropertiesDto))]
-    [KnownType(typeof(Dtos.StringField))]
+    [KnownType(typeof(StringFieldPropertiesDto))]
     public abstract class FieldPropertiesDto
     {
         /// <summary>

src/Squidex/Controllers/Api/Schemas/Models/Fields/NumberField.cs → src/Squidex/Controllers/Api/Schemas/Models/NumberFieldPropertiesDto.cs

@@ -1,5 +1,5 @@
 // ==========================================================================
-//  NumberField.cs
+//  NumberFieldPropertiesDto.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
@@ -10,10 +10,10 @@ using NJsonSchema.Annotations;
 using Squidex.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Controllers.Api.Schemas.Models
 {
     [JsonSchema("Number")]
-    public sealed class NumberField : FieldPropertiesDto
+    public sealed class NumberFieldPropertiesDto : FieldPropertiesDto
     {
         /// <summary>
         /// The default value for the field value.

src/Squidex/Controllers/Api/Schemas/Models/Fields/StringField.cs → src/Squidex/Controllers/Api/Schemas/Models/StringFieldPropertiesDto.cs

@@ -1,5 +1,5 @@
 // ==========================================================================
-//  StringField.cs
+//  StringFieldPropertiesDto.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
@@ -10,10 +10,10 @@ using NJsonSchema.Annotations;
 using Squidex.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Controllers.Api.Schemas.Models
 {
     [JsonSchema("String")]
-    public sealed class StringField : FieldPropertiesDto
+    public sealed class StringFieldPropertiesDto : FieldPropertiesDto
     {
         /// <summary>
         /// The default value for the field value.

src/Squidex/app/shared/module.ts

@@ -7,7 +7,7 @@
 
 import { NgModule } from '@angular/core';
 
-import { SqxFrameworkModule } from 'shared';
+import { SqxFrameworkModule } from 'framework';
 
 import {
     AppFormComponent,

src/Squidex/project.json

@@ -22,10 +22,6 @@
     "Microsoft.Extensions.Logging.Console": "1.1.0",
     "Microsoft.Extensions.Logging.Debug": "1.1.0",
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
-    "Microsoft.NETCore.App": {
-      "version": "1.0.1",
-      "type": "platform"
-    },
     "MongoDB.Driver": "2.4.0",
     "NJsonSchema": "6.3.6185.19861",
     "NSwag.AspNetCore": "8.0.0",
@@ -44,11 +40,13 @@
   },
 
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
-      "imports": [
+      "dependencies": {
-        "dotnet5.6",
+        "Microsoft.NETCore.App": {
-        "portable-net45+win8"
+          "type": "platform", "version": "1.1.0"
-      ]
+        }
+      },
+      "imports": "dnxcore50"
     }
   },