Skip to content

Enable servicing features without stabilizing the build in blazor-wasm #18280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Enable servicing features without stabilizing the build in blazor-wasm #18280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6058f80
Enable servicing features without stabilizing the build in blazor-wasm
wtgodbe Jan 10, 2020
a4214ea
Use basline package versions
wtgodbe Jan 22, 2020
502549f
Make Blazor projects explicitly ProjectReference each other
wtgodbe Jan 22, 2020
fcf2d0d
Update baseline
wtgodbe Jan 22, 2020
f8de8fc
Fixup some versions
wtgodbe Jan 22, 2020
c3fc9af
Fix basline
wtgodbe Jan 22, 2020
c65dacb
Add Mono.WebAssembly.Interop to baseline
wtgodbe Jan 22, 2020
6ab2664
Update TFMs for 2 blazor projects that moved to netstandard2.1
wtgodbe Jan 23, 2020
06a75eb
Use patchconfig.props
wtgodbe Jan 23, 2020
f82465e
Fixup patchconfig
wtgodbe Jan 23, 2020
8b2b11b
Try resolving projectRefs after baseline packages
wtgodbe Jan 23, 2020
29ea69f
Try Using LatestPackageReference as fallback
wtgodbe Jan 23, 2020
6ad4f03
Resolve Custom References before Restoring
wtgodbe Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@
<IsPackable Condition=" '$(IsPackageInThisPatch)' != 'true' ">false</IsPackable>
</PropertyGroup>

<PropertyGroup Condition=" '$(IsPackageInThisPatch)' != 'true' AND '$(BaselinePackageVersion)' != '' AND '$(IsServicingBuild)' == 'true' ">
<PropertyGroup>
<PackageVersionForPackageVersionInfo>$(PackageVersion)</PackageVersionForPackageVersionInfo>
</PropertyGroup>

<PropertyGroup Condition=" '$(IsPackageInThisPatch)' != 'true' AND '$(BaselinePackageVersion)' != ''">
<!-- This keeps assembly and package versions consistent across patches. If a package is not included in a patch, its version should stay at the baseline. -->
<AssemblyVersion Condition="$(BaselinePackageVersion.Contains('-'))">$(BaselinePackageVersion.Substring(0, $(BaselinePackageVersion.IndexOf('-')))).0</AssemblyVersion>
<AssemblyVersion Condition="! $(BaselinePackageVersion.Contains('-'))">$(BaselinePackageVersion).0</AssemblyVersion>
Expand Down Expand Up @@ -163,4 +167,8 @@
<Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
<Import Project="eng\targets\ReferenceAssembly.targets" Condition=" '$(HasReferenceAssembly)' == 'true' " />

<PropertyGroup>
<PackageVersionForPackageVersionInfo Condition="'$(UseLatestPackageReferences)' != 'true'">$(BaselinePackageVersion)</PackageVersionForPackageVersionInfo>
</PropertyGroup>

</Project>
469 changes: 239 additions & 230 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

163 changes: 82 additions & 81 deletions eng/Baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,90 @@
<!--

This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.1.0.
This file contains a list of all the packages and their versions which were released in ASP.NET Core 3.1.1.
Update this list when preparing for a new patch.

-->
<Baseline Version="3.1.0">
<Baseline Version="3.1.1">
<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.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.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" />
<Package Id="dotnet-sql-cache" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview3.19555.2" />
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview3.19555.2" />
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview3.19555.2" />
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview3.19555.2" />
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.1.0-preview3.19555.2" />
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.1.0-preview3.19555.2" />
<Package Id="Mono.WebAssembly.Interop" Version="3.1.0-preview3.19553.2" />
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.1" />
<Package Id="Microsoft.dotnet-openapi" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.1" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.1" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.1" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.1" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.1" />
</Baseline>
17 changes: 8 additions & 9 deletions eng/PatchConfig.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ Directory.Build.props checks this property using the following condition:
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<PropertyGroup Condition=" '$(VersionPrefix)' == '3.0.1' ">
<PropertyGroup>
<PackagesInPatch>
Microsoft.Net.Http.Headers;
Microsoft.AspNetCore.CookiePolicy;
Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
@microsoft/signalr;
Microsoft.Net.Http.Headers;
Microsoft.AspNetCore.Http.Abstractions;
Microsoft.AspNetCore.Http.Features;
Microsoft.AspNetCore.CookiePolicy;
Microsoft.AspNetCore.Blazor;
Microsoft.AspNetCore.Blazor.Build;
Microsoft.AspNetCore.Blazor.DataAnnotations.Validation;
Microsoft.AspNetCore.Blazor.DevServer;
Microsoft.AspNetCore.Blazor.HttpClient;
Microsoft.AspNetCore.Blazor.Server;
Microsoft.AspNetCore.Blazor.Templates;
</PackagesInPatch>
</PropertyGroup>
</Project>
4 changes: 3 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!--
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>
Expand All @@ -26,6 +26,8 @@
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
-->
<!-- We always enable servicing features in this branch, since its releases are staggered between releases of the rest of the product -->
<DisableServicingFeatures>false</DisableServicingFeatures>
<DisableServicingFeatures Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
<IsServicingBuild Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
Expand Down
2 changes: 1 addition & 1 deletion eng/targets/Packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)">
<PackageId>$(PackageId)</PackageId>
<PackageVersion>$(PackageVersion)</PackageVersion>
<PackageVersion>$(PackageVersionForPackageVersionInfo)</PackageVersion>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<VersionVariableName>$(PackageId.Replace('.',''))PackageVersion</VersionVariableName>
</_ProjectPathWithVersion>
Expand Down
Loading