Skip to content

Commit 4241fa9

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/3.1' changes
2 parents a0a9ca0 + 12410ea commit 4241fa9

File tree

6 files changed

+306
-305
lines changed

6 files changed

+306
-305
lines changed

‎eng/Baseline.Designer.props

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

‎eng/Baseline.xml

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
<!--
1+
<!--
22
33
This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.1.0.
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="3.1.22">
7+
<Baseline Version="3.1.23">
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
10-
<Package Id="dotnet-sql-cache" Version="3.1.22" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.23" />
1111
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.22" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.22" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.22" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.22" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.22" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.22" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.22" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.22" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.22" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.22" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.22" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.22" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.22" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.22" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.22" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.22" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.22" />
29-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.22" />
30-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.22" />
31-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.22" />
32-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.22" />
33-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.22" />
12+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.23" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.23" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.23" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.23" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.23" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.23" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.23" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.23" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.23" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.23" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.23" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.23" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.23" />
25+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.23" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.23" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.23" />
28+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.23" />
29+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.23" />
30+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.23" />
31+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.23" />
32+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.23" />
33+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.23" />
3434
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
3535
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
3636
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
3737
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
3838
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
3939
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
40-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.22" />
41-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.22" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.22" />
43-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.22" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.22" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.22" />
46-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.22" />
47-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.22" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.22" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.22" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.22" />
51-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.22" />
52-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.22" />
53-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.22" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.22" />
55-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.22" />
56-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.22" />
57-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.22" />
58-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.22" />
59-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.22" />
60-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.22" />
61-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.22" />
62-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.22" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.22" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.22" />
65-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.22" />
66-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.22" />
67-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.22" />
68-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.22" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.22" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.22" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.22" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.22" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.22" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.22" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.22" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.22" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.22" />
78-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.22" />
79-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.22" />
80-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.22" />
81-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.22" />
82-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.22" />
83-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.22" />
84-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.22" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.22" />
86-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.22" />
87-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.22" />
88-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.22" />
89-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.22" />
40+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.23" />
41+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.23" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.23" />
43+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.23" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.23" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.23" />
46+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.23" />
47+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.23" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.23" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.23" />
50+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.23" />
51+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.23" />
52+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.23" />
53+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.23" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.23" />
55+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.23" />
56+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.23" />
57+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.23" />
58+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.23" />
59+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.23" />
60+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.23" />
61+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.23" />
62+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.23" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.23" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.23" />
65+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.23" />
66+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.23" />
67+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.23" />
68+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.23" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.23" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.23" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.23" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.23" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.23" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.23" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.23" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.23" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.23" />
78+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.23" />
79+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.23" />
80+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.23" />
81+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.23" />
82+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.23" />
83+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.23" />
84+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.23" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.23" />
86+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.23" />
87+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.23" />
88+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.23" />
89+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.23" />
9090
</Baseline>

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>8934ddbf6c4fbc697b8f63eb5a49fb21ccffc56b</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22077.9">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22114.9">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
423+
<Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22077.9">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22114.9">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
427+
<Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
428428
</Dependency>
429429
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.23-servicing.22123.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
430430
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>24</AspNetCorePatchVersion>
1212
<!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time -->
13-
<ValidateBaseline>false</ValidateBaseline>
13+
<ValidateBaseline>true</ValidateBaseline>
1414
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
1515
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
1616
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
@@ -64,7 +64,7 @@
6464
-->
6565
<PropertyGroup Label="Automated">
6666
<!-- Packages from dotnet/arcade -->
67-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22077.9</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22114.9</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->

‎eng/common/templates/job/job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ jobs:
162162

163163
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
164164
- task: ComponentGovernanceComponentDetection@0
165+
continueOnError: true
165166

166167
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
167168
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "3.1.416"
3+
"version": "3.1.417"
44
},
55
"tools": {
6-
"dotnet": "3.1.416",
6+
"dotnet": "3.1.417",
77
"runtimes": {
88
"dotnet/x64": [
99
"$(MicrosoftNETCoreAppInternalPackageVersion)"
@@ -26,6 +26,6 @@
2626
},
2727
"msbuild-sdks": {
2828
"Yarn.MSBuild": "1.22.10",
29-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22077.9"
29+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22114.9"
3030
}
3131
}

0 commit comments

Comments
 (0)