diff --git a/Squidex.ruleset b/Squidex.ruleset index 78388c901..8a8cb7d9c 100644 --- a/Squidex.ruleset +++ b/Squidex.ruleset @@ -1,18 +1,22 @@ - + - + - - - - - - - - - - + + + + + + + + + + + + + + @@ -21,8 +25,6 @@ - - @@ -31,37 +33,37 @@ - - - - - + - - - - - - + + + + - - - - + + + + - - - + + + + + + + + + \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs index b9fa1a56f..eba2c5c6b 100644 --- a/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs +++ b/src/Squidex.Domain.Apps.Core/Schemas/DateTimeField.cs @@ -22,7 +22,6 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.Schemas { - [TypeName("DateTimeField")] public sealed class DateTimeField : Field { public DateTimeField(long id, string name, Partitioning partitioning) diff --git a/src/Squidex.Domain.Apps.Write/Apps/Commands/AssignContributor.cs b/src/Squidex.Domain.Apps.Write/Apps/Commands/AssignContributor.cs index 13af0ced7..0ba37d8e6 100644 --- a/src/Squidex.Domain.Apps.Write/Apps/Commands/AssignContributor.cs +++ b/src/Squidex.Domain.Apps.Write/Apps/Commands/AssignContributor.cs @@ -22,7 +22,7 @@ namespace Squidex.Domain.Apps.Write.Apps.Commands { if (string.IsNullOrWhiteSpace(ContributorId)) { - errors.Add(new ValidationError("Contributor id not assigned", nameof (ContributorId))); + errors.Add(new ValidationError("Contributor id not assigned", nameof(ContributorId))); } } } diff --git a/stylecop.json b/stylecop.json new file mode 100644 index 000000000..12da548d2 --- /dev/null +++ b/stylecop.json @@ -0,0 +1,27 @@ +{ + "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", + "settings": { + "orderingRules": { + "elementOrder": [ + "kind", + "constant", + "static", + "readonly" + ], + "usingDirectivesPlacement": "outsideNamespace" + }, + "layoutRules": { + "newlineAtEndOfFile": "omit" + }, + "documentationRules": { + "companyName": "Squidex UG (haftungsbeschränkt)", + "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license.", + "variables": { + "licenseName": "MIT", + "licenseFile": "LICENSE" + }, + "headerDecoration": "==========================================================================", + "fileNamingConvention": "stylecop" + } + } +} \ No newline at end of file diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandMiddlewareTests.cs similarity index 100% rename from tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandHandlerTests.cs rename to tests/Squidex.Domain.Apps.Write.Tests/Apps/AppCommandMiddlewareTests.cs diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandMiddlewareTests.cs similarity index 100% rename from tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandHandlerTests.cs rename to tests/Squidex.Domain.Apps.Write.Tests/Assets/AssetCommandMiddlewareTests.cs diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandMiddlewareTests.cs similarity index 100% rename from tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandHandlerTests.cs rename to tests/Squidex.Domain.Apps.Write.Tests/Contents/ContentCommandMiddlewareTests.cs diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandMiddlewareTests.cs similarity index 100% rename from tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandHandlerTests.cs rename to tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaCommandMiddlewareTests.cs diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaDomainObjectTests.cs index 27a27f72d..d02095613 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/SchemaDomainObjectTests.cs @@ -102,7 +102,7 @@ namespace Squidex.Domain.Apps.Write.Schemas new CreateSchemaField { Name = "field2", Properties = new StringFieldProperties() } }; - sut.Create(CreateCommand(new CreateSchema { Name = SchemaName, Properties = properties, Fields = fields })); + sut.Create(CreateCommand(new CreateSchema { Name = SchemaName, Properties = properties, Fields = fields })); var @event = (SchemaCreated)sut.GetUncomittedEvents().Single().Payload; diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj b/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj index 79bbbc8e1..023665539 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj @@ -24,4 +24,7 @@ + + ..\..\Squidex.ruleset + diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs index 75eeadcd8..9c417969e 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookCommandMiddlewareTests.cs @@ -13,8 +13,8 @@ using FakeItEasy; using Squidex.Domain.Apps.Core.Webhooks; using Squidex.Domain.Apps.Read.Schemas; using Squidex.Domain.Apps.Read.Schemas.Services; -using Squidex.Domain.Apps.Write.Webhooks.Commands; using Squidex.Domain.Apps.Write.TestHelpers; +using Squidex.Domain.Apps.Write.Webhooks.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.CQRS.Commands; using Xunit; diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookDomainObjectTests.cs index 6bcc88e35..368d544ee 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Webhooks/WebhookDomainObjectTests.cs @@ -8,8 +8,8 @@ using System; using Squidex.Domain.Apps.Events.Webhooks; -using Squidex.Domain.Apps.Write.Webhooks.Commands; using Squidex.Domain.Apps.Write.TestHelpers; +using Squidex.Domain.Apps.Write.Webhooks.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.CQRS; using Xunit; diff --git a/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs b/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs index aa9ae45a0..1e2bef9d5 100644 --- a/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs +++ b/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs @@ -76,7 +76,8 @@ namespace Squidex.Infrastructure.UsageTracking [Fact] public async Task Should_fill_missing_days() { - DateTime dateFrom = DateTime.Today, dateTo = DateTime.Today.AddDays(7); + var dateFrom = DateTime.Today; + var dateTo = DateTime.Today.AddDays(7); IReadOnlyList originalData = new List {