Skip to content

Commit a9ded02

Browse files
author
John Luo
authored
Merge branch 'master' into jamesnk/interoptests
2 parents 1be83e3 + 7def102 commit a9ded02

File tree

85 files changed

+1079
-1148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1079
-1148
lines changed

eng/Version.Details.xml

Lines changed: 110 additions & 114 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20158.2</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20162.3</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta4-20153-05</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->
@@ -97,61 +97,60 @@
9797
<!-- Packages from dotnet/blazor -->
9898
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.2.0-preview1.20067.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
9999
<!-- Packages from dotnet/extensions -->
100-
<InternalAspNetCoreAnalyzersPackageVersion>5.0.0-preview.3.20156.3</InternalAspNetCoreAnalyzersPackageVersion>
101-
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>5.0.0-preview.3.20156.3</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
102-
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsCachingAbstractionsPackageVersion>
103-
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsCachingMemoryPackageVersion>
104-
<MicrosoftExtensionsCachingSqlServerPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsCachingSqlServerPackageVersion>
105-
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
106-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
107-
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
108-
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationBinderPackageVersion>
109-
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
110-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
111-
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
112-
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationIniPackageVersion>
113-
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationJsonPackageVersion>
114-
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationPackageVersion>
115-
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
116-
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsConfigurationXmlPackageVersion>
117-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
118-
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsDependencyInjectionPackageVersion>
119-
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
120-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
121-
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsFileProvidersCompositePackageVersion>
122-
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
123-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
124-
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsHostingAbstractionsPackageVersion>
125-
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsHostingPackageVersion>
126-
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsHttpPackageVersion>
127-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
128-
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
129-
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingConfigurationPackageVersion>
130-
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingConsolePackageVersion>
131-
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingDebugPackageVersion>
132-
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingEventSourcePackageVersion>
133-
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingEventLogPackageVersion>
134-
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingPackageVersion>
135-
<MicrosoftExtensionsLoggingTestingPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingTestingPackageVersion>
136-
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
137-
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
138-
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
139-
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsOptionsPackageVersion>
140-
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.3.20156.3</MicrosoftExtensionsPrimitivesPackageVersion>
141-
<MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-preview.3.20156.3</MicrosoftInternalExtensionsRefsPackageVersion>
100+
<InternalAspNetCoreAnalyzersPackageVersion>5.0.0-preview.3.20166.1</InternalAspNetCoreAnalyzersPackageVersion>
101+
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>5.0.0-preview.3.20166.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
102+
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
103+
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsCachingMemoryPackageVersion>
104+
<MicrosoftExtensionsCachingSqlServerPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
105+
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
106+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
107+
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
108+
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
109+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
110+
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
111+
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationIniPackageVersion>
112+
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
113+
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationPackageVersion>
114+
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
115+
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
116+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
117+
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
118+
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
119+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
120+
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
121+
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
122+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
123+
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
124+
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsHostingPackageVersion>
125+
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsHttpPackageVersion>
126+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
127+
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
128+
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
129+
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingConsolePackageVersion>
130+
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingDebugPackageVersion>
131+
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingEventSourcePackageVersion>
132+
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingEventLogPackageVersion>
133+
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingPackageVersion>
134+
<MicrosoftExtensionsLoggingTestingPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingTestingPackageVersion>
135+
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
136+
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
137+
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
138+
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsOptionsPackageVersion>
139+
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.3.20166.1</MicrosoftExtensionsPrimitivesPackageVersion>
140+
<MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-preview.3.20166.1</MicrosoftInternalExtensionsRefsPackageVersion>
142141
<!-- Packages from dotnet/efcore -->
143-
<dotnetefPackageVersion>5.0.0-preview.3.20160.3</dotnetefPackageVersion>
144-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.3.20160.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
145-
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.3.20160.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
146-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.3.20160.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
147-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.3.20160.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
148-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.3.20160.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
149-
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.3.20160.3</MicrosoftEntityFrameworkCorePackageVersion>
142+
<dotnetefPackageVersion>5.0.0-preview.3.20168.1</dotnetefPackageVersion>
143+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.3.20168.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
144+
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.3.20168.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
145+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.3.20168.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
146+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.3.20168.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
147+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.3.20168.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
148+
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.3.20168.1</MicrosoftEntityFrameworkCorePackageVersion>
150149
<!-- Packages from dotnet/aspnetcore-tooling -->
151-
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.3.20157.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
152-
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.3.20157.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
153-
<MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.3.20157.1</MicrosoftCodeAnalysisRazorPackageVersion>
154-
<MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.3.20157.1</MicrosoftNETSdkRazorPackageVersion>
150+
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.3.20167.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
151+
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.3.20167.3</MicrosoftAspNetCoreRazorLanguagePackageVersion>
152+
<MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.3.20167.3</MicrosoftCodeAnalysisRazorPackageVersion>
153+
<MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.3.20167.3</MicrosoftNETSdkRazorPackageVersion>
155154
</PropertyGroup>
156155
<!--
157156

eng/helix/content/default.runner.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"longRunningTestSeconds": 60,
3+
"diagnosticMessages": true
4+
}

eng/helix/content/runtests.cmd

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ echo "Checking for Microsoft.AspNetCore.App"
2727
if EXIST ".\Microsoft.AspNetCore.App" (
2828
echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%"
2929
xcopy /i /y ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%\
30-
30+
3131
echo "Adding current directory to nuget sources: %HELIX_WORKITEM_ROOT%"
3232
dotnet nuget add source %HELIX_WORKITEM_ROOT%
3333
dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json
3434
dotnet nuget list source
3535
dotnet tool install dotnet-ef --global --version %$efVersion%
36-
36+
3737
set PATH=!PATH!;%DOTNET_CLI_HOME%\.dotnet\tools
3838
)
3939

@@ -49,6 +49,11 @@ echo Creating nuget restore directory: %NUGET_RESTORE%
4949
mkdir %NUGET_RESTORE%
5050
mkdir logs
5151

52+
REM "Rename default.runner.json to xunit.runner.json if there is not a custom one from the project"
53+
if not EXIST ".\xunit.runner.json" (
54+
copy default.runner.json xunit.runner.json
55+
)
56+
5257
dir
5358

5459
%DOTNET_ROOT%\dotnet vstest %$target% -lt >discovered.txt

eng/helix/content/runtests.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,12 @@ then
108108

109109
# Ensure tools are on on PATH
110110
export PATH="$PATH:$DOTNET_CLI_HOME/.dotnet/tools"
111+
fi
111112

113+
# Rename default.runner.json to xunit.runner.json if there is not a custom one from the project
114+
if [ ! -f "xunit.runner.json" ]
115+
then
116+
cp default.runner.json xunit.runner.json
112117
fi
113118

114119
if [ -e /proc/self/coredump_filter ]; then

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20158.2",
29-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20158.2"
28+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20162.3",
29+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20162.3"
3030
}
3131
}

src/Components/Server/test/Circuits/RevalidatingServerAuthenticationStateProvider.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Threading.Tasks;
1010
using Microsoft.AspNetCore.Components.Authorization;
1111
using Microsoft.AspNetCore.Components.Server;
12+
using Microsoft.AspNetCore.Testing;
1213
using Microsoft.Extensions.Logging.Abstractions;
1314
using Xunit;
1415

@@ -184,7 +185,8 @@ public async Task SuppliesCancellationTokenThatSignalsWhenRevalidationLoopIsBein
184185
}
185186

186187
[Fact]
187-
public async Task IfValidateAuthenticationStateAsyncReturnsUnrelatedCancelledTask_TreatAsFailure()
188+
[QuarantinedTest]
189+
public async Task IfValidateAuthenticationStateAsyncReturnsUnrelatedCanceledTask_TreatAsFailure()
188190
{
189191
// Arrange
190192
var validationTcs = new TaskCompletionSource<bool>();
@@ -200,11 +202,11 @@ public async Task IfValidateAuthenticationStateAsyncReturnsUnrelatedCancelledTas
200202
var firstRevalidationCall = provider.RevalidationCallLog.Single();
201203
Assert.Equal(0, authenticationStateChangedCount);
202204

203-
// Act: ValidateAuthenticationStateAsync returns cancelled task, but the cancellation
205+
// Act: ValidateAuthenticationStateAsync returns canceled task, but the cancellation
204206
// is unrelated to the CT we supplied
205207
validationTcs.TrySetCanceled(new CancellationTokenSource().Token);
206208

207-
// Assert: Since we didn't ask for that operation to be cancelled, this is treated as
209+
// Assert: Since we didn't ask for that operation to be canceled, this is treated as
208210
// a failure to validate, so we force a logout
209211
Assert.Equal(1, authenticationStateChangedCount);
210212
var newAuthState = await provider.GetAuthenticationStateAsync();

src/Components/Web.JS/dist/Release/blazor.webassembly.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)