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

Merge branch 'release/4.x' 

# Conflicts:
#	backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetActions.cs
#	backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs
#	frontend/app/shared/components/app-form.component.html
pull/590/head
Sebastian 5 years ago
parent
7ff381e756 a9badf36e5
commit
ef284ca2be
23 changed files with 94 additions and 90 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. 8
      backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
  2. 4
      backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
  3. 8
      backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  4. 2
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
  5. 20
      backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs
  6. 6
      backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetActions.cs
  7. 20
      backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs
  8. 14
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  9. 2
      backend/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj
  10. 4
      backend/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
  11. 2
      backend/src/Squidex.Domain.Users/Squidex.Domain.Users.csproj
  12. 2
      backend/src/Squidex.Infrastructure.Amazon/Squidex.Infrastructure.Amazon.csproj
  13. 2
      backend/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj
  14. 2
      backend/src/Squidex.Infrastructure.GetEventStore/Squidex.Infrastructure.GetEventStore.csproj
  15. 4
      backend/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
  16. 24
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  17. 2
      backend/src/Squidex.Web/Squidex.Web.csproj
  18. 36
      backend/src/Squidex/Squidex.csproj
  19. 4
      backend/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
  20. 6
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
  21. 6
      backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj
  22. 4
      backend/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj
  23. 2
      frontend/app/shared/components/app-form.component.html

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

@ -13,13 +13,13 @@
<PackageReference Include="Confluent.Kafka" Version="1.5.1" /> <PackageReference Include="Confluent.Kafka" Version="1.5.1" />
<PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.3.0" /> <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.3.0" />
<PackageReference Include="CoreTweet" Version="1.0.0.483" /> <PackageReference Include="CoreTweet" Version="1.0.0.483" />
<PackageReference Include="Datadog.Trace" Version="1.19.2" /> <PackageReference Include="Datadog.Trace" Version="1.19.5" />
<PackageReference Include="Elasticsearch.Net" Version="7.9.0" /> <PackageReference Include="Elasticsearch.Net" Version="7.9.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.15.0" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.15.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
<PackageReference Include="Microsoft.OData.Core" Version="7.7.1" /> <PackageReference Include="Microsoft.OData.Core" Version="7.7.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NodaTime" Version="3.0.0" /> <PackageReference Include="NodaTime" Version="3.0.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

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

@ -10,12 +10,12 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.2.5"> <PackageReference Include="Fody" Version="6.2.6">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="SquidexFreezable.Fody" Version="2.0.0" PrivateAssets="all" /> <PackageReference Include="SquidexFreezable.Fody" Version="2.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.8" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" /> <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />

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

@ -19,10 +19,10 @@
<PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" /> <PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.24" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
<PackageReference Include="Jint" Version="3.0.0-beta-1884" /> <PackageReference Include="Jint" Version="3.0.0-beta-1884" />
<PackageReference Include="Markdig" Version="0.21.1" /> <PackageReference Include="Markdig" Version="0.22.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
<PackageReference Include="Microsoft.OData.Core" Version="7.7.1" /> <PackageReference Include="Microsoft.OData.Core" Version="7.7.2" />
<PackageReference Include="NJsonSchema" Version="10.1.26" /> <PackageReference Include="NJsonSchema" Version="10.2.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" /> <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />

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

@ -17,7 +17,7 @@
<ProjectReference Include="..\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" /> <ProjectReference Include="..\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.11.1" /> <PackageReference Include="MongoDB.Driver" Version="2.11.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />

20
backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs
View File

@ -83,16 +83,20 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
{ {
var schema = new GraphQLSchema var schema = new GraphQLSchema
{ {
Query = Query = new AppQueriesGraphType(
new AppQueriesGraphType( model,
model, pageSizeContents,
pageSizeContents, pageSizeAssets,
pageSizeAssets, schemas)
schemas
),
Mutation = new AppMutationsGraphType(model, schemas)
}; };
var schemasWithFields = schemas.Where(x => x.SchemaDef.Fields.Count > 0);
if (schemasWithFields.Any())
{
schema.Mutation = new AppMutationsGraphType(model, schemasWithFields);
}
return schema; return schema;
} }

6
backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetActions.cs
View File

@ -49,7 +49,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
{ {
Name = "id", Name = "id",
Description = "The id of the asset (usually GUID).", Description = "The id of the asset (usually GUID).",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.NonNullDomainId ResolvedType = AllTypes.NonNullDomainId
} }
}; };
@ -88,14 +88,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
{ {
Name = "filter", Name = "filter",
Description = "Optional OData filter.", Description = "Optional OData filter.",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.String ResolvedType = AllTypes.String
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
{ {
Name = "orderby", Name = "orderby",
Description = "Optional OData order definition.", Description = "Optional OData order definition.",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.String ResolvedType = AllTypes.String
} }
}; };

20
backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs
View File

@ -69,7 +69,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
{ {
Name = "id", Name = "id",
Description = "The id of the content (usually GUID).", Description = "The id of the content (usually GUID).",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.NonNullDomainId ResolvedType = AllTypes.NonNullDomainId
} }
}; };
@ -108,21 +108,21 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
{ {
Name = "filter", Name = "filter",
Description = "Optional OData filter.", Description = "Optional OData filter.",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.String ResolvedType = AllTypes.String
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
{ {
Name = "orderby", Name = "orderby",
Description = "Optional OData order definition.", Description = "Optional OData order definition.",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.String ResolvedType = AllTypes.String
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
{ {
Name = "search", Name = "search",
Description = "Optional OData full text search.", Description = "Optional OData full text search.",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.String ResolvedType = AllTypes.String
} }
}; };
@ -200,8 +200,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
{ {
Name = "id", Name = "id",
Description = "The id of the content (GUID)", Description = "The id of the content (usually GUID)",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.NonNullString ResolvedType = AllTypes.NonNullString
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
@ -333,21 +333,21 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
{ {
Name = "id", Name = "id",
Description = "The id of the content (usually GUID)", Description = "The id of the content (usually GUID)",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.NonNullString ResolvedType = AllTypes.NonNullString
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
{ {
Name = "status", Name = "status",
Description = "The new status", Description = "The new status",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.NonNullString ResolvedType = AllTypes.NonNullString
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
{ {
Name = "dueTime", Name = "dueTime",
Description = "When to change the status", Description = "When to change the status",
DefaultValue = EtagVersion.Any, DefaultValue = null,
ResolvedType = AllTypes.Date ResolvedType = AllTypes.Date
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)
@ -380,7 +380,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
{ {
Name = "id", Name = "id",
Description = "The id of the content (usually GUID)", Description = "The id of the content (usually GUID)",
DefaultValue = string.Empty, DefaultValue = null,
ResolvedType = AllTypes.NonNullGuid ResolvedType = AllTypes.NonNullGuid
}, },
new QueryArgument(AllTypes.None) new QueryArgument(AllTypes.None)

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

@ -17,21 +17,21 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CsvHelper" Version="15.0.5" /> <PackageReference Include="CsvHelper" Version="15.0.6" />
<PackageReference Include="Elasticsearch.Net" Version="7.9.0" /> <PackageReference Include="Elasticsearch.Net" Version="7.9.0" />
<PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.2.5"> <PackageReference Include="Fody" Version="6.2.6">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="GraphQL" Version="3.0.0" /> <PackageReference Include="GraphQL" Version="3.0.0.2026" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.2.2"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.2.2" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
<PackageReference Include="NodaTime" Version="3.0.0" /> <PackageReference Include="NodaTime" Version="3.0.1" />
<PackageReference Include="Notifo.SDK" Version="1.0.0-alpha8" /> <PackageReference Include="Notifo.SDK" Version="1.0.0-alpha8" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

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

@ -13,7 +13,7 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NodaTime" Version="3.0.0" /> <PackageReference Include="NodaTime" Version="3.0.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />

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

@ -18,9 +18,9 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.0.4" /> <PackageReference Include="IdentityServer4" Version="4.1.1" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="MongoDB.Driver" Version="2.11.1" /> <PackageReference Include="MongoDB.Driver" Version="2.11.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" /> <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />

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

@ -16,7 +16,7 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.8" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="SharpPwned.NET" Version="1.0.8" /> <PackageReference Include="SharpPwned.NET" Version="1.0.8" />

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

@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="3.5.0.9" /> <PackageReference Include="AWSSDK.S3" Version="3.5.3.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
</ItemGroup> </ItemGroup>

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

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.3.2" /> <PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.3.2" />
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.11.6" /> <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.12.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" /> <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />

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

@ -10,7 +10,7 @@
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EventStore.Client" Version="20.6.0" /> <PackageReference Include="EventStore.Client" Version="20.6.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
</ItemGroup> </ItemGroup>

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

@ -13,8 +13,8 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.11.1" /> <PackageReference Include="MongoDB.Driver" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver.GridFS" Version="2.11.1" /> <PackageReference Include="MongoDB.Driver.GridFS" Version="2.11.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.1" /> <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.1" />

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

@ -15,26 +15,26 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="FluentFTP" Version="32.4.4" /> <PackageReference Include="FluentFTP" Version="32.4.5" />
<PackageReference Include="Fody" Version="6.2.5"> <PackageReference Include="Fody" Version="6.2.6">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" /> <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.8" />
<PackageReference Include="Microsoft.OData.Core" Version="7.7.1" /> <PackageReference Include="Microsoft.OData.Core" Version="7.7.2" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.2.2"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.2.2" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.2.2" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NJsonSchema" Version="10.1.26" /> <PackageReference Include="NJsonSchema" Version="10.2.2" />
<PackageReference Include="NodaTime" Version="3.0.0" /> <PackageReference Include="NodaTime" Version="3.0.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
<PackageReference Include="Squidex.Text" Version="1.1.0" /> <PackageReference Include="Squidex.Text" Version="1.1.0" />

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

@ -12,7 +12,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Fody" Version="6.2.5"> <PackageReference Include="Fody" Version="6.2.6">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

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

@ -34,32 +34,32 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.3" /> <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.4" />
<PackageReference Include="GraphQL.NewtonsoftJson" Version="3.0.0" /> <PackageReference Include="GraphQL.NewtonsoftJson" Version="3.0.0.2026" />
<PackageReference Include="IdentityServer4" Version="4.0.4" /> <PackageReference Include="IdentityServer4" Version="4.1.1" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" /> <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.0.4" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.7" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.8" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.7" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.7" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.8" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" /> <PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" />
<PackageReference Include="Microsoft.OData.Core" Version="7.7.1" /> <PackageReference Include="Microsoft.OData.Core" Version="7.7.2" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.2.2" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.2.2" /> <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.2.2" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
<PackageReference Include="MongoDB.Driver" Version="2.11.1" /> <PackageReference Include="MongoDB.Driver" Version="2.11.2" />
<PackageReference Include="Namotion.Reflection" Version="1.0.13" /> <PackageReference Include="Namotion.Reflection" Version="1.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NJsonSchema" Version="10.1.26" /> <PackageReference Include="NJsonSchema" Version="10.2.2" />
<PackageReference Include="NSwag.AspNetCore" Version="13.7.0" /> <PackageReference Include="NSwag.AspNetCore" Version="13.8.2" />
<PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" /> <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" />
<PackageReference Include="Orleans.Providers.MongoDB" Version="3.1.7" /> <PackageReference Include="Orleans.Providers.MongoDB" Version="3.1.7" />
<PackageReference Include="OrleansDashboard" Version="3.1.0" /> <PackageReference Include="OrleansDashboard" Version="3.1.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.6.6" PrivateAssets="all" /> <PackageReference Include="ReportGenerator" Version="4.7.0" PrivateAssets="all" />
<PackageReference Include="Squidex.ClientLibrary" Version="5.4.0" /> <PackageReference Include="Squidex.ClientLibrary" Version="5.5.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Linq" Version="4.3.0" /> <PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" /> <PackageReference Include="System.Runtime" Version="4.3.1" />

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

@ -14,8 +14,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" /> <PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

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

@ -19,10 +19,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" /> <PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="GraphQL" Version="3.0.0" /> <PackageReference Include="GraphQL" Version="3.0.0.2026" />
<PackageReference Include="GraphQL.NewtonsoftJson" Version="3.0.0" /> <PackageReference Include="GraphQL.NewtonsoftJson" Version="3.0.0.2026" />
<PackageReference Include="Lorem.Universal.Net" Version="3.0.64" /> <PackageReference Include="Lorem.Universal.Net" Version="3.0.64" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

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

@ -25,10 +25,10 @@
<PackageReference Include="FakeItEasy" Version="6.2.1" /> <PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="3.3.0" /> <PackageReference Include="Google.Cloud.Storage.V1" Version="3.3.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.2.2" /> <PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.2.2"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>

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

@ -12,8 +12,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" /> <PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="IdentityServer4" Version="4.0.4" /> <PackageReference Include="IdentityServer4" Version="4.1.1" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.0.4" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
frontend/app/shared/components/app-form.component.html
View File

@ -39,7 +39,7 @@
<button type="submit" class="btn btn-success"> <button type="submit" class="btn btn-success">
{{ 'common.create' | sqxTranslate }} {{ 'common.create' | sqxTranslate }}
2</button> </button>
</ng-container> </ng-container>
</sqx-modal-dialog> </sqx-modal-dialog>
</form> </form>
Write Preview
Loading…
Cancel
Save