Update branding to 3.1.1 (#17335)

* Update branding to 3.1.1

* Add *

* Skip RefPack tests

* Update baseline

.azure/pipelines/ci.yml

@@ -9,6 +9,7 @@ trigger:
     include:
     - master
     - release/*
+    - internal/release/3.*
 
 # Run PR validation on all branches
 pr:

eng/Baseline.xml

 <!--
 
-This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.0.0. 
+This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.1.0.
 Update this list when preparing for a new patch.
 
 -->
-
-<Baseline Version="3.0.0">
+<Baseline Version="3.1.0">
   <Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.0" />
   <Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.0" />
-  <Package Id="dotnet-sql-cache" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authorization" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.0.0" />
+  <Package Id="dotnet-sql-cache" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.0" />
   <Package Id="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19465.2" />
   <Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19465.2" />
   <Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19465.2" />
   <Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19465.2" />
   <Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview9.19465.2" />
   <Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.0.0-preview9.19465.2" />
-  <Package Id="Microsoft.AspNetCore.Components" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Http.Features" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Metadata" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.NodeServices" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Owin" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SpaServices" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.0.0" />
-  <Package Id="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
-  <Package Id="Microsoft.dotnet-openapi" Version="3.0.0" />
-  <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.0.0" />
-  <Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.0.0" />
-  <Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="3.0.0" />
-  <Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="3.0.0" />
-  <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.0.0" />
-  <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.0.0" />
-  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.0.0" />
-  <Package Id="Microsoft.Extensions.Identity.Core" Version="3.0.0" />
-  <Package Id="Microsoft.Extensions.Identity.Stores" Version="3.0.0" />
-
-</Baseline>
+  <Package Id="Microsoft.AspNetCore.Components" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Owin" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.0" />
+  <Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
+  <Package Id="Microsoft.dotnet-openapi" Version="3.1.0" />
+  <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.0" />
+  <Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.0" />
+  <Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.0" />
+  <Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.0" />
+  <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.0" />
+  <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.0" />
+  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.0" />
+  <Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.0" />
+  <Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.0" />
+</Baseline>
\ No newline at end of file

eng/Versions.props

@@ -8,17 +8,17 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
-    <PreReleasePreviewNumber>3</PreReleasePreviewNumber>
+    <AspNetCorePatchVersion>1</AspNetCorePatchVersion>
+    <PreReleasePreviewNumber>0</PreReleasePreviewNumber>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
     <IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
-    <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
-    <PreReleaseBrandingLabel>RTM</PreReleaseBrandingLabel>
+    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
+    <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
     <!-- Blazor Client packages will not RTM with 3.1 -->
     <BlazorClientPreReleasePreviewNumber>4</BlazorClientPreReleasePreviewNumber>
     <BlazorClientPreReleaseVersionLabel>preview$(BlazorClientPreReleasePreviewNumber)</BlazorClientPreReleaseVersionLabel>

eng/tools/BaselineGenerator/BaselineGenerator.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-    <StartArguments>-s https://api.nuget.org/v3/index.json</StartArguments>
     <StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
   </PropertyGroup>
 

src/Framework/test/TargetingPackTests.cs

@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore
             _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
         }
 
-        [Fact]
+        [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
         public void AssembliesAreReferenceAssemblies()
         {
             IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore
             });
         }
 
-        [Fact]
+        [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
         public void PlatformManifestListsAllFiles()
         {
             var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");