Skip to content

Commit 59d4334

Browse files
dougbudougbu
authored
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
1 parent 7b0f676 commit 59d4334

File tree

8 files changed

+40
-28
lines changed

8 files changed

+40
-28
lines changed

‎build/dependencies.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- These package versions may be overridden or updated by automation. -->
33
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
44
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
5-
<MicrosoftNETCoreAppPackageVersion>2.1.11</MicrosoftNETCoreAppPackageVersion>
6-
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.11</MicrosoftNETCoreDotNetAppHostPackageVersion>
5+
<MicrosoftNETCoreAppPackageVersion>2.1.12</MicrosoftNETCoreAppPackageVersion>
6+
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.12</MicrosoftNETCoreDotNetAppHostPackageVersion>
77

8-
<SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
8+
<SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
99
</PropertyGroup>
1010

1111
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />

‎docs/PreparingPatchUpdates.md

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,32 @@ In order to prepare this repo to build a new servicing update, the following cha
1616
* Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases.
1717
See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool.
1818

19+
* **For the subset of external dependencies mentioned at the top of [build/dependencies.props](/build/dependencies.props):**
20+
If a package (Microsoft.NetCore.App for example) shipped in the last release, update the package version properties.
21+
22+
* Changes made above to external dependencies listed in [eng/Baseline.Designer.props](/eng/Baseline.Designer.props)
23+
should _not_ require further updates. The versions of affected packages should have been updated in
24+
[build/dependencies.props](/build/dependencies.props) during the previous patching cycle.
25+
1926
* **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.
2027

2128
* **For packages still building from submodules:** Update the list of repositories which will contain changes in [build/submodules.props](/build/submodules.props).
2229

23-
* `<ShippedRepository>` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch.
24-
* `<Repository>` items represent repos which will produce new packages in this patch.
25-
* It is usually best to move everything to `<ShippedRepository>` and then iteratively add them back to `<Repository>` as new repos receive approval to patch.
26-
* Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed.
27-
28-
* 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
29-
30-
* The version prefix in repos should match the version of ASP.NET Core.
31-
* Exception: SignalR, which is "1.1", not "2.1".
32-
* This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example:
33-
* EF Core ships patches in 2.1.4 as "2.1.4"
34-
* EF Core does not ship patches in 2.1.5 or 2.1.6
35-
* EF Core ships in 2.1.7, therefore, EFCore's version.props file should jump from 2.1.4 to 2.1.7.
36-
37-
```diff
38-
<!-- Example change to modules/EntityFrameworkCore/version.props -->
39-
- <VersionPrefix>2.1.4</VersionPrefix>
40-
+ <VersionPrefix>2.1.7</VersionPrefix>
41-
```
30+
* `<ShippedRepository>` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch.
31+
* `<Repository>` items represent repos which will produce new packages in this patch.
32+
* It is usually best to move everything to `<ShippedRepository>` and then iteratively add them back to `<Repository>` as new repos receive approval to patch.
33+
* But, do not change the Templating item at all. That is only _treated_ as a submodule.
34+
* Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed.
35+
36+
* **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
37+
38+
* This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example:
39+
* EF Core ships patches in 2.1.8 as "2.1.8"
40+
* EF Core does not ship patches in 2.1.9 or 2.1.10
41+
* EF Core ships in 2.1.11, therefore, EFCore's version.props file should jump from 2.1.8 to 2.1.11.
42+
43+
```diff
44+
<!-- Example change to modules/EntityFrameworkCore/version.props -->
45+
- <PatchVersion>8</PatchVersion>
46+
+ <PatchVersion>11</PatchVersion>
47+
```

‎eng/Baseline.Designer.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5-
<AspNetCoreBaselineVersion>2.1.11</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.1.12</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -898,14 +898,14 @@
898898
</ItemGroup>
899899
<!-- Package: Microsoft.AspNetCore.Server.HttpSys-->
900900
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' ">
901-
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
901+
<BaselinePackageVersion>2.1.12</BaselinePackageVersion>
902902
</PropertyGroup>
903903
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' AND '$(TargetFramework)' == 'netstandard2.0' ">
904904
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
905905
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.1.1, )" />
906906
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
907907
<BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.5.0, )" />
908-
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
908+
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.1, )" />
909909
</ItemGroup>
910910
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
911911
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">

‎eng/Baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
44
build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="2.1.11">
7+
<Baseline Version="2.1.12">
88
<Package Id="dotnet-dev-certs" Version="2.1.1" />
99
<Package Id="dotnet-sql-cache" Version="2.1.1" />
1010
<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.
9797
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
9898
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
9999
<Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
100-
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
100+
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.12" />
101101
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.7" />
102102
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.7" />
103103
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />

‎eng/PatchConfig.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,8 @@ Later on, this will be checked using this condition:
4040
Microsoft.AspNetCore.Server.HttpSys;
4141
</PackagesInPatch>
4242
</PropertyGroup>
43+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.13' ">
44+
<PackagesInPatch>
45+
</PackagesInPatch>
46+
</PropertyGroup>
4347
</Project>

‎src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
44
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
5-
<AspNetCorePatchVersion>12</AspNetCorePatchVersion>
5+
<AspNetCorePatchVersion>13</AspNetCorePatchVersion>
66
<PreReleaseLabel>servicing</PreReleaseLabel>
77
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
88
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>

0 commit comments

Comments
 (0)