feat: better async backported (#951)

AndrewTriesToCode · web-flow · commit a20440366679 · 2025-03-17T22:02:06.000-06:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,10 +8,9 @@
         <PackageProjectUrl>https://www.finbuckle.com/MultiTenant</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Finbuckle/Finbuckle.MultiTenant</RepositoryUrl>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <PackageTags>finbuckle;multitenant;multitenancy;aspnet;aspnetcore;entityframework;entityframework-core;efcore</PackageTags>
+        <PackageTags>finbuckle;multitenant;multitenancy;aspnet;aspnetcore;entityframeworkcore;efcore</PackageTags>
         <PackageIcon>finbuckle-128x128.png</PackageIcon>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>CS1591</NoWarn>
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Extensions/MultiTenantBuilderExtensions.cs b/src/Finbuckle.MultiTenant.AspNetCore/Extensions/MultiTenantBuilderExtensions.cs
@@ -91,7 +91,7 @@ public static MultiTenantBuilder<TTenantInfo> WithPerTenantAuthenticationConvent
                 if (!string.Equals(currentTenant, authTenant, StringComparison.OrdinalIgnoreCase))
                     context.RejectPrincipal();
 
-                await origOnValidatePrincipal(context);
+                await origOnValidatePrincipal(context).ConfigureAwait(false);
             };
         });
 
@@ -347,7 +347,7 @@ private static void BypassSessionPrincipalValidation<TTenantInfo>(
                         $"{Constants.TenantToken}__bypass_validate_principal__"))
                     return;
 
-                await origOnValidatePrincipal(context);
+                await origOnValidatePrincipal(context).ConfigureAwait(false);
             };
         });
     }
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj.DotSettings b/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj.DotSettings
@@ -0,0 +1,2 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Daemon/ConfigureAwaitAnalysisMode/@EntryValue">Library</s:String></wpf:ResourceDictionary>
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Internal/MultiTenantAuthenticationSchemeProvider.cs b/src/Finbuckle.MultiTenant.AspNetCore/Internal/MultiTenantAuthenticationSchemeProvider.cs
@@ -133,7 +133,7 @@ public MultiTenantAuthenticationSchemeProvider(IAuthenticationSchemeProvider inn
 
         if (_inner != null)
         {
-            scheme = await _inner.GetSchemeAsync(name);
+            scheme = await _inner.GetSchemeAsync(name).ConfigureAwait(false);
         }
 
         if (scheme == null)
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Internal/MultiTenantAuthenticationService.cs b/src/Finbuckle.MultiTenant.AspNetCore/Internal/MultiTenantAuthenticationService.cs
@@ -49,24 +49,24 @@ public async Task ChallengeAsync(HttpContext context, string? scheme, Authentica
         }
 
         AddTenantIdentifierToProperties(context, ref properties);
-        await _inner.ChallengeAsync(context, scheme, properties);
+        await _inner.ChallengeAsync(context, scheme, properties).ConfigureAwait(false);
     }
 
     public async Task ForbidAsync(HttpContext context, string? scheme, AuthenticationProperties? properties)
     {
         AddTenantIdentifierToProperties(context, ref properties);
-        await _inner.ForbidAsync(context, scheme, properties);
+        await _inner.ForbidAsync(context, scheme, properties).ConfigureAwait(false);
     }
 
     public async Task SignInAsync(HttpContext context, string? scheme, ClaimsPrincipal principal, AuthenticationProperties? properties)
     {
         AddTenantIdentifierToProperties(context, ref properties);
-        await _inner.SignInAsync(context, scheme, principal, properties);
+        await _inner.SignInAsync(context, scheme, principal, properties).ConfigureAwait(false);
     }
 
     public async Task SignOutAsync(HttpContext context, string? scheme, AuthenticationProperties? properties)
     {
         AddTenantIdentifierToProperties(context, ref properties);
-        await _inner.SignOutAsync(context, scheme, properties);
+        await _inner.SignOutAsync(context, scheme, properties).ConfigureAwait(false);
     }
 }
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Internal/MultiTenantMiddleware.cs b/src/Finbuckle.MultiTenant.AspNetCore/Internal/MultiTenantMiddleware.cs
@@ -27,10 +27,10 @@ public async Task Invoke(HttpContext context)
             
             var resolver = context.RequestServices.GetRequiredService<ITenantResolver>();
             
-            var multiTenantContext = await resolver.ResolveAsync(context);
+            var multiTenantContext = await resolver.ResolveAsync(context).ConfigureAwait(false);
             mtcSetter.MultiTenantContext = multiTenantContext;
             context.Items[typeof(IMultiTenantContext)] = multiTenantContext;
 
-            await next(context);
+            await next(context).ConfigureAwait(false);
         }
 }
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Strategies/ClaimStrategy.cs b/src/Finbuckle.MultiTenant.AspNetCore/Strategies/ClaimStrategy.cs
@@ -43,12 +43,12 @@ public ClaimStrategy(string template, string? authenticationScheme)
         var schemeProvider = httpContext.RequestServices.GetRequiredService<IAuthenticationSchemeProvider>();
         if (_authenticationScheme is null)
         {
-            authScheme = await schemeProvider.GetDefaultAuthenticateSchemeAsync();
+            authScheme = await schemeProvider.GetDefaultAuthenticateSchemeAsync().ConfigureAwait(false);
         }
         else
         {
             authScheme =
-                (await schemeProvider.GetAllSchemesAsync()).FirstOrDefault(x => x.Name == _authenticationScheme);
+                (await schemeProvider.GetAllSchemesAsync().ConfigureAwait(false)).FirstOrDefault(x => x.Name == _authenticationScheme);
         }
 
         if (authScheme is null)
@@ -59,9 +59,9 @@ public ClaimStrategy(string template, string? authenticationScheme)
         var handler =
             (IAuthenticationHandler)ActivatorUtilities.CreateInstance(httpContext.RequestServices,
                 authScheme.HandlerType);
-        await handler.InitializeAsync(authScheme, httpContext);
+        await handler.InitializeAsync(authScheme, httpContext).ConfigureAwait(false);
         httpContext.Items[$"{Constants.TenantToken}__bypass_validate_principal__"] = "true"; // Value doesn't matter.
-        var handlerResult = await handler.AuthenticateAsync();
+        var handlerResult = await handler.AuthenticateAsync().ConfigureAwait(false);
         httpContext.Items.Remove($"{Constants.TenantToken}__bypass_validate_principal__");
 
         var identifier = handlerResult.Principal?.FindFirst(_tenantKey)?.Value;
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RemoteAuthenticationCallbackStrategy.cs b/src/Finbuckle.MultiTenant.AspNetCore/Strategies/RemoteAuthenticationCallbackStrategy.cs
@@ -36,7 +36,7 @@ public RemoteAuthenticationCallbackStrategy(ILogger<RemoteAuthenticationCallback
 
         var schemes = httpContext.RequestServices.GetRequiredService<IAuthenticationSchemeProvider>();
 
-        foreach (var scheme in (await schemes.GetRequestHandlerSchemesAsync()).Where(s =>
+        foreach (var scheme in (await schemes.GetRequestHandlerSchemesAsync().ConfigureAwait(false)).Where(s =>
                      typeof(IAuthenticationRequestHandler).IsAssignableFrom(s.HandlerType)))
         {
             // TODO verify this comment (still true as of net8.0)
@@ -83,7 +83,7 @@ public RemoteAuthenticationCallbackStrategy(ILogger<RemoteAuthenticationCallback
                     {
                         var formOptions = new FormOptions { BufferBody = true, MemoryBufferThreshold = 1048576 };
 
-                        var form = await httpContext.Request.ReadFormAsync(formOptions);
+                        var form = await httpContext.Request.ReadFormAsync(formOptions).ConfigureAwait(false);
                         state = form.Single(i => string.Equals(i.Key, "state", StringComparison.OrdinalIgnoreCase))
                             .Value;
                     }
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj.DotSettings b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj.DotSettings
@@ -0,0 +1,2 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Daemon/ConfigureAwaitAnalysisMode/@EntryValue">Library</s:String></wpf:ResourceDictionary>
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantDbContext.cs b/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantDbContext.cs
@@ -69,6 +69,6 @@ public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess,
         CancellationToken cancellationToken = default(CancellationToken))
     {
         this.EnforceMultiTenant();
-        return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
+        return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken).ConfigureAwait(false);
     }
 }
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantIdentityDbContext.cs b/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantIdentityDbContext.cs
@@ -203,6 +203,6 @@ public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess,
         CancellationToken cancellationToken = default(CancellationToken))
     {
         this.EnforceMultiTenant();
-        return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
+        return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken).ConfigureAwait(false);
     }
 }
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Stores/EFCoreStore/EFCoreStore.cs b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Stores/EFCoreStore/EFCoreStore.cs
@@ -25,25 +25,25 @@ public EFCoreStore(TEFCoreStoreDbContext dbContext)
     {
             return await dbContext.TenantInfo.AsNoTracking()
                 .Where(ti => ti.Id == id)
-                .SingleOrDefaultAsync();
+                .SingleOrDefaultAsync().ConfigureAwait(false);
         }
 
     public virtual async Task<IEnumerable<TTenantInfo>> GetAllAsync()
     {
-            return await dbContext.TenantInfo.AsNoTracking().ToListAsync();
+            return await dbContext.TenantInfo.AsNoTracking().ToListAsync().ConfigureAwait(false);
         }
 
     public virtual async Task<TTenantInfo?> TryGetByIdentifierAsync(string identifier)
     {
             return await dbContext.TenantInfo.AsNoTracking()
                 .Where(ti => ti.Identifier == identifier)
-                .SingleOrDefaultAsync();
+                .SingleOrDefaultAsync().ConfigureAwait(false);
         }
 
     public virtual async Task<bool> TryAddAsync(TTenantInfo tenantInfo)
     {
-            await dbContext.TenantInfo.AddAsync(tenantInfo);
-            var result = await dbContext.SaveChangesAsync() > 0;
+            await dbContext.TenantInfo.AddAsync(tenantInfo).ConfigureAwait(false);
+            var result = await dbContext.SaveChangesAsync().ConfigureAwait(false) > 0;
             dbContext.Entry(tenantInfo).State = EntityState.Detached;
             
             return result;
@@ -53,21 +53,21 @@ public virtual async Task<bool> TryRemoveAsync(string identifier)
     {
             var existing = await dbContext.TenantInfo
                 .Where(ti => ti.Identifier == identifier)
-                .SingleOrDefaultAsync();
+                .SingleOrDefaultAsync().ConfigureAwait(false);
 
             if (existing is null)
             {
                 return false;
             }
 
             dbContext.TenantInfo.Remove(existing);
-            return await dbContext.SaveChangesAsync() > 0;
+            return await dbContext.SaveChangesAsync().ConfigureAwait(false) > 0;
         }
 
     public virtual async Task<bool> TryUpdateAsync(TTenantInfo tenantInfo)
     {
             dbContext.TenantInfo.Update(tenantInfo);
-            var result = await dbContext.SaveChangesAsync() > 0;
+            var result = await dbContext.SaveChangesAsync().ConfigureAwait(false) > 0;
             dbContext.Entry(tenantInfo).State = EntityState.Detached;
             return result;
         }
diff --git a/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj.DotSettings b/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj.DotSettings
@@ -0,0 +1,2 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Daemon/ConfigureAwaitAnalysisMode/@EntryValue">Library</s:String></wpf:ResourceDictionary>
diff --git a/src/Finbuckle.MultiTenant/Stores/ConfigurationStore/ConfigurationStore.cs b/src/Finbuckle.MultiTenant/Stores/ConfigurationStore/ConfigurationStore.cs
@@ -93,13 +93,13 @@ public Task<bool> TryAddAsync(TTenantInfo tenantInfo)
             throw new ArgumentNullException(nameof(id));
         }
 
-        return await Task.FromResult(tenantMap?.Where(kv => kv.Value.Id == id).SingleOrDefault().Value);
+        return await Task.FromResult(tenantMap?.Where(kv => kv.Value.Id == id).SingleOrDefault().Value).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<IEnumerable<TTenantInfo>> GetAllAsync()
     {
-        return await Task.FromResult(tenantMap?.Select(x => x.Value).ToList() ?? new List<TTenantInfo>());
+        return await Task.FromResult(tenantMap?.Select(x => x.Value).ToList() ?? new List<TTenantInfo>()).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
@@ -115,7 +115,7 @@ public async Task<IEnumerable<TTenantInfo>> GetAllAsync()
             return null;
         }
 
-        return await Task.FromResult(tenantMap.TryGetValue(identifier, out var result) ? result : null);
+        return await Task.FromResult(tenantMap.TryGetValue(identifier, out var result) ? result : null).ConfigureAwait(false);
     }
 
     /// <summary>
diff --git a/src/Finbuckle.MultiTenant/Stores/EchoStore/EchoStore.cs b/src/Finbuckle.MultiTenant/Stores/EchoStore/EchoStore.cs
@@ -18,13 +18,13 @@ namespace Finbuckle.MultiTenant.Stores.EchoStore;
     /// <inheritdoc />
     public async Task<TTenantInfo?> TryGetByIdentifierAsync(string identifier)
     {
-        return await Task.FromResult(new TTenantInfo { Id = identifier, Identifier = identifier });
+        return await Task.FromResult(new TTenantInfo { Id = identifier, Identifier = identifier }).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<TTenantInfo?> TryGetAsync(string id)
     {
-        return await Task.FromResult(new TTenantInfo { Id = id, Identifier = id });
+        return await Task.FromResult(new TTenantInfo { Id = id, Identifier = id }).ConfigureAwait(false);
     }
     
     /// <summary>
diff --git a/src/Finbuckle.MultiTenant/Stores/HttpRemoteStore/HttpRemoteStore.cs b/src/Finbuckle.MultiTenant/Stores/HttpRemoteStore/HttpRemoteStore.cs
@@ -72,13 +72,13 @@ public Task<bool> TryAddAsync(TTenantInfo tenantInfo)
     /// <exception cref="NotImplementedException">When a not-found (404) status code is encountered</exception>
     public async Task<IEnumerable<TTenantInfo>> GetAllAsync()
     {
-        return await _client.GetAllAsync(endpointTemplate);
+        return await _client.GetAllAsync(endpointTemplate).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<TTenantInfo?> TryGetByIdentifierAsync(string identifier)
     {
-        var result = await _client.TryGetByIdentifierAsync(endpointTemplate, identifier);
+        var result = await _client.TryGetByIdentifierAsync(endpointTemplate, identifier).ConfigureAwait(false);
         return result;
     }
 
diff --git a/src/Finbuckle.MultiTenant/Stores/HttpRemoteStore/HttpRemoteStoreClient.cs b/src/Finbuckle.MultiTenant/Stores/HttpRemoteStore/HttpRemoteStoreClient.cs
@@ -23,12 +23,12 @@ public HttpRemoteStoreClient(IHttpClientFactory clientFactory, JsonSerializerOpt
     {
         var client = clientFactory.CreateClient(typeof(HttpRemoteStoreClient<TTenantInfo>).FullName!);
         var uri = endpointTemplate.Replace(HttpRemoteStore<TTenantInfo>.DefaultEndpointTemplateIdentifierToken, identifier);
-        var response = await client.GetAsync(uri);
+        var response = await client.GetAsync(uri).ConfigureAwait(false);
 
         if (!response.IsSuccessStatusCode)
             return null;
 
-        var json = await response.Content.ReadAsStringAsync();
+        var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var result = JsonSerializer.Deserialize<TTenantInfo>(json, _defaultSerializerOptions);
 
         return result;
@@ -38,7 +38,7 @@ public async Task<IEnumerable<TTenantInfo>> GetAllAsync(string endpointTemplate)
     {
         var client = clientFactory.CreateClient(typeof(HttpRemoteStoreClient<TTenantInfo>).FullName!);
         var uri = endpointTemplate.Replace(HttpRemoteStore<TTenantInfo>.DefaultEndpointTemplateIdentifierToken, string.Empty);
-        var response = await client.GetAsync(uri);
+        var response = await client.GetAsync(uri).ConfigureAwait(false);
 
 
         if (!response.IsSuccessStatusCode)
@@ -52,7 +52,7 @@ public async Task<IEnumerable<TTenantInfo>> GetAllAsync(string endpointTemplate)
             return Enumerable.Empty<TTenantInfo>();
         }
 
-        var json = await response.Content.ReadAsStringAsync();
+        var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var result = JsonSerializer.Deserialize<IEnumerable<TTenantInfo>>(json, _defaultSerializerOptions);
 
         return result!;
diff --git a/src/Finbuckle.MultiTenant/Stores/InMemoryStore/InMemoryStore.cs b/src/Finbuckle.MultiTenant/Stores/InMemoryStore/InMemoryStore.cs
@@ -49,50 +49,50 @@ public InMemoryStore(IOptions<InMemoryStoreOptions<TTenantInfo>> options)
     public async Task<TTenantInfo?> TryGetAsync(string id)
     {
         var result = _tenantMap.Values.SingleOrDefault(ti => ti.Id == id);
-        return await Task.FromResult(result);
+        return await Task.FromResult(result).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<TTenantInfo?> TryGetByIdentifierAsync(string identifier)
     {
         _tenantMap.TryGetValue(identifier, out var result);
 
-        return await Task.FromResult(result);
+        return await Task.FromResult(result).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<IEnumerable<TTenantInfo>> GetAllAsync()
     {
-        return await Task.FromResult(_tenantMap.Select(x => x.Value).ToList());
+        return await Task.FromResult(_tenantMap.Select(x => x.Value).ToList()).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<bool> TryAddAsync(TTenantInfo tenantInfo)
     {
         var result = tenantInfo.Identifier != null && _tenantMap.TryAdd(tenantInfo.Identifier, tenantInfo);
 
-        return await Task.FromResult(result);
+        return await Task.FromResult(result).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<bool> TryRemoveAsync(string identifier)
     {
         var result = _tenantMap.TryRemove(identifier, out var _);
 
-        return await Task.FromResult(result);
+        return await Task.FromResult(result).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
     public async Task<bool> TryUpdateAsync(TTenantInfo tenantInfo)
     {
-        var existingTenantInfo = tenantInfo.Id != null ? await TryGetAsync(tenantInfo.Id) : null;
+        var existingTenantInfo = tenantInfo.Id != null ? await TryGetAsync(tenantInfo.Id).ConfigureAwait(false) : null;
 
         if (existingTenantInfo?.Identifier != null)
         {
             var result =  _tenantMap.TryUpdate(existingTenantInfo.Identifier, tenantInfo, existingTenantInfo);
-            return await Task.FromResult(result);
+            return await Task.FromResult(result).ConfigureAwait(false);
         }
 
-        return await Task.FromResult(false);
+        return await Task.FromResult(false).ConfigureAwait(false);
     }
 }
diff --git a/src/Finbuckle.MultiTenant/Stores/MultiTenantStoreWrapper.cs b/src/Finbuckle.MultiTenant/Stores/MultiTenantStoreWrapper.cs
diff --git a/src/Finbuckle.MultiTenant/Strategies/DelegateStrategy.cs b/src/Finbuckle.MultiTenant/Strategies/DelegateStrategy.cs
diff --git a/src/Finbuckle.MultiTenant/Strategies/MultiTenantStrategyWrapper.cs b/src/Finbuckle.MultiTenant/Strategies/MultiTenantStrategyWrapper.cs
diff --git a/src/Finbuckle.MultiTenant/Strategies/StaticStrategy.cs b/src/Finbuckle.MultiTenant/Strategies/StaticStrategy.cs
diff --git a/src/Finbuckle.MultiTenant/TenantResolver.cs b/src/Finbuckle.MultiTenant/TenantResolver.cs
diff --git a/test/Finbuckle.MultiTenant.Test/Stores/DistributedCacheStoreShould.cs b/test/Finbuckle.MultiTenant.Test/Stores/DistributedCacheStoreShould.cs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">`
	`2`	`+ <s:String x:Key="/Default/CodeInspection/Daemon/ConfigureAwaitAnalysisMode/@EntryValue">Library</s:String></wpf:ResourceDictionary>`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public MultiTenantAuthenticationSchemeProvider(IAuthenticationSchemeProvider inn`
`133`	`133`
`134`	`134`	`if (_inner != null)`
`135`	`135`	`{`
`136`		`- scheme = await _inner.GetSchemeAsync(name);`
	`136`	`+ scheme = await _inner.GetSchemeAsync(name).ConfigureAwait(false);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`if (scheme == null)`
Original file line number	Diff line number	Diff line change
`@@ -49,24 +49,24 @@ public async Task ChallengeAsync(HttpContext context, string? scheme, Authentica`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`AddTenantIdentifierToProperties(context, ref properties);`
`52`		`- await _inner.ChallengeAsync(context, scheme, properties);`
	`52`	`+ await _inner.ChallengeAsync(context, scheme, properties).ConfigureAwait(false);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public async Task ForbidAsync(HttpContext context, string? scheme, AuthenticationProperties? properties)`
`56`	`56`	`{`
`57`	`57`	`AddTenantIdentifierToProperties(context, ref properties);`
`58`		`- await _inner.ForbidAsync(context, scheme, properties);`
	`58`	`+ await _inner.ForbidAsync(context, scheme, properties).ConfigureAwait(false);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public async Task SignInAsync(HttpContext context, string? scheme, ClaimsPrincipal principal, AuthenticationProperties? properties)`
`62`	`62`	`{`
`63`	`63`	`AddTenantIdentifierToProperties(context, ref properties);`
`64`		`- await _inner.SignInAsync(context, scheme, principal, properties);`
	`64`	`+ await _inner.SignInAsync(context, scheme, principal, properties).ConfigureAwait(false);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public async Task SignOutAsync(HttpContext context, string? scheme, AuthenticationProperties? properties)`
`68`	`68`	`{`
`69`	`69`	`AddTenantIdentifierToProperties(context, ref properties);`
`70`		`- await _inner.SignOutAsync(context, scheme, properties);`
	`70`	`+ await _inner.SignOutAsync(context, scheme, properties).ConfigureAwait(false);`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ public async Task Invoke(HttpContext context)`
`27`	`27`
`28`	`28`	`var resolver = context.RequestServices.GetRequiredService<ITenantResolver>();`
`29`	`29`
`30`		`- var multiTenantContext = await resolver.ResolveAsync(context);`
	`30`	`+ var multiTenantContext = await resolver.ResolveAsync(context).ConfigureAwait(false);`
`31`	`31`	`mtcSetter.MultiTenantContext = multiTenantContext;`
`32`	`32`	`context.Items[typeof(IMultiTenantContext)] = multiTenantContext;`
`33`	`33`
`34`		`- await next(context);`
	`34`	`+ await next(context).ConfigureAwait(false);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ public ClaimStrategy(string template, string? authenticationScheme)`
`43`	`43`	`var schemeProvider = httpContext.RequestServices.GetRequiredService<IAuthenticationSchemeProvider>();`
`44`	`44`	`if (_authenticationScheme is null)`
`45`	`45`	`{`
`46`		`- authScheme = await schemeProvider.GetDefaultAuthenticateSchemeAsync();`
	`46`	`+ authScheme = await schemeProvider.GetDefaultAuthenticateSchemeAsync().ConfigureAwait(false);`
`47`	`47`	`}`
`48`	`48`	`else`
`49`	`49`	`{`
`50`	`50`	`authScheme =`
`51`		`- (await schemeProvider.GetAllSchemesAsync()).FirstOrDefault(x => x.Name == _authenticationScheme);`
	`51`	`+ (await schemeProvider.GetAllSchemesAsync().ConfigureAwait(false)).FirstOrDefault(x => x.Name == _authenticationScheme);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (authScheme is null)`
`@@ -59,9 +59,9 @@ public ClaimStrategy(string template, string? authenticationScheme)`
`59`	`59`	`var handler =`
`60`	`60`	`(IAuthenticationHandler)ActivatorUtilities.CreateInstance(httpContext.RequestServices,`
`61`	`61`	`authScheme.HandlerType);`
`62`		`- await handler.InitializeAsync(authScheme, httpContext);`
	`62`	`+ await handler.InitializeAsync(authScheme, httpContext).ConfigureAwait(false);`
`63`	`63`	`httpContext.Items[$"{Constants.TenantToken}__bypass_validate_principal__"] = "true"; // Value doesn't matter.`
`64`		`- var handlerResult = await handler.AuthenticateAsync();`
	`64`	`+ var handlerResult = await handler.AuthenticateAsync().ConfigureAwait(false);`
`65`	`65`	`httpContext.Items.Remove($"{Constants.TenantToken}__bypass_validate_principal__");`
`66`	`66`
`67`	`67`	`var identifier = handlerResult.Principal?.FindFirst(_tenantKey)?.Value;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public RemoteAuthenticationCallbackStrategy(ILogger<RemoteAuthenticationCallback`
`36`	`36`
`37`	`37`	`var schemes = httpContext.RequestServices.GetRequiredService<IAuthenticationSchemeProvider>();`
`38`	`38`
`39`		`- foreach (var scheme in (await schemes.GetRequestHandlerSchemesAsync()).Where(s =>`
	`39`	`+ foreach (var scheme in (await schemes.GetRequestHandlerSchemesAsync().ConfigureAwait(false)).Where(s =>`
`40`	`40`	`typeof(IAuthenticationRequestHandler).IsAssignableFrom(s.HandlerType)))`
`41`	`41`	`{`
`42`	`42`	`// TODO verify this comment (still true as of net8.0)`
`@@ -83,7 +83,7 @@ public RemoteAuthenticationCallbackStrategy(ILogger<RemoteAuthenticationCallback`
`83`	`83`	`{`
`84`	`84`	`var formOptions = new FormOptions { BufferBody = true, MemoryBufferThreshold = 1048576 };`
`85`	`85`
`86`		`- var form = await httpContext.Request.ReadFormAsync(formOptions);`
	`86`	`+ var form = await httpContext.Request.ReadFormAsync(formOptions).ConfigureAwait(false);`
`87`	`87`	`state = form.Single(i => string.Equals(i.Key, "state", StringComparison.OrdinalIgnoreCase))`
`88`	`88`	`.Value;`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,6 @@ public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess,`
`69`	`69`	`CancellationToken cancellationToken = default(CancellationToken))`
`70`	`70`	`{`
`71`	`71`	`this.EnforceMultiTenant();`
`72`		`- return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);`
	`72`	`+ return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken).ConfigureAwait(false);`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,6 @@ public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess,`
`203`	`203`	`CancellationToken cancellationToken = default(CancellationToken))`
`204`	`204`	`{`
`205`	`205`	`this.EnforceMultiTenant();`
`206`		`- return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);`
	`206`	`+ return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken).ConfigureAwait(false);`
`207`	`207`	`}`
`208`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,25 +25,25 @@ public EFCoreStore(TEFCoreStoreDbContext dbContext)`
`25`	`25`	`{`
`26`	`26`	`return await dbContext.TenantInfo.AsNoTracking()`
`27`	`27`	`.Where(ti => ti.Id == id)`
`28`		`- .SingleOrDefaultAsync();`
	`28`	`+ .SingleOrDefaultAsync().ConfigureAwait(false);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public virtual async Task<IEnumerable<TTenantInfo>> GetAllAsync()`
`32`	`32`	`{`
`33`		`- return await dbContext.TenantInfo.AsNoTracking().ToListAsync();`
	`33`	`+ return await dbContext.TenantInfo.AsNoTracking().ToListAsync().ConfigureAwait(false);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public virtual async Task<TTenantInfo?> TryGetByIdentifierAsync(string identifier)`
`37`	`37`	`{`
`38`	`38`	`return await dbContext.TenantInfo.AsNoTracking()`
`39`	`39`	`.Where(ti => ti.Identifier == identifier)`
`40`		`- .SingleOrDefaultAsync();`
	`40`	`+ .SingleOrDefaultAsync().ConfigureAwait(false);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public virtual async Task<bool> TryAddAsync(TTenantInfo tenantInfo)`
`44`	`44`	`{`
`45`		`- await dbContext.TenantInfo.AddAsync(tenantInfo);`
`46`		`- var result = await dbContext.SaveChangesAsync() > 0;`
	`45`	`+ await dbContext.TenantInfo.AddAsync(tenantInfo).ConfigureAwait(false);`
	`46`	`+ var result = await dbContext.SaveChangesAsync().ConfigureAwait(false) > 0;`
`47`	`47`	`dbContext.Entry(tenantInfo).State = EntityState.Detached;`
`48`	`48`
`49`	`49`	`return result;`
`@@ -53,21 +53,21 @@ public virtual async Task<bool> TryRemoveAsync(string identifier)`
`53`	`53`	`{`
`54`	`54`	`var existing = await dbContext.TenantInfo`
`55`	`55`	`.Where(ti => ti.Identifier == identifier)`
`56`		`- .SingleOrDefaultAsync();`
	`56`	`+ .SingleOrDefaultAsync().ConfigureAwait(false);`
`57`	`57`
`58`	`58`	`if (existing is null)`
`59`	`59`	`{`
`60`	`60`	`return false;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`dbContext.TenantInfo.Remove(existing);`
`64`		`- return await dbContext.SaveChangesAsync() > 0;`
	`64`	`+ return await dbContext.SaveChangesAsync().ConfigureAwait(false) > 0;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public virtual async Task<bool> TryUpdateAsync(TTenantInfo tenantInfo)`
`68`	`68`	`{`
`69`	`69`	`dbContext.TenantInfo.Update(tenantInfo);`
`70`		`- var result = await dbContext.SaveChangesAsync() > 0;`
	`70`	`+ var result = await dbContext.SaveChangesAsync().ConfigureAwait(false) > 0;`
`71`	`71`	`dbContext.Entry(tenantInfo).State = EntityState.Detached;`
`72`	`72`	`return result;`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,13 +93,13 @@ public Task<bool> TryAddAsync(TTenantInfo tenantInfo)`
`93`	`93`	`throw new ArgumentNullException(nameof(id));`
`94`	`94`	`}`
`95`	`95`
`96`		`- return await Task.FromResult(tenantMap?.Where(kv => kv.Value.Id == id).SingleOrDefault().Value);`
	`96`	`+ return await Task.FromResult(tenantMap?.Where(kv => kv.Value.Id == id).SingleOrDefault().Value).ConfigureAwait(false);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/// <inheritdoc />`
`100`	`100`	`public async Task<IEnumerable<TTenantInfo>> GetAllAsync()`
`101`	`101`	`{`
`102`		`- return await Task.FromResult(tenantMap?.Select(x => x.Value).ToList() ?? new List<TTenantInfo>());`
	`102`	`+ return await Task.FromResult(tenantMap?.Select(x => x.Value).ToList() ?? new List<TTenantInfo>()).ConfigureAwait(false);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/// <inheritdoc />`
`@@ -115,7 +115,7 @@ public async Task<IEnumerable<TTenantInfo>> GetAllAsync()`
`115`	`115`	`return null;`
`116`	`116`	`}`
`117`	`117`
`118`		`- return await Task.FromResult(tenantMap.TryGetValue(identifier, out var result) ? result : null);`
	`118`	`+ return await Task.FromResult(tenantMap.TryGetValue(identifier, out var result) ? result : null).ConfigureAwait(false);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/// <summary>`