Skip to content

Commit 3f52751

Browse files
captainsafiacaptainsafia
authored
Merge pull request #26855 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'
2 parents 0320eac + 98893bf commit 3f52751

File tree

9 files changed

+483
-340
lines changed

9 files changed

+483
-340
lines changed

‎eng/Baseline.Designer.props

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

‎eng/Baseline.xml

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

‎eng/common/SetupNugetSources.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
55
#
66
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
7-
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
7+
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
88
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
99
#
1010
# This script needs to be called in every job that will restore packages and which the base repo has
@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
6868
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
6969
fi
7070

71-
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
71+
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
7272
grep -i "<packageSourceCredentials>" $ConfigFile
7373
if [ "$?" != "0" ]; then
7474
echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
@@ -138,7 +138,7 @@ IFS=$PrevIFS
138138

139139
for FeedName in ${PackageSources[@]} ; do
140140
# Check if there is no existing credential for this FeedName
141-
grep -i "<$FeedName>" $ConfigFile
141+
grep -i "<$FeedName>" $ConfigFile
142142
if [ "$?" != "0" ]; then
143143
echo "Adding credentials for $FeedName."
144144

‎eng/common/templates/post-build/common-variables.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ variables:
2929
- name: NetCore_3_Tools_Channel_Id
3030
value: 344
3131

32-
# .NET Core 3.0 Internal Servicing
33-
- name: InternalServicing_30_Channel_Id
34-
value: 184
35-
36-
# .NET Core 3.0 Release
37-
- name: PublicRelease_30_Channel_Id
38-
value: 19
39-
4032
# .NET Core 3.1 Release
4133
- name: PublicRelease_31_Channel_Id
4234
value: 129

0 commit comments

Comments
 (0)