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

Merge branch 'master' of github.com:Squidex/squidex

pull/815/head
Sebastian 4 years ago
parent
4e3d950885 848412f720
commit
bf964d5cde
23 changed files with 61 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
  2. 2
      backend/src/Migrations/Migrations.csproj
  3. 2
      backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
  4. 6
      backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  5. 4
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
  6. 4
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/Text/LuceneSearchDefinitionExtensions.cs
  7. 4
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  8. 2
      backend/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj
  9. 4
      backend/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
  10. 2
      backend/src/Squidex.Domain.Users/Squidex.Domain.Users.csproj
  11. 4
      backend/src/Squidex.Infrastructure.GetEventStore/Squidex.Infrastructure.GetEventStore.csproj
  12. 6
      backend/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
  13. 2
      backend/src/Squidex.Infrastructure.RabbitMq/Squidex.Infrastructure.RabbitMq.csproj
  14. 10
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  15. 2
      backend/src/Squidex.Shared/Squidex.Shared.csproj
  16. 4
      backend/src/Squidex.Web/Squidex.Web.csproj
  17. 30
      backend/src/Squidex/Squidex.csproj
  18. 2
      backend/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
  19. 2
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
  20. 2
      backend/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
  21. 2
      backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj
  22. 2
      backend/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj
  23. 18
      backend/tools/TestSuite/TestSuite.ApiTests/AssetFormatTests.cs

4
backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
View File

@ -15,10 +15,10 @@
<PackageReference Include="Confluent.Kafka" Version="1.8.2" />
<PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.3.0" />
<PackageReference Include="CoreTweet" Version="1.0.0.483" />
<PackageReference Include="Elasticsearch.Net" Version="7.15.2" />
<PackageReference Include="Elasticsearch.Net" Version="7.16.0" />
<PackageReference Include="Google.Cloud.Diagnostics.Common" Version="4.3.1" />
<PackageReference Include="Google.Cloud.Logging.V2" Version="3.4.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
backend/src/Migrations/Migrations.csproj
View File

@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
View File

@ -11,7 +11,7 @@
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

6
backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
View File

@ -20,17 +20,17 @@
<PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" />
<PackageReference Include="GeoJSON.Net" Version="1.2.19" />
<PackageReference Include="Jint" Version="3.0.0-beta-2036" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.9.4" />
<PackageReference Include="NJsonSchema" Version="10.5.2" />
<PackageReference Include="NJsonSchema" Version="10.6.4" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
<PackageReference Include="System.Linq.Async" Version="5.1.0" />
<PackageReference Include="ValueTaskSupplement" Version="1.1.0" />
</ItemGroup>
<ItemGroup>

4
backend/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
View File

@ -19,11 +19,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00015" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MongoDB.Driver" Version="2.13.3" />
<PackageReference Include="MongoDB.Driver" Version="2.14.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />

4
backend/src/Squidex.Domain.Apps.Entities.MongoDb/Text/LuceneSearchDefinitionExtensions.cs
View File

@ -8,6 +8,7 @@
using MongoDB.Bson;
using MongoDB.Bson.Serialization;
using MongoDB.Driver;
using MongoDB.Driver.Linq;
namespace Squidex.Domain.Apps.Entities.MongoDb.Text
{
@ -47,7 +48,8 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Text
public override RenderedPipelineStageDefinition<TOutput> Render(
IBsonSerializer<TInput> inputSerializer,
IBsonSerializerRegistry serializerRegistry)
IBsonSerializerRegistry serializerRegistry,
LinqProvider linqProvider)
{
return renderer(inputSerializer);
}

4
backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
View File

@ -18,7 +18,7 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CsvHelper" Version="27.2.0" />
<PackageReference Include="CsvHelper" Version="27.2.1" />
<PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.6.0">
<PrivateAssets>all</PrivateAssets>
@ -26,7 +26,7 @@
</PackageReference>
<PackageReference Include="GraphQL" Version="4.6.1" />
<PackageReference Include="GraphQL.DataLoader" Version="4.6.1" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
backend/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj
View File

@ -14,7 +14,7 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

4
backend/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
View File

@ -19,12 +19,12 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.13.3" />
<PackageReference Include="MongoDB.Driver" Version="2.14.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />

2
backend/src/Squidex.Domain.Users/Squidex.Domain.Users.csproj
View File

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="IdentityModel" Version="5.2.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

4
backend/src/Squidex.Infrastructure.GetEventStore/Squidex.Infrastructure.GetEventStore.csproj
View File

@ -14,8 +14,8 @@
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="21.2.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.40.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Grpc.Net.Client" Version="2.41.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

6
backend/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
View File

@ -14,12 +14,12 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MongoDB.Driver" Version="2.13.3" />
<PackageReference Include="MongoDB.Driver.GridFS" Version="2.13.3" />
<PackageReference Include="MongoDB.Driver" Version="2.14.1" />
<PackageReference Include="MongoDB.Driver.GridFS" Version="2.14.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />

2
backend/src/Squidex.Infrastructure.RabbitMq/Squidex.Infrastructure.RabbitMq.csproj
View File

@ -11,7 +11,7 @@
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

10
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
View File

@ -11,9 +11,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GeoJSON.Net" Version="1.2.19" />
<PackageReference Include="MailKit" Version="2.15.0" />
<PackageReference Include="MailKit" Version="3.0.0" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -28,10 +28,10 @@
<PackageReference Include="Microsoft.Orleans.Core" Version="3.5.1" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NJsonSchema" Version="10.5.2" />
<PackageReference Include="NJsonSchema" Version="10.6.4" />
<PackageReference Include="OpenTelemetry.Api" Version="1.1.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets" Version="2.0.0" />
<PackageReference Include="Squidex.Assets" Version="2.1.0" />
<PackageReference Include="Squidex.Caching" Version="1.8.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="2.3.0" />
<PackageReference Include="Squidex.Log" Version="1.6.0" />
@ -39,7 +39,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
<PackageReference Include="System.Linq.Async" Version="5.1.0" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="System.Security.Claims" Version="4.3.0" />

2
backend/src/Squidex.Shared/Squidex.Shared.csproj
View File

@ -9,7 +9,7 @@
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

4
backend/src/Squidex.Web/Squidex.Web.csproj
View File

@ -17,9 +17,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="5.0.2" />
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="5.1.1" />
<PackageReference Include="Lazy.Fody" Version="1.10.0" PrivateAssets="all" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

30
backend/src/Squidex/Squidex.csproj
View File

@ -34,12 +34,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="6.0.0" />
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="6.0.1" />
<PackageReference Include="GraphQL.DataLoader" Version="4.6.1" />
<PackageReference Include="GraphQL.Server.Core" Version="5.0.2" />
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="5.0.2" />
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.SystemTextJson" Version="5.0.2" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="GraphQL.Server.Core" Version="5.1.1" />
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="5.1.1" />
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.SystemTextJson" Version="5.1.1" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -58,12 +58,12 @@
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.5.1" />
<PackageReference Include="Microsoft.Orleans.Hosting.Kubernetes" Version="3.5.1" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.5.1" />
<PackageReference Include="MongoDB.Driver" Version="2.13.3" />
<PackageReference Include="Namotion.Reflection" Version="2.0.5" />
<PackageReference Include="MongoDB.Driver" Version="2.14.1" />
<PackageReference Include="Namotion.Reflection" Version="2.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NJsonSchema" Version="10.5.2" />
<PackageReference Include="NJsonSchema" Version="10.6.4" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.14.4" />
<PackageReference Include="NSwag.AspNetCore" Version="13.15.3" />
<PackageReference Include="OpenCover" Version="4.7.1221" PrivateAssets="all" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc7" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc7" />
@ -72,13 +72,13 @@
<PackageReference Include="OrleansDashboard.EmbeddedAssets" Version="3.6.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets.Azure" Version="2.0.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="2.0.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="2.0.0" />
<PackageReference Include="Squidex.Assets.Mongo" Version="2.0.0" />
<PackageReference Include="Squidex.Assets.S3" Version="2.0.0" />
<PackageReference Include="Squidex.Assets.Azure" Version="2.1.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="2.1.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="2.1.0" />
<PackageReference Include="Squidex.Assets.Mongo" Version="2.1.0" />
<PackageReference Include="Squidex.Assets.S3" Version="2.1.0" />
<PackageReference Include="Squidex.Caching.Orleans" Version="1.8.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="7.5.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="7.7.0" />
<PackageReference Include="Squidex.Hosting" Version="2.3.0" />
<PackageReference Include="Squidex.OpenIddict.MongoDb" Version="4.0.1-dev" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
backend/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
View File

@ -15,7 +15,7 @@
<ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
View File

@ -25,7 +25,7 @@
<PackageReference Include="GraphQL" Version="4.6.1" />
<PackageReference Include="GraphQL.NewtonsoftJson" Version="4.6.1" />
<PackageReference Include="Lorem.Universal.Net" Version="4.0.80" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
backend/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
View File

@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj
View File

@ -17,7 +17,7 @@
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="3.6.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
backend/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj
View File

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.676">
<PackageReference Include="Meziantou.Analyzer" Version="1.0.680">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

18
backend/tools/TestSuite/TestSuite.ApiTests/AssetFormatTests.cs
View File

@ -43,7 +43,7 @@ namespace TestSuite.ApiTests
{
var asset = await _.UploadFileAsync("Assets/SampleImage_150kb.gif", "image/gif");
await AssetImageAsync(asset);
await AssertImageAsync(asset);
}
[Fact]
@ -51,7 +51,7 @@ namespace TestSuite.ApiTests
{
var asset = await _.UploadFileAsync("Assets/SampleImage_400kb.png", "image/png");
await AssetImageAsync(asset);
await AssertImageAsync(asset);
}
[Fact]
@ -59,7 +59,7 @@ namespace TestSuite.ApiTests
{
var asset = await _.UploadFileAsync("Assets/SampleImage_62kb.jpg", "image/jpg");
await AssetImageAsync(asset);
await AssertImageAsync(asset);
Assert.Equal(79L, asset.Metadata["imageQuality"]);
}
@ -69,7 +69,7 @@ namespace TestSuite.ApiTests
{
var asset = await _.UploadFileAsync("Assets/SampleImage_100kb.webp", "image/jpg");
await AssetImageAsync(asset);
await AssertImageAsync(asset);
}
[Fact]
@ -77,18 +77,18 @@ namespace TestSuite.ApiTests
{
var asset = await _.UploadFileAsync("Assets/SampleImage_400kb.tiff", "image/jpg");
await AssetImageAsync(asset);
await AssertImageAsync(asset);
}
[Fact(Skip = "Not supported yet.")]
[Fact]
public async Task Should_upload_image_tga_and_resize()
{
var asset = await _.UploadFileAsync("Assets/SampleImage_600kb.tga", "image/jpg");
var asset = await _.UploadFileAsync("Assets/SampleImage_600kb.tga", "image/x-tga");
await AssetImageAsync(asset);
await AssertImageAsync(asset);
}
private async Task AssetImageAsync(AssetDto asset)
private async Task AssertImageAsync(AssetDto asset)
{
// Should parse image metadata.
Assert.True(asset.IsImage);

Write Preview
Loading…
Cancel
Save