Skip to content

Commit 33e5982

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit 'c663adee8e64ba5d379fa0edfb8201984a7df7d0' into internal-merge-5.0-2021-08-10-1313
2 parents 4ab207c + c663ade commit 33e5982

File tree

4 files changed

+48
-34
lines changed

4 files changed

+48
-34
lines changed

‎NuGet.config‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,15 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7+
<add key="darc-int-dotnet-efcore-780af70" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-780af709/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-efcore -->
89
<!-- Begin: Package sources from dotnet-runtime -->
10+
<add key="darc-int-dotnet-runtime-35964c9-4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-35964c92-4/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-35964c9-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-35964c92-3/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-35964c9-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-35964c92-2/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-35964c9-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-35964c92-1/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-35964c9" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-35964c92/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-runtime-208e377" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-208e377a/nuget/v3/index.json" />
916
<!-- End: Package sources from dotnet-runtime -->
1017
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1118
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,8 +27,15 @@
2027
<clear />
2128
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2229
<!-- Begin: Package sources from dotnet-runtime -->
30+
<add key="darc-int-dotnet-runtime-208e377" value="true" />
31+
<add key="darc-int-dotnet-runtime-35964c9" value="true" />
32+
<add key="darc-int-dotnet-runtime-35964c9-1" value="true" />
33+
<add key="darc-int-dotnet-runtime-35964c9-2" value="true" />
34+
<add key="darc-int-dotnet-runtime-35964c9-3" value="true" />
35+
<add key="darc-int-dotnet-runtime-35964c9-4" value="true" />
2336
<!-- End: Package sources from dotnet-runtime -->
2437
<!-- Begin: Package sources from dotnet-efcore -->
38+
<add key="darc-int-dotnet-efcore-780af70" value="true" />
2539
<!-- End: Package sources from dotnet-efcore -->
2640
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2741
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="5.0.8">
12+
<Dependency Name="dotnet-ef" Version="5.0.9">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
14+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.8">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.9">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
18+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.8">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.9">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
22+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.8">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
26+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.8">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
30+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.8">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.9">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
34+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.8">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.9">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
38+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.8">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
42+
<Sha>780af7091b186e1e0af288ebda44404accd4ea63</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -294,17 +294,17 @@
294294
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
295295
All Runtime.$rid packages should have the same version.
296296
-->
297-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.8">
297+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.9">
298298
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
299-
<Sha>35964c9215613d66a687ebcb2d7fcd9496390ee7</Sha>
299+
<Sha>208e377a5329ad6eb1db5e5fb9d4590fa50beadd</Sha>
300300
</Dependency>
301-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.8-servicing.21315.4">
301+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.9-servicing.21359.8">
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303-
<Sha>35964c9215613d66a687ebcb2d7fcd9496390ee7</Sha>
303+
<Sha>208e377a5329ad6eb1db5e5fb9d4590fa50beadd</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.8-servicing.21315.4">
305+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.9-servicing.21359.8">
306306
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
307-
<Sha>35964c9215613d66a687ebcb2d7fcd9496390ee7</Sha>
307+
<Sha>208e377a5329ad6eb1db5e5fb9d4590fa50beadd</Sha>
308308
</Dependency>
309309
</ProductDependencies>
310310
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
<PropertyGroup Label="Automated">
6060
<!-- Packages from dotnet/runtime -->
6161
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
62-
<MicrosoftNETCoreAppInternalPackageVersion>5.0.8-servicing.21315.4</MicrosoftNETCoreAppInternalPackageVersion>
62+
<MicrosoftNETCoreAppInternalPackageVersion>5.0.9-servicing.21359.8</MicrosoftNETCoreAppInternalPackageVersion>
6363
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
64-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
65-
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.8-servicing.21315.4</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
64+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
65+
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.9-servicing.21359.8</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
6666
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
6767
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
6868
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@@ -127,14 +127,14 @@
127127
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
128128
<MicrosoftNETCorePlatformsPackageVersion>5.0.2</MicrosoftNETCorePlatformsPackageVersion>
129129
<!-- Packages from dotnet/efcore -->
130-
<dotnetefPackageVersion>5.0.8</dotnetefPackageVersion>
131-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
132-
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
133-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.8</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
134-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
135-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreToolsPackageVersion>
136-
<MicrosoftEntityFrameworkCorePackageVersion>5.0.8</MicrosoftEntityFrameworkCorePackageVersion>
137-
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreDesignPackageVersion>
130+
<dotnetefPackageVersion>5.0.9</dotnetefPackageVersion>
131+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.9</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
132+
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.9</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
133+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.9</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
134+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.9</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
135+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.9</MicrosoftEntityFrameworkCoreToolsPackageVersion>
136+
<MicrosoftEntityFrameworkCorePackageVersion>5.0.9</MicrosoftEntityFrameworkCorePackageVersion>
137+
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.9</MicrosoftEntityFrameworkCoreDesignPackageVersion>
138138
<!-- Packages from dotnet/arcade -->
139139
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21409.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140140
</PropertyGroup>

‎src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
178178
return AuthenticateResult.Fail(authenticationFailedContext.Exception);
179179
}
180180

181-
return AuthenticateResult.Fail("No SecurityTokenValidator available for token: " + token ?? "[null]");
181+
return AuthenticateResult.Fail("No SecurityTokenValidator available for token.");
182182
}
183183
catch (Exception ex)
184184
{

0 commit comments

Comments
 (0)