OData upgraded.

src/Squidex.Domain.Apps.Core/Schemas/BooleanField.cs

@@ -9,7 +9,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using Squidex.Domain.Apps.Core.Schemas.Validators;

src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs

@@ -9,7 +9,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using NodaTime;

src/Squidex.Domain.Apps.Core/Schemas/Field.cs

@@ -9,7 +9,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using Squidex.Domain.Apps.Core.Schemas.Validators;

src/Squidex.Domain.Apps.Core/Schemas/NumberField.cs

@@ -10,7 +10,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using Squidex.Domain.Apps.Core.Schemas.Validators;

src/Squidex.Domain.Apps.Core/Schemas/Schema.cs

@@ -10,7 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Microsoft.OData.Edm.Library;
+using Microsoft.OData.Edm;
 using NJsonSchema;
 using Squidex.Infrastructure;
 

src/Squidex.Domain.Apps.Core/Schemas/StringField.cs

@@ -11,7 +11,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using Squidex.Domain.Apps.Core.Schemas.Validators;

src/Squidex.Domain.Apps.Core/Squidex.Domain.Apps.Core.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>
@@ -11,12 +10,10 @@
     <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.OData.Core" Version="7.2.0" />
     <PackageReference Include="NJsonSchema" Version="9.2.5" />
     <PackageReference Include="NodaTime" Version="2.0.3" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
     <PackageReference Include="System.ValueTuple" Version="4.3.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="Microsoft.OData.Core" Version="6.15.0" />
-  </ItemGroup>
 </Project>

src/Squidex.Domain.Apps.Read.MongoDb/Contents/MongoContentRepository.cs

@@ -10,7 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.OData.Core;
+using Microsoft.OData;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using Squidex.Domain.Apps.Read.Apps;
@@ -105,7 +105,7 @@ namespace Squidex.Domain.Apps.Read.MongoDb.Contents
                 }
                 catch (ODataException ex)
                 {
-                    throw new ValidationException("Failed to parse query: " + ex.Message, ex);
+                    throw new ValidationException($"Failed to parse query: {ex.Message}", ex);
                 }
 
                 var entities = await cursor.ToListAsync();
@@ -146,7 +146,7 @@ namespace Squidex.Domain.Apps.Read.MongoDb.Contents
                 }
                 catch (ODataException ex)
                 {
-                    throw new ValidationException("Failed to parse query: " + ex.Message, ex);
+                    throw new ValidationException($"Failed to parse query: {ex.Message}", ex);
                 }
 
                 contentsCount = await cursor.CountAsync();

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/ConstantVisitor.cs

@@ -7,10 +7,8 @@
 // ==========================================================================
 
 using System;
-using Microsoft.OData.Core.UriParser.Semantic;
-using Microsoft.OData.Core.UriParser.Visitors;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
+using Microsoft.OData.UriParser;
 using NodaTime;
 using NodaTime.Text;
 

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/EdmModelExtensions.cs

@@ -8,8 +8,8 @@
 
 using System;
 using System.Linq;
-using Microsoft.OData.Core.UriParser;
 using Microsoft.OData.Edm;
+using Microsoft.OData.UriParser;
 
 namespace Squidex.Domain.Apps.Read.MongoDb.Contents.Visitors
 {
@@ -17,7 +17,7 @@ namespace Squidex.Domain.Apps.Read.MongoDb.Contents.Visitors
     {
         public static ODataUriParser ParseQuery(this IEdmModel model, string query)
         {
-            var path = model.EntityContainer.EntitySets().First().Path.Path.Last().Split('.').Last();
+            var path = model.EntityContainer.EntitySets().First().Path.Path.Split('.').Last();
 
             if (query.StartsWith("?"))
             {

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/FilterBuilder.cs

@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-using Microsoft.OData.Core.UriParser;
+using Microsoft.OData.UriParser;
 using MongoDB.Driver;
 using Squidex.Domain.Apps.Core.Schemas;
 

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/FilterVisitor.cs

@@ -8,9 +8,7 @@
 
 using System;
 using System.Linq;
-using Microsoft.OData.Core.UriParser.Semantic;
-using Microsoft.OData.Core.UriParser.TreeNodeKinds;
-using Microsoft.OData.Core.UriParser.Visitors;
+using Microsoft.OData.UriParser;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using Squidex.Domain.Apps.Core.Schemas;

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/FindExtensions.cs

@@ -8,7 +8,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OData.Core.UriParser;
+using Microsoft.OData.UriParser;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using Squidex.Domain.Apps.Core.Schemas;

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/PropertyVisitor.cs

@@ -9,8 +9,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Linq;
-using Microsoft.OData.Core.UriParser.Semantic;
-using Microsoft.OData.Core.UriParser.Visitors;
+using Microsoft.OData.UriParser;
 using MongoDB.Driver;
 using Squidex.Domain.Apps.Core.Schemas;
 

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/SearchTermVisitor.cs

@@ -7,9 +7,7 @@
 // ==========================================================================
 
 using System;
-using Microsoft.OData.Core.UriParser.Semantic;
-using Microsoft.OData.Core.UriParser.TreeNodeKinds;
-using Microsoft.OData.Core.UriParser.Visitors;
+using Microsoft.OData.UriParser;
 
 namespace Squidex.Domain.Apps.Read.MongoDb.Contents.Visitors
 {

src/Squidex.Domain.Apps.Read.MongoDb/Contents/Visitors/SortBuilder.cs

@@ -7,8 +7,7 @@
 // ==========================================================================
 
 using System.Collections.Generic;
-using Microsoft.OData.Core.UriParser;
-using Microsoft.OData.Core.UriParser.Semantic;
+using Microsoft.OData.UriParser;
 using MongoDB.Driver;
 using Squidex.Domain.Apps.Core.Schemas;
 

src/Squidex.Domain.Apps.Read.MongoDb/Squidex.Domain.Apps.Read.MongoDb.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>
@@ -15,10 +14,8 @@
     <ProjectReference Include="..\Squidex.Domain.Apps.Read\Squidex.Domain.Apps.Read.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.OData.Core" Version="7.2.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.4.4" />
     <PackageReference Include="System.ValueTuple" Version="4.3.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="Microsoft.OData.Core" Version="6.15.0" />
-  </ItemGroup>
 </Project>

src/Squidex.Domain.Apps.Read/Contents/Builders/EdmModelBuilder.cs

@@ -9,7 +9,6 @@
 using System;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
 using Squidex.Domain.Apps.Core;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Domain.Apps.Read.Apps;

src/Squidex/Squidex.csproj

@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <NoWarn>$(NoWarn);CS1591;1591;1573;1572</NoWarn>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Squidex</AssemblyName>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);CS1591;1591;1573;1572</NoWarn>
     <OutputType>Exe</OutputType>
     <PackageId>Squidex</PackageId>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
     <RuntimeFrameworkVersion>1.1.2</RuntimeFrameworkVersion>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
 
@@ -67,6 +66,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.OData.Core" Version="7.2.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.4.4" />
     <PackageReference Include="NJsonSchema" Version="9.2.5" />
     <PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" />
@@ -78,10 +78,6 @@
     <PackageReference Include="System.ValueTuple" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.OData.Core" Version="6.15.0" />
-  </ItemGroup>
-
   <Target Name="IncludeDocFile" BeforeTargets="PrepareForPublish">
     <ItemGroup Condition=" '$(DocumentationFile)' != '' ">
       <_DocumentationFile Include="$(DocumentationFile)" />

src/Squidex/app-config/webpack.run.prod.js

@@ -86,7 +86,6 @@ module.exports = webpackMerge(runConfig, {
     plugins: [
         new webpack.NoEmitOnErrorsPlugin(),
         new webpack.DefinePlugin({ 'process.env': { 'ENV': JSON.stringify(ENV) } }),
-        new webpack.optimize.ModuleConcatenationPlugin(),
 
         /*
          * Puts each bundle into a file and appends the hash of the file to the path.

src/Squidex/app/shared/guards/app-must-exist.guard.ts

@@ -29,8 +29,10 @@ export class AppMustExistGuard implements CanActivate {
                     }
 
                     return hasApp;
-                }).catch(() => {
+                }, () => {
                     this.router.navigate(['/404']);
+
+                    return false;
                 });
 
         return result;

src/Squidex/app/shared/guards/resolve-content.guard.spec.ts

@@ -87,17 +87,17 @@ describe('ResolveContentGuard', () => {
     });
 
     it('should return content if loading succeeded', (done) => {
-        const schema = {};
+        const content: any = {};
 
         appsStore.setup(x => x.getContent('my-app', 'my-schema', '123'))
-            .returns(() => Observable.of(schema));
+            .returns(() => Observable.of(content));
         const router = new RouterMockup();
 
         const guard = new ResolveContentGuard(appsStore.object, <any>router);
 
         guard.resolve(<any>route, <any>{})
             .then(result => {
-                expect(result).toBe(schema);
+                expect(result).toBe(content);
 
                 done();
             });

src/Squidex/app/shared/guards/resolve-published-schema.guard.spec.ts

@@ -76,7 +76,7 @@ describe('ResolvePublishedSchemaGuard', () => {
     });
 
     it('should navigate to 404 page if schema not published', (done) => {
-        const schema = { isPublished: false };
+        const schema: any = { isPublished: false };
 
         schemasService.setup(x => x.getSchema('my-app', 'my-schema'))
             .returns(() => Observable.of(schema));
@@ -94,7 +94,7 @@ describe('ResolvePublishedSchemaGuard', () => {
     });
 
     it('should return schema if loading succeeded', (done) => {
-        const schema = { isPublished: true };
+        const schema: any = { isPublished: true };
 
         schemasService.setup(x => x.getSchema('my-app', 'my-schema'))
             .returns(() => Observable.of(schema));

src/Squidex/app/shared/guards/resolve-schema.guard.spec.ts

@@ -76,7 +76,7 @@ describe('ResolveSchemaGuard', () => {
     });
 
     it('should return schema if loading succeeded', (done) => {
-        const schema = {};
+        const schema: any = {};
 
         schemasService.setup(x => x.getSchema('my-app', 'my-schema'))
             .returns(() => Observable.of(schema));

src/Squidex/app/shared/guards/resolve-user.guard.spec.ts

@@ -68,7 +68,7 @@ describe('ResolveUserGuard', () => {
     });
 
     it('should return user if loading succeeded', (done) => {
-        const user = {};
+        const user: any = {};
 
         usersService.setup(x => x.getUser('my-user'))
             .returns(() => Observable.of(user));

src/Squidex/package.json

@@ -82,7 +82,7 @@
     "typemoq": "1.7.0",
     "typescript": "2.4.1",
     "underscore": "1.8.3",
-    "webpack": "3.1.0",
+    "webpack": "2.6.1",
     "webpack-dev-server": "2.5.1",
     "webpack-merge": "4.1.0"
   }