diff --git a/Directory.Build.targets b/Directory.Build.targets index c31b6f65b6..67e287d0c7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -59,6 +59,12 @@ + + true $(PackagesInPatch.Contains(' $(PackageId);')) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 2c26521f8c..b8b76f7355 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -4,8 +4,8 @@ This file contains a list of the package IDs which are patching in a given relea CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky. When adding a new package, make sure the new line ends with a semicolon and starts with a space. -Later on, this will be checked using this condition: +Directory.Build.props checks this property using the following condition: $(PackagesInPatch.Contains(' $(PackageId);')) --> @@ -17,57 +17,4 @@ Later on, this will be checked using this condition: - - - @aspnet/signalr; - Microsoft.AspNetCore.AspNetCoreModuleV2; - Microsoft.AspNetCore.Authentication.Google; - Microsoft.AspNetCore.Http; - Microsoft.AspNetCore.Mvc.Core; - Microsoft.AspNetCore.Routing; - Microsoft.AspNetCore.Server.IIS; - java:signalr; - - - - - @aspnet/signalr; - Microsoft.AspNetCore.AspNetCoreModuleV2; - - - - - Microsoft.AspNetCore.AspNetCoreModule; - Microsoft.AspNetCore.AspNetCoreModuleV2; - Microsoft.AspNetCore.Identity.UI; - java:signalr; - Microsoft.AspNetCore.SignalR.Protocols.MessagePack; - Microsoft.AspNetCore.SignalR.Redis; - Microsoft.AspNetCore.SignalR.StackExchangeRedis; - Microsoft.AspNetCore.DataProtection.StackExchangeRedis; - Microsoft.AspNetCore.Mvc.Core; - Microsoft.AspNetCore.Mvc.RazorPages; - Microsoft.AspNetCore.AzureAppServicesIntegration; - Microsoft.AspNetCore.AzureAppServices.HostingStartup; - Microsoft.AspNetCore.AzureAppServices.SiteExtension; - - - - - Microsoft.AspNetCore.Mvc.Api.Analyzers; - Microsoft.AspNetCore.Server.HttpSys; - Microsoft.AspNetCore.Server.IIS; - - - - - Microsoft.AspNetCore.DataProtection.AzureStorage; - Microsoft.AspNetCore.Hosting; - Microsoft.AspNetCore.SpaServices; - - - - - - diff --git a/eng/Versions.props b/eng/Versions.props index 023598352f..23496f30b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,19 +8,18 @@ 3 0 - 0 - 2 + 1 - true + false release true false - rc$(PreReleasePreviewNumber) - Release Candidate $(PreReleasePreviewNumber) + servicing + Servicing 9 preview$(BlazorClientPreReleasePreviewNumber)