default(T) => default

src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs

@@ -33,7 +33,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets
             return "States_Assets";
         }
 
-        protected override Task SetupCollectionAsync(IMongoCollection<MongoAssetEntity> collection, CancellationToken ct = default(CancellationToken))
+        protected override Task SetupCollectionAsync(IMongoCollection<MongoAssetEntity> collection, CancellationToken ct = default)
         {
             return collection.Indexes.CreateOneAsync(
                 new CreateIndexModel<MongoAssetEntity>(

src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs

@@ -37,7 +37,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents
             Serializer = serializer;
         }
 
-        protected override async Task SetupCollectionAsync(IMongoCollection<MongoContentEntity> collection, CancellationToken ct = default(CancellationToken))
+        protected override async Task SetupCollectionAsync(IMongoCollection<MongoContentEntity> collection, CancellationToken ct = default)
         {
             await collection.Indexes.CreateOneAsync(
                 new CreateIndexModel<MongoContentEntity>(Index.Ascending(x => x.ReferencedIds)), cancellationToken: ct);

src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs

@@ -34,7 +34,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents
         {
         }
 
-        protected override async Task SetupCollectionAsync(IMongoCollection<MongoContentEntity> collection, CancellationToken ct = default(CancellationToken))
+        protected override async Task SetupCollectionAsync(IMongoCollection<MongoContentEntity> collection, CancellationToken ct = default)
         {
             await collection.Indexes.CreateManyAsync(
                 new[]

src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs

@@ -25,7 +25,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents
         {
         }
 
-        protected override async Task SetupCollectionAsync(IMongoCollection<MongoContentEntity> collection, CancellationToken ct = default(CancellationToken))
+        protected override async Task SetupCollectionAsync(IMongoCollection<MongoContentEntity> collection, CancellationToken ct = default)
         {
             await collection.Indexes.CreateManyAsync(
                 new[]

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

@@ -46,7 +46,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents
             this.database = database;
         }
 
-        public Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public Task InitializeAsync(CancellationToken ct = default)
         {
             return Task.WhenAll(contentsDraft.InitializeAsync(ct), contentsPublished.InitializeAsync(ct));
         }

src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs

@@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.History
             return "Projections_History";
         }
 
-        protected override Task SetupCollectionAsync(IMongoCollection<HistoryEvent> collection, CancellationToken ct = default(CancellationToken))
+        protected override Task SetupCollectionAsync(IMongoCollection<HistoryEvent> collection, CancellationToken ct = default)
         {
             return collection.Indexes.CreateManyAsync(
                 new[]

src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs

@@ -32,7 +32,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Rules
             return "RuleEvents";
         }
 
-        protected override async Task SetupCollectionAsync(IMongoCollection<MongoRuleEventEntity> collection, CancellationToken ct = default(CancellationToken))
+        protected override async Task SetupCollectionAsync(IMongoCollection<MongoRuleEventEntity> collection, CancellationToken ct = default)
         {
             await collection.Indexes.CreateManyAsync(
                 new[]
@@ -43,7 +43,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Rules
                 }, ct);
         }
 
-        public Task QueryPendingAsync(Instant now, Func<IRuleEventEntity, Task> callback, CancellationToken ct = default(CancellationToken))
+        public Task QueryPendingAsync(Instant now, Func<IRuleEventEntity, Task> callback, CancellationToken ct = default)
         {
             return Collection.Find(x => x.NextAttempt < now).ForEachAsync(callback, ct);
         }

src/Squidex.Domain.Apps.Entities/Apps/Diagnostics/OrleansAppsHealthCheck.cs

@@ -26,7 +26,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Diagnostics
             index = grainFactory.GetGrain<IAppsByNameIndex>(SingleGrain.Id);
         }
 
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
         {
             await index.CountAsync();
 

src/Squidex.Domain.Apps.Entities/Rules/Repositories/IRuleEventRepository.cs

@@ -25,7 +25,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Repositories
 
         Task MarkSentAsync(Guid jobId, string dump, RuleResult result, RuleJobResult jobResult, TimeSpan elapsed, Instant? nextCall);
 
-        Task QueryPendingAsync(Instant now, Func<IRuleEventEntity, Task> callback, CancellationToken ct = default(CancellationToken));
+        Task QueryPendingAsync(Instant now, Func<IRuleEventEntity, Task> callback, CancellationToken ct = default);
 
         Task<int> CountByAppAsync(Guid appId);
 

src/Squidex.Domain.Users.MongoDb/Infrastructure/MongoPersistedGrantStore.cs

@@ -40,7 +40,7 @@ namespace Squidex.Domain.Users.MongoDb.Infrastructure
             return "Identity_PersistedGrants";
         }
 
-        protected override Task SetupCollectionAsync(IMongoCollection<PersistedGrant> collection, CancellationToken ct = default(CancellationToken))
+        protected override Task SetupCollectionAsync(IMongoCollection<PersistedGrant> collection, CancellationToken ct = default)
         {
             return collection.Indexes.CreateManyAsync(
                 new[]

src/Squidex.Domain.Users.MongoDb/MongoRoleStore.cs

@@ -40,7 +40,7 @@ namespace Squidex.Domain.Users.MongoDb
             return "Identity_Roles";
         }
 
-        protected override Task SetupCollectionAsync(IMongoCollection<IdentityRole> collection, CancellationToken ct = default(CancellationToken))
+        protected override Task SetupCollectionAsync(IMongoCollection<IdentityRole> collection, CancellationToken ct = default)
         {
             return collection.Indexes.CreateOneAsync(
                 new CreateIndexModel<IdentityRole>(Index.Ascending(x => x.NormalizedName), new CreateIndexOptions { Unique = true }), cancellationToken: ct);

src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs

@@ -114,7 +114,7 @@ namespace Squidex.Domain.Users.MongoDb
             return "Identity_Users";
         }
 
-        protected override Task SetupCollectionAsync(IMongoCollection<MongoUser> collection, CancellationToken ct = default(CancellationToken))
+        protected override Task SetupCollectionAsync(IMongoCollection<MongoUser> collection, CancellationToken ct = default)
         {
             return collection.Indexes.CreateManyAsync(
                 new[]

src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs

@@ -29,7 +29,7 @@ namespace Squidex.Infrastructure.Assets
             this.containerName = containerName;
         }
 
-        public async Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public async Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {
@@ -61,7 +61,7 @@ namespace Squidex.Infrastructure.Assets
             return null;
         }
 
-        public async Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default(CancellationToken))
+        public async Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default)
         {
             var targetName = GetObjectName(id, version, suffix);
             var targetBlob = blobContainer.GetBlobReference(targetName);
@@ -95,7 +95,7 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             var sourceName = GetObjectName(id, version, suffix);
             var sourceBlob = blobContainer.GetBlockBlobReference(sourceName);
@@ -110,12 +110,12 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             return UploadCoreAsync(GetObjectName(id, version, suffix), stream, ct);
         }
 
-        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default)
         {
             return UploadCoreAsync(fileName, stream, ct);
         }
@@ -137,7 +137,7 @@ namespace Squidex.Infrastructure.Assets
             return blob.DeleteIfExistsAsync();
         }
 
-        private async Task UploadCoreAsync(string blobName, Stream stream, CancellationToken ct = default(CancellationToken))
+        private async Task UploadCoreAsync(string blobName, Stream stream, CancellationToken ct = default)
         {
             try
             {

src/Squidex.Infrastructure.GetEventStore/Diagnostics/GetEventStoreHealthCheck.cs

@@ -23,7 +23,7 @@ namespace Squidex.Infrastructure.Diagnostics
             this.connection = connection;
         }
 
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
         {
             await connection.ReadEventAsync("test", 1, false);
 

src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs

@@ -38,7 +38,7 @@ namespace Squidex.Infrastructure.EventSourcing
             projectionClient = new ProjectionClient(connection, prefix, projectionHost);
         }
 
-        public async Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public async Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {
@@ -62,7 +62,7 @@ namespace Squidex.Infrastructure.EventSourcing
             return projectionClient.CreateProjectionAsync(property, string.Empty);
         }
 
-        public async Task QueryAsync(Func<StoredEvent, Task> callback, string property, object value, string position = null, CancellationToken ct = default(CancellationToken))
+        public async Task QueryAsync(Func<StoredEvent, Task> callback, string property, object value, string position = null, CancellationToken ct = default)
         {
             using (Profiler.TraceMethod<GetEventStore>())
             {
@@ -74,7 +74,7 @@ namespace Squidex.Infrastructure.EventSourcing
             }
         }
 
-        public async Task QueryAsync(Func<StoredEvent, Task> callback, string streamFilter = null, string position = null, CancellationToken ct = default(CancellationToken))
+        public async Task QueryAsync(Func<StoredEvent, Task> callback, string streamFilter = null, string position = null, CancellationToken ct = default)
         {
             using (Profiler.TraceMethod<GetEventStore>())
             {
@@ -86,7 +86,7 @@ namespace Squidex.Infrastructure.EventSourcing
             }
         }
 
-        private async Task QueryAsync(Func<StoredEvent, Task> callback, string streamName, long sliceStart, CancellationToken ct = default(CancellationToken))
+        private async Task QueryAsync(Func<StoredEvent, Task> callback, string streamName, long sliceStart, CancellationToken ct = default)
         {
             StreamEventsSlice currentSlice;
             do

src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs

@@ -104,7 +104,7 @@ namespace Squidex.Infrastructure.EventSourcing
             }
         }
 
-        public async Task ConnectAsync(CancellationToken ct = default(CancellationToken))
+        public async Task ConnectAsync(CancellationToken ct = default)
         {
             var addressParts = projectionHost.Split(':');
 

src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs

@@ -30,7 +30,7 @@ namespace Squidex.Infrastructure.Assets
             this.bucketName = bucketName;
         }
 
-        public async Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public async Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {
@@ -49,7 +49,7 @@ namespace Squidex.Infrastructure.Assets
             return null;
         }
 
-        public async Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default(CancellationToken))
+        public async Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default)
         {
             var objectName = GetObjectName(id, version, suffix);
 
@@ -67,7 +67,7 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             var objectName = GetObjectName(id, version, suffix);
 
@@ -81,12 +81,12 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             return UploadCoreAsync(GetObjectName(id, version, suffix), stream, ct);
         }
 
-        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default)
         {
             return UploadCoreAsync(fileName, stream, ct);
         }
@@ -101,7 +101,7 @@ namespace Squidex.Infrastructure.Assets
             return DeleteCoreAsync(fileName);
         }
 
-        private async Task UploadCoreAsync(string objectName, Stream stream, CancellationToken ct = default(CancellationToken))
+        private async Task UploadCoreAsync(string objectName, Stream stream, CancellationToken ct = default)
         {
             try
             {

src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs

@@ -27,7 +27,7 @@ namespace Squidex.Infrastructure.Assets
             this.bucket = bucket;
         }
 
-        public async Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public async Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {
@@ -44,7 +44,7 @@ namespace Squidex.Infrastructure.Assets
             return null;
         }
 
-        public async Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default(CancellationToken))
+        public async Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default)
         {
             try
             {
@@ -61,7 +61,7 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             try
             {
@@ -78,12 +78,12 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             return UploadFileCoreAsync(GetFileName(id, version, suffix), stream, ct);
         }
 
-        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default)
         {
             return UploadFileCoreAsync(fileName, stream, ct);
         }
@@ -110,7 +110,7 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        private async Task UploadFileCoreAsync(string id, Stream stream, CancellationToken ct = default(CancellationToken))
+        private async Task UploadFileCoreAsync(string id, Stream stream, CancellationToken ct = default)
         {
             try
             {

src/Squidex.Infrastructure.MongoDb/Diagnostics/MongoDBHealthCheck.cs

@@ -23,7 +23,7 @@ namespace Squidex.Infrastructure.Diagnostics
             this.mongoDatabase = mongoDatabase;
         }
 
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
         {
             var collectionNames = await mongoDatabase.ListCollectionNamesAsync(cancellationToken: cancellationToken);
 

src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs

@@ -44,7 +44,7 @@ namespace Squidex.Infrastructure.EventSourcing
             return new MongoCollectionSettings { ReadPreference = ReadPreference.Primary, WriteConcern = WriteConcern.WMajority };
         }
 
-        protected override Task SetupCollectionAsync(IMongoCollection<MongoEventCommit> collection, CancellationToken ct = default(CancellationToken))
+        protected override Task SetupCollectionAsync(IMongoCollection<MongoEventCommit> collection, CancellationToken ct = default)
         {
             return collection.Indexes.CreateManyAsync(
                 new[]

src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs

@@ -69,7 +69,7 @@ namespace Squidex.Infrastructure.EventSourcing
             }
         }
 
-        public Task QueryAsync(Func<StoredEvent, Task> callback, string property, object value, string position = null, CancellationToken ct = default(CancellationToken))
+        public Task QueryAsync(Func<StoredEvent, Task> callback, string property, object value, string position = null, CancellationToken ct = default)
         {
             Guard.NotNull(callback, nameof(callback));
 
@@ -80,7 +80,7 @@ namespace Squidex.Infrastructure.EventSourcing
             return QueryAsync(callback, lastPosition, filter, ct);
         }
 
-        public Task QueryAsync(Func<StoredEvent, Task> callback, string streamFilter = null, string position = null, CancellationToken ct = default(CancellationToken))
+        public Task QueryAsync(Func<StoredEvent, Task> callback, string streamFilter = null, string position = null, CancellationToken ct = default)
         {
             Guard.NotNull(callback, nameof(callback));
 
@@ -91,7 +91,7 @@ namespace Squidex.Infrastructure.EventSourcing
             return QueryAsync(callback, lastPosition, filter, ct);
         }
 
-        private async Task QueryAsync(Func<StoredEvent, Task> callback, StreamPosition lastPosition, FilterDefinition<MongoEventCommit> filter, CancellationToken ct = default(CancellationToken))
+        private async Task QueryAsync(Func<StoredEvent, Task> callback, StreamPosition lastPosition, FilterDefinition<MongoEventCommit> filter, CancellationToken ct = default)
         {
             using (Profiler.TraceMethod<MongoEventStore>())
             {

src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs

@@ -149,14 +149,14 @@ namespace Squidex.Infrastructure.MongoDb
             }
         }
 
-        public static async Task ForEachPipelineAsync<TDocument>(this IAsyncCursorSource<TDocument> source, Func<TDocument, Task> processor, CancellationToken cancellationToken = default(CancellationToken))
+        public static async Task ForEachPipelineAsync<TDocument>(this IAsyncCursorSource<TDocument> source, Func<TDocument, Task> processor, CancellationToken cancellationToken = default)
         {
             var cursor = await source.ToCursorAsync(cancellationToken);
 
             await cursor.ForEachPipelineAsync(processor, cancellationToken);
         }
 
-        public static async Task ForEachPipelineAsync<TDocument>(this IAsyncCursor<TDocument> source, Func<TDocument, Task> processor, CancellationToken cancellationToken = default(CancellationToken))
+        public static async Task ForEachPipelineAsync<TDocument>(this IAsyncCursor<TDocument> source, Func<TDocument, Task> processor, CancellationToken cancellationToken = default)
         {
             using (var selfToken = new CancellationTokenSource())
             {

src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs

@@ -73,7 +73,7 @@ namespace Squidex.Infrastructure.MongoDb
                     CollectionSettings() ?? new MongoCollectionSettings()));
         }
 
-        protected virtual Task SetupCollectionAsync(IMongoCollection<TEntity> collection, CancellationToken ct = default(CancellationToken))
+        protected virtual Task SetupCollectionAsync(IMongoCollection<TEntity> collection, CancellationToken ct = default)
         {
             return TaskHelper.Done;
         }
@@ -85,7 +85,7 @@ namespace Squidex.Infrastructure.MongoDb
             await SetupCollectionAsync(Collection);
         }
 
-        public async Task<bool> DropCollectionIfExistsAsync(CancellationToken ct = default(CancellationToken))
+        public async Task<bool> DropCollectionIfExistsAsync(CancellationToken ct = default)
         {
             try
             {
@@ -103,7 +103,7 @@ namespace Squidex.Infrastructure.MongoDb
             }
         }
 
-        public async Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public async Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {

src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageRepository.cs

@@ -29,7 +29,7 @@ namespace Squidex.Infrastructure.UsageTracking
             return "UsagesV2";
         }
 
-        protected override Task SetupCollectionAsync(IMongoCollection<MongoUsage> collection, CancellationToken ct = default(CancellationToken))
+        protected override Task SetupCollectionAsync(IMongoCollection<MongoUsage> collection, CancellationToken ct = default)
         {
             return collection.Indexes.CreateOneAsync(
                 new CreateIndexModel<MongoUsage>(Index.Ascending(x => x.Key).Ascending(x => x.Category).Ascending(x => x.Date)), cancellationToken: ct);

src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs

@@ -62,7 +62,7 @@ namespace Squidex.Infrastructure.CQRS.Events
             }
         }
 
-        public Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {

src/Squidex.Infrastructure.Redis/RedisPubSub.cs

@@ -38,7 +38,7 @@ namespace Squidex.Infrastructure
             this.serializer = serializer;
         }
 
-        public Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {

src/Squidex.Infrastructure/Assets/FolderAssetStore.cs

@@ -31,7 +31,7 @@ namespace Squidex.Infrastructure.Assets
             directory = new DirectoryInfo(path);
         }
 
-        public Task InitializeAsync(CancellationToken ct = default(CancellationToken))
+        public Task InitializeAsync(CancellationToken ct = default)
         {
             try
             {
@@ -57,7 +57,7 @@ namespace Squidex.Infrastructure.Assets
             return null;
         }
 
-        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             var file = GetFile(id, version, suffix);
 
@@ -74,7 +74,7 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default(CancellationToken))
+        public Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default)
         {
             var targetFile = GetFile(id, version, suffix);
 
@@ -96,12 +96,12 @@ namespace Squidex.Infrastructure.Assets
             }
         }
 
-        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default)
         {
             return UploadCoreAsync(GetFile(id, version, suffix), stream, ct);
         }
 
-        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default(CancellationToken))
+        public Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default)
         {
             return UploadCoreAsync(GetFile(fileName), stream, ct);
         }
@@ -123,7 +123,7 @@ namespace Squidex.Infrastructure.Assets
             return TaskHelper.Done;
         }
 
-        private static async Task UploadCoreAsync(FileInfo file, Stream stream, CancellationToken ct = default(CancellationToken))
+        private static async Task UploadCoreAsync(FileInfo file, Stream stream, CancellationToken ct = default)
         {
             try
             {

src/Squidex.Infrastructure/Assets/IAssetStore.cs

@@ -15,13 +15,13 @@ namespace Squidex.Infrastructure.Assets
     {
         string GeneratePublicUrl(string id, long version, string suffix);
 
-        Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default(CancellationToken));
+        Task CopyAsync(string sourceFileName, string id, long version, string suffix, CancellationToken ct = default);
 
-        Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken));
+        Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default);
 
-        Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default(CancellationToken));
+        Task UploadAsync(string fileName, Stream stream, CancellationToken ct = default);
 
-        Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken));
+        Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default);
 
         Task DeleteAsync(string fileName);
 

src/Squidex.Infrastructure/CollectionExtensions.cs

@@ -133,12 +133,12 @@ namespace Squidex.Infrastructure
 
         public static TValue GetOrDefault<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> dictionary, TKey key)
         {
-            return dictionary.GetOrCreate(key, _ => default(TValue));
+            return dictionary.GetOrCreate(key, _ => default);
         }
 
         public static TValue GetOrAddDefault<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
         {
-            return dictionary.GetOrAdd(key, _ => default(TValue));
+            return dictionary.GetOrAdd(key, _ => default);
         }
 
         public static TValue GetOrNew<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> dictionary, TKey key) where TValue : class, new()

src/Squidex.Infrastructure/Collections/ArrayDictionary{TKey,TValue}.cs

@@ -141,7 +141,7 @@ namespace Squidex.Infrastructure.Collections
                 }
             }
 
-            value = default(TValue);
+            value = default;
             return false;
         }
 

src/Squidex.Infrastructure/Commands/LogSnapshotDomainObjectGrain.cs

@@ -51,7 +51,7 @@ namespace Squidex.Infrastructure.Commands
                 return snapshots[(int)version + 1];
             }
 
-            return default(T);
+            return default;
         }
 
         protected sealed override void ApplyEvent(Envelope<IEvent> @event)

src/Squidex.Infrastructure/Diagnostics/GCHealthCheck.cs

@@ -25,7 +25,7 @@ namespace Squidex.Infrastructure.Diagnostics
             threshold = 1024 * 1024 * options.Value.Threshold;
         }
 
-        public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
         {
             var allocated = GC.GetTotalMemory(false);
 

src/Squidex.Infrastructure/Diagnostics/OrleansHealthCheck.cs

@@ -24,7 +24,7 @@ namespace Squidex.Infrastructure.Diagnostics
             managementGrain = grainFactory.GetGrain<IManagementGrain>(0);
         }
 
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
         {
             var activationCount = await managementGrain.GetTotalActivationCount();
 

src/Squidex.Infrastructure/Dispatching/FuncContextDispatcher.cs

@@ -48,7 +48,7 @@ namespace Squidex.Infrastructure.Dispatching
                     })
                     .ToDictionary(m => m.Item1, h => (FuncContextDelegate<TIn>)h.Item2);
 
-            return (target, input, context) => handlers.TryGetValue(input.GetType(), out var handler) ? handler(target, input, context) : default(TOut);
+            return (target, input, context) => handlers.TryGetValue(input.GetType(), out var handler) ? handler(target, input, context) : default;
         }
 
         private static FuncContextDelegate<TIn> Factory<T>(MethodInfo methodInfo) where T : TIn

src/Squidex.Infrastructure/Dispatching/FuncDispatcher.cs

@@ -48,7 +48,7 @@ namespace Squidex.Infrastructure.Dispatching
                     })
                     .ToDictionary(m => m.Item1, h => (FuncDelegate<TIn>)h.Item2);
 
-            return (target, input) => handlers.TryGetValue(input.GetType(), out var handler) ? handler(target, input) : default(TOut);
+            return (target, input) => handlers.TryGetValue(input.GetType(), out var handler) ? handler(target, input) : default;
         }
 
         private static FuncDelegate<TIn> Factory<T>(MethodInfo methodInfo) where T : TIn

src/Squidex.Infrastructure/EventSourcing/EnvelopeExtensions.cs

@@ -114,20 +114,20 @@ namespace Squidex.Infrastructure.EventSourcing
                 }
             }
 
-            return default(Guid);
+            return default;
         }
 
         public static Instant GetInstant(this JsonObject obj, string key)
         {
             if (obj.TryGetValue(key, out var v))
             {
-                if (v.Type == JsonValueType.String && InstantPattern.General.Parse(v.ToString()).TryGetValue(default(Instant), out var instant))
+                if (v.Type == JsonValueType.String && InstantPattern.General.Parse(v.ToString()).TryGetValue(default, out var instant))
                 {
                     return instant;
                 }
             }
 
-            return default(Instant);
+            return default;
         }
 
         public static string GetString(this JsonObject obj, string key)

src/Squidex.Infrastructure/EventSourcing/IEventStore.cs

@@ -18,9 +18,9 @@ namespace Squidex.Infrastructure.EventSourcing
 
         Task<IReadOnlyList<StoredEvent>> QueryAsync(string streamName, long streamPosition = 0);
 
-        Task QueryAsync(Func<StoredEvent, Task> callback, string streamFilter = null, string position = null, CancellationToken ct = default(CancellationToken));
+        Task QueryAsync(Func<StoredEvent, Task> callback, string streamFilter = null, string position = null, CancellationToken ct = default);
 
-        Task QueryAsync(Func<StoredEvent, Task> callback, string property, object value, string position = null, CancellationToken ct = default(CancellationToken));
+        Task QueryAsync(Func<StoredEvent, Task> callback, string property, object value, string position = null, CancellationToken ct = default);
 
         Task AppendAsync(Guid commitId, string streamName, ICollection<EventData> events);
 

src/Squidex.Infrastructure/IInitializable.cs

@@ -12,6 +12,6 @@ namespace Squidex.Infrastructure
 {
     public interface IInitializable
     {
-        Task InitializeAsync(CancellationToken ct = default(CancellationToken));
+        Task InitializeAsync(CancellationToken ct = default);
     }
 }

src/Squidex.Infrastructure/Tasks/AsyncLocalCleaner.cs

@@ -23,7 +23,7 @@ namespace Squidex.Infrastructure.Tasks
 
         public void Dispose()
         {
-            asyncLocal.Value = default(T);
+            asyncLocal.Value = default;
         }
     }
 }

src/Squidex.Infrastructure/Tasks/TaskExtensions.cs

@@ -40,7 +40,7 @@ namespace Squidex.Infrastructure.Tasks
             {
                 action(x);
 
-                return default(TOutput);
+                return default;
             };
         }
 
@@ -52,7 +52,7 @@ namespace Squidex.Infrastructure.Tasks
             {
                 await action(x);
 
-                return default(TOutput);
+                return default;
             };
         }
 

src/Squidex/Config/ServiceExtensions.cs

@@ -89,7 +89,7 @@ namespace Squidex.Config
             }
         }
 
-        public static T GetOptionalValue<T>(this IConfiguration config, string path, T defaultValue = default(T))
+        public static T GetOptionalValue<T>(this IConfiguration config, string path, T defaultValue = default)
         {
             var value = config.GetValue(path, defaultValue);
 

tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/FieldRegistryTests.cs

@@ -20,12 +20,12 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas
         {
             public override T Accept<T>(IFieldPropertiesVisitor<T> visitor)
             {
-                return default(T);
+                return default;
             }
 
             public override T Accept<T>(IFieldVisitor<T> visitor, IField field)
             {
-                return default(T);
+                return default;
             }
 
             public override RootField CreateRootField(long id, string name, Partitioning partitioning, IFieldSettings settings = null)

tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs

@@ -60,7 +60,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules
         {
             public override T Accept<T>(IRuleTriggerVisitor<T> visitor)
             {
-                return default(T);
+                return default;
             }
         }
 

tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerManagerGrainTests.cs

@@ -69,7 +69,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains
         [Fact]
         public async Task Should_activate_all_grains_on_reminder()
         {
-            await sut.ReceiveReminder(null, default(TickStatus));
+            await sut.ReceiveReminder(null, default);
 
             A.CallTo(() => grainA.ActivateAsync())
                 .MustHaveHappened();

tests/Squidex.Infrastructure.Tests/MongoDb/MongoExtensionsTests.cs

@@ -54,14 +54,14 @@ namespace Squidex.Infrastructure.MongoDb
             {
             }
 
-            public bool MoveNext(CancellationToken cancellationToken = default(CancellationToken))
+            public bool MoveNext(CancellationToken cancellationToken = default)
             {
                 index++;
 
                 return index < items.Count;
             }
 
-            public async Task<bool> MoveNextAsync(CancellationToken cancellationToken = default(CancellationToken))
+            public async Task<bool> MoveNextAsync(CancellationToken cancellationToken = default)
             {
                 await Task.Delay(1, cancellationToken);