Sagger version bumped to get a bug fix

src/Squidex.Core/Squidex.Core.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="protobuf-net" Version="2.1.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
     <PackageReference Include="NodaTime" Version="2.0.0-beta20170123" />
-    <PackageReference Include="NJsonSchema" Version="8.5.6255.20253" />
+    <PackageReference Include="NJsonSchema" Version="8.8.6270.12833" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="Microsoft.OData.Core" Version="6.15.0" />

src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj

@@ -11,6 +11,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.0" />
-    <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.0" />
+    <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.1" />
   </ItemGroup>
 </Project>

src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj

@@ -15,7 +15,7 @@
     <ProjectReference Include="..\Squidex.Read\Squidex.Read.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="IdentityServer4" Version="1.1.1" />
+    <PackageReference Include="IdentityServer4" Version="1.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.MongoDB" Version="1.0.2" />
     <PackageReference Include="MongoDB.Driver" Version="2.4.2" />

src/Squidex/Config/Swagger/SwaggerServices.cs

@@ -26,13 +26,13 @@ namespace Squidex.Config.Swagger
         {
             services.AddSingleton(typeof(SwaggerOwinSettings), s =>
             {
-                var options = s.GetService<IOptions<MyUrlsOptions>>().Value;
+                var urlOptions = s.GetService<IOptions<MyUrlsOptions>>().Value;
 
                 var settings =
                     new SwaggerOwinSettings { Title = "Squidex API Specification", IsAspNetCore = false }
-                        .ConfigurePaths()
+                        .ConfigurePaths(urlOptions)
                         .ConfigureSchemaSettings()
-                        .ConfigureIdentity(options);
+                        .ConfigureIdentity(urlOptions);
 
                 return settings;
             });
@@ -50,13 +50,17 @@ namespace Squidex.Config.Swagger
             return settings;
         }
 
-        private static SwaggerOwinSettings ConfigurePaths(this SwaggerOwinSettings settings)
+        private static SwaggerOwinSettings ConfigurePaths(this SwaggerOwinSettings settings, MyUrlsOptions urlOptions)
         {
             settings.SwaggerRoute = $"{Constants.ApiPrefix}/swagger/v1/swagger.json";
 
             settings.PostProcess = document =>
             {
                 document.BasePath = Constants.ApiPrefix;
+                document.Info.ExtensionData = new Dictionary<string, object>
+                {
+                    ["x-logo"] = new { url = urlOptions.BuildUrl("images/logo-white.png", false), backgroundColor = "#3f83df" }
+                };
             };
 
             settings.MiddlewareBasePath = Constants.ApiPrefix;

src/Squidex/Controllers/Api/Schemas/SchemasController.cs

@@ -42,7 +42,7 @@ namespace Squidex.Controllers.Api.Schemas
         }
 
         /// <summary>
-        /// Get app schemas.
+        /// Get schemas.
         /// </summary>
         /// <returns>
         /// 200 => Schemas returned.

src/Squidex/Controllers/ContentApi/ContentsController.cs

@@ -13,6 +13,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
+using NSwag.Annotations;
 using Squidex.Controllers.Api;
 using Squidex.Controllers.ContentApi.Models;
 using Squidex.Core.Contents;
@@ -30,6 +31,7 @@ namespace Squidex.Controllers.ContentApi
     [Authorize(Roles = SquidexRoles.AppEditor)]
     [ApiExceptionFilter]
     [ServiceFilter(typeof(AppFilterAttribute))]
+    [SwaggerIgnore]
     public class ContentsController : ControllerBase
     {
         private readonly ISchemaProvider schemas;

src/Squidex/Squidex.csproj

@@ -32,9 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.3.0" />
+    <PackageReference Include="Autofac" Version="4.4.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
-    <PackageReference Include="IdentityServer4" Version="1.1.1" />
+    <PackageReference Include="IdentityServer4" Version="1.2.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.0.5" />
     <PackageReference Include="IdentityServer4.AspNetIdentity" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.0" />
@@ -56,12 +56,12 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.4.2" />
-    <PackageReference Include="NJsonSchema" Version="8.5.6255.20253" />
+    <PackageReference Include="NJsonSchema" Version="8.8.6270.12833" />
     <PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0-beta20170123" />
-    <PackageReference Include="NSwag.AspNetCore" Version="9.5.0" />
+    <PackageReference Include="NSwag.AspNetCore" Version="9.7.0" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
-    <PackageReference Include="ReportGenerator" Version="2.5.3-beta2" />
+    <PackageReference Include="ReportGenerator" Version="2.5.5" />
-    <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.0" />
+    <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.1" />
     <PackageReference Include="System.Linq" Version="4.3.0" />
   </ItemGroup>
 

tests/RunCoverage.ps1

@@ -50,6 +50,6 @@ New-Item -ItemType directory -Path $reportsFolder
 -output:"$workingFolder\$reportsFolder\Read.xml" `
 -oldStyle
 
-&"$userProfile\.nuget\packages\ReportGenerator\2.5.2\tools\ReportGenerator.exe" `
+&"$userProfile\.nuget\packages\ReportGenerator\2.5.5\tools\ReportGenerator.exe" `
 -reports:"$workingFolder\$reportsFolder\*.xml" `
 -targetdir:"$workingFolder\$reportsFolder\Output"

tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj

@@ -11,10 +11,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="4.19.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170217-05" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Moq" Version="4.6.38-alpha" />
+    <PackageReference Include="Moq" Version="4.7.1" />
-    <PackageReference Include="xunit" Version="2.2.0-rc3-build3528" />
+    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-rc3-build1252" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0-msbuild3-final" />

tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj

@@ -10,10 +10,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170217-05" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Moq" Version="4.6.38-alpha" />
+    <PackageReference Include="Moq" Version="4.7.1" />
-    <PackageReference Include="xunit" Version="2.2.0-rc3-build3528" />
+    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-rc3-build1252" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0-msbuild3-final" />

tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj

@@ -13,11 +13,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="4.19.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170217-05" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.4.2" />
-    <PackageReference Include="Moq" Version="4.6.38-alpha" />
+    <PackageReference Include="Moq" Version="4.7.1" />
-    <PackageReference Include="xunit" Version="2.2.0-rc3-build3528" />
+    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-rc3-build1252" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0-msbuild3-final" />

tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj

@@ -12,11 +12,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="4.19.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170217-05" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.4.2" />
-    <PackageReference Include="Moq" Version="4.6.38-alpha" />
+    <PackageReference Include="Moq" Version="4.7.1" />
-    <PackageReference Include="xunit" Version="2.2.0-rc3-build3528" />
+    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-rc3-build1252" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0-msbuild3-final" />