Skip to content

Commit 99979ef

Browse files
wtgodbewtgodbe
authored
Update branding to 3.1.1 (#17335)
* Update branding to 3.1.1 * Add * * Skip RefPack tests * Update baseline
1 parent 9837650 commit 99979ef

File tree

6 files changed

+372
-374
lines changed

6 files changed

+372
-374
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ trigger:
99
include:
1010
- master
1111
- release/*
12+
- internal/release/3.*
1213

1314
# Run PR validation on all branches
1415
pr:

‎eng/Baseline.Designer.props

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

‎eng/Baseline.xml

Lines changed: 76 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,89 @@
11
<!--
22
3-
This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.0.0.
3+
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-
8-
<Baseline Version="3.0.0">
7+
<Baseline Version="3.1.0">
98
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.0" />
109
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.0" />
11-
<Package Id="dotnet-sql-cache" Version="3.0.0" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.0.0" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.0.0" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.0.0" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.0.0" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.0.0" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.0.0" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.0.0" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.0.0" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.0.0" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.0.0" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.0.0" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.0.0" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.0.0" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.0.0" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.0.0" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.0" />
11+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.0" />
12+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0" />
13+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.0" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.0" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.0" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.0" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.0" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.0" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.0" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.0" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.0" />
24+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.0" />
25+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.0" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.0" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.0" />
2928
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19465.2" />
3029
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19465.2" />
3130
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19465.2" />
3231
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19465.2" />
3332
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview9.19465.2" />
3433
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.0.0-preview9.19465.2" />
35-
<Package Id="Microsoft.AspNetCore.Components" Version="3.0.0" />
36-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.0.0" />
37-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.0.0" />
38-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.0.0" />
39-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
40-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.0.0" />
41-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.0.0" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.0.0" />
43-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.0.0" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.0.0" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.0.0" />
46-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.0.0" />
47-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.0.0" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.0.0" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.0.0" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.0.0" />
51-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.0.0" />
52-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.0.0" />
53-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.0.0" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.0.0" />
55-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.0.0" />
56-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.0.0" />
57-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
58-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.0.0" />
59-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.0.0" />
60-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.0.0" />
61-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.0.0" />
62-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.0.0" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0" />
65-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
66-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.0.0" />
67-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.0.0" />
68-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.0.0" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.0.0" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.0.0" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.0.0" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.0.0" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.0.0" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.0.0" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.0.0" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.0.0" />
78-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.0.0" />
79-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
80-
<Package Id="Microsoft.dotnet-openapi" Version="3.0.0" />
81-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.0.0" />
82-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.0.0" />
83-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="3.0.0" />
84-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="3.0.0" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.0.0" />
86-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.0.0" />
87-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.0.0" />
88-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.0.0" />
89-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.0.0" />
90-
91-
</Baseline>
34+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.0" />
35+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.0" />
36+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.0" />
37+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.0" />
38+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
39+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.0" />
40+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.0" />
41+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.0" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.0" />
43+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.0" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.0" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.0" />
46+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.0" />
47+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.0" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.0" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.0" />
50+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.0" />
51+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.0" />
52+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.0" />
53+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.0" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.0" />
55+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.0" />
56+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
57+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.0" />
58+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.0" />
59+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.0" />
60+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.0" />
61+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.0" />
62+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.0" />
65+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.0" />
66+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.0" />
67+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.0" />
68+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.0" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.0" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.0" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.0" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.0" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.0" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.0" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.0" />
76+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.0" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.0" />
78+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
79+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.0" />
80+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.0" />
81+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.0" />
82+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.0" />
83+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.0" />
84+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.0" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.0" />
86+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.0" />
87+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.0" />
88+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.0" />
89+
</Baseline>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
12-
<PreReleasePreviewNumber>3</PreReleasePreviewNumber>
11+
<AspNetCorePatchVersion>1</AspNetCorePatchVersion>
12+
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
16-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
16+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1818
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
1919
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
20-
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
21-
<PreReleaseBrandingLabel>RTM</PreReleaseBrandingLabel>
20+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
21+
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
2222
<!-- Blazor Client packages will not RTM with 3.1 -->
2323
<BlazorClientPreReleasePreviewNumber>4</BlazorClientPreReleasePreviewNumber>
2424
<BlazorClientPreReleaseVersionLabel>preview$(BlazorClientPreReleasePreviewNumber)</BlazorClientPreReleaseVersionLabel>

‎eng/tools/BaselineGenerator/BaselineGenerator.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
6-
<StartArguments>-s https://api.nuget.org/v3/index.json</StartArguments>
76
<StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
87
</PropertyGroup>
98

‎src/Framework/test/TargetingPackTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public TargetingPackTests(ITestOutputHelper output)
2828
_targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
2929
}
3030

31-
[Fact]
31+
[Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
3232
public void AssembliesAreReferenceAssemblies()
3333
{
3434
IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
@@ -55,7 +55,7 @@ public void AssembliesAreReferenceAssemblies()
5555
});
5656
}
5757

58-
[Fact]
58+
[Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
5959
public void PlatformManifestListsAllFiles()
6060
{
6161
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");

0 commit comments

Comments
 (0)