Update branding to 2.1.12 (#12096)
* also improve PreparingPatchUpdates.md
- document changes to dependencies.props
- reflect changes in how Templating is handled
- e.g. use EF Core examples
- nit: adjust indentation to avoid markdown warnings
This commit is contained in:
Doug Bunting
GitHub
parent
7b0f67689b
commit
59d43346e6
|
|
@ -2,10 +2,10 @@
|
|||
<!-- These package versions may be overridden or updated by automation. -->
|
||||
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
|
||||
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
|
||||
<MicrosoftNETCoreAppPackageVersion>2.1.11</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.11</MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>2.1.12</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.12</MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
|
||||
<SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
|
||||
<SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
|
||||
|
|
|
|||
|
|
@ -16,26 +16,32 @@ In order to prepare this repo to build a new servicing update, the following cha
|
|||
* Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases.
|
||||
See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool.
|
||||
|
||||
* **For the subset of external dependencies mentioned at the top of [build/dependencies.props](/build/dependencies.props):**
|
||||
If a package (Microsoft.NetCore.App for example) shipped in the last release, update the package version properties.
|
||||
|
||||
* Changes made above to external dependencies listed in [eng/Baseline.Designer.props](/eng/Baseline.Designer.props)
|
||||
should _not_ require further updates. The versions of affected packages should have been updated in
|
||||
[build/dependencies.props](/build/dependencies.props) during the previous patching cycle.
|
||||
|
||||
* **For packages with source code in this repo (not a submodule):** Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release.
|
||||
|
||||
* **For packages still building from submodules:** Update the list of repositories which will contain changes in [build/submodules.props](/build/submodules.props).
|
||||
|
||||
* `<ShippedRepository>` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch.
|
||||
* `<Repository>` items represent repos which will produce new packages in this patch.
|
||||
* It is usually best to move everything to `<ShippedRepository>` and then iteratively add them back to `<Repository>` as new repos receive approval to patch.
|
||||
* Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed.
|
||||
* `<ShippedRepository>` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch.
|
||||
* `<Repository>` items represent repos which will produce new packages in this patch.
|
||||
* It is usually best to move everything to `<ShippedRepository>` and then iteratively add them back to `<Repository>` as new repos receive approval to patch.
|
||||
* But, do not change the Templating item at all. That is only _treated_ as a submodule.
|
||||
* Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed.
|
||||
|
||||
* For each repository still listed as a `<Repository>`, update the version.props file in that submodule. For example, https://github.com/aspnet/Templating/pull/824
|
||||
* **For each repository still listed as a `<Repository>`:** Update the version.props file in that submodule. For example, https://github.com/aspnet/EntityFrameworkCore/pull/15369/files#diff-2a92b4d7f8df251ffd3a0aa63e97aad5
|
||||
|
||||
* The version prefix in repos should match the version of ASP.NET Core.
|
||||
* Exception: SignalR, which is "1.1", not "2.1".
|
||||
* This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example:
|
||||
* EF Core ships patches in 2.1.4 as "2.1.4"
|
||||
* EF Core does not ship patches in 2.1.5 or 2.1.6
|
||||
* EF Core ships in 2.1.7, therefore, EFCore's version.props file should jump from 2.1.4 to 2.1.7.
|
||||
* This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example:
|
||||
* EF Core ships patches in 2.1.8 as "2.1.8"
|
||||
* EF Core does not ship patches in 2.1.9 or 2.1.10
|
||||
* EF Core ships in 2.1.11, therefore, EFCore's version.props file should jump from 2.1.8 to 2.1.11.
|
||||
|
||||
```diff
|
||||
<!-- Example change to modules/EntityFrameworkCore/version.props -->
|
||||
- <VersionPrefix>2.1.4</VersionPrefix>
|
||||
+ <VersionPrefix>2.1.7</VersionPrefix>
|
||||
```
|
||||
```diff
|
||||
<!-- Example change to modules/EntityFrameworkCore/version.props -->
|
||||
- <PatchVersion>8</PatchVersion>
|
||||
+ <PatchVersion>11</PatchVersion>
|
||||
```
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||
<AspNetCoreBaselineVersion>2.1.11</AspNetCoreBaselineVersion>
|
||||
<AspNetCoreBaselineVersion>2.1.12</AspNetCoreBaselineVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Package: dotnet-dev-certs-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
|
||||
|
|
@ -898,14 +898,14 @@
|
|||
</ItemGroup>
|
||||
<!-- Package: Microsoft.AspNetCore.Server.HttpSys-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' ">
|
||||
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
|
||||
<BaselinePackageVersion>2.1.12</BaselinePackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' AND '$(TargetFramework)' == 'netstandard2.0' ">
|
||||
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
|
||||
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.1.1, )" />
|
||||
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
|
||||
<BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.5.0, )" />
|
||||
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
|
||||
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.1, )" />
|
||||
</ItemGroup>
|
||||
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
|
|||
build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
|
||||
|
||||
-->
|
||||
<Baseline Version="2.1.11">
|
||||
<Baseline Version="2.1.12">
|
||||
<Package Id="dotnet-dev-certs" Version="2.1.1" />
|
||||
<Package Id="dotnet-sql-cache" Version="2.1.1" />
|
||||
<Package Id="dotnet-user-secrets" Version="2.1.1" />
|
||||
|
|
@ -97,7 +97,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
|
|||
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
|
||||
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
|
||||
<Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.12" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.7" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.7" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
|
||||
|
|
|
|||
|
|
@ -40,4 +40,8 @@ Later on, this will be checked using this condition:
|
|||
Microsoft.AspNetCore.Server.HttpSys;
|
||||
</PackagesInPatch>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.13' ">
|
||||
<PackagesInPatch>
|
||||
</PackagesInPatch>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
|
||||
|
|
@ -0,0 +1 @@
|
|||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
|
||||
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
|
||||
<AspNetCorePatchVersion>12</AspNetCorePatchVersion>
|
||||
<AspNetCorePatchVersion>13</AspNetCorePatchVersion>
|
||||
<PreReleaseLabel>servicing</PreReleaseLabel>
|
||||
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
|
||||
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>
|
||||
|
|
|
|||
Loading…
Reference in New Issue