Update branding to 2.2.7 (#12100)
* Add Microsoft.AspNetCore.Mvc.Api.Analyzers to baselines
* 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
716bc8dce9
commit
4fd1d01467
|
|
@ -2,17 +2,17 @@
|
|||
<!-- These package versions may be overridden or updated by automation. -->
|
||||
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
|
||||
<!-- MicrosoftNETCoreApp22PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
|
||||
<MicrosoftNETCoreAppPackageVersion>2.2.5</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.5</MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>2.2.6</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.6</MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
|
||||
<MicrosoftEntityFrameworkCorePackageVersion>2.2.4</MicrosoftEntityFrameworkCorePackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.2.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.6</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
|
||||
<MicrosoftEntityFrameworkCorePackageVersion>2.2.6</MicrosoftEntityFrameworkCorePackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.2.6</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.2.6</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.6</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.6</MicrosoftEntityFrameworkCoreToolsPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@
|
|||
|
||||
<ItemGroup>
|
||||
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
|
||||
<Repository Include="EntityFrameworkCore" />
|
||||
<ShippedRepository Include="EntityFrameworkCore" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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.2.5</AspNetCoreBaselineVersion>
|
||||
<AspNetCoreBaselineVersion>2.2.6</AspNetCoreBaselineVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Package: dotnet-dev-certs-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
|
||||
|
|
@ -77,12 +77,12 @@
|
|||
</ItemGroup>
|
||||
<!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
|
||||
<BaselinePackageVersion>2.2.5</BaselinePackageVersion>
|
||||
<BaselinePackageVersion>2.2.6</BaselinePackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' AND '$(TargetFramework)' == 'netcoreapp2.2' " />
|
||||
<!-- Package: Microsoft.AspNetCore.AspNetCoreModuleV2-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' ">
|
||||
<BaselinePackageVersion>2.2.5</BaselinePackageVersion>
|
||||
<BaselinePackageVersion>2.2.6</BaselinePackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' AND '$(TargetFramework)' == 'netcoreapp2.2' " />
|
||||
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
|
||||
|
|
@ -649,6 +649,11 @@
|
|||
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Analyzers' AND '$(TargetFramework)' == 'netstandard1.3' " />
|
||||
<!-- Package: Microsoft.AspNetCore.Mvc.Api.Analyzers-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Api.Analyzers' ">
|
||||
<BaselinePackageVersion>2.2.6</BaselinePackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Api.Analyzers' AND '$(TargetFramework)' == 'netstandard1.3' " />
|
||||
<!-- Package: Microsoft.AspNetCore.Mvc.ApiExplorer-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.ApiExplorer' ">
|
||||
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
|
||||
|
|
@ -954,7 +959,7 @@
|
|||
</ItemGroup>
|
||||
<!-- Package: Microsoft.AspNetCore.Server.HttpSys-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' ">
|
||||
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
|
||||
<BaselinePackageVersion>2.2.6</BaselinePackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' AND '$(TargetFramework)' == 'netstandard2.0' ">
|
||||
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
|
||||
|
|
@ -965,13 +970,13 @@
|
|||
</ItemGroup>
|
||||
<!-- Package: Microsoft.AspNetCore.Server.IIS-->
|
||||
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' ">
|
||||
<BaselinePackageVersion>2.2.2</BaselinePackageVersion>
|
||||
<BaselinePackageVersion>2.2.6</BaselinePackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' AND '$(TargetFramework)' == 'netstandard2.0' ">
|
||||
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
|
||||
<BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[2.2.0, )" />
|
||||
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
|
||||
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.2, )" />
|
||||
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.3, )" />
|
||||
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
|
||||
</ItemGroup>
|
||||
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
|
||||
|
|
@ -1347,4 +1352,4 @@
|
|||
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="[2.2.0, )" />
|
||||
<BaselinePackageReference Include="Microsoft.Owin.Security" Version="[3.0.1, )" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -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.2.x. Update this list when preparing for a new patch.
|
||||
|
||||
-->
|
||||
<Baseline Version="2.2.5">
|
||||
<Baseline Version="2.2.6">
|
||||
<Package Id="dotnet-dev-certs" Version="2.2.0" />
|
||||
<Package Id="dotnet-sql-cache" Version="2.2.0" />
|
||||
<Package Id="dotnet-user-secrets" Version="2.2.0" />
|
||||
|
|
@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
|
|||
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
|
||||
<Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.5" />
|
||||
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.5" />
|
||||
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.6" />
|
||||
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.6" />
|
||||
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.2.0" />
|
||||
|
|
@ -74,6 +74,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
|
|||
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Mvc.Analyzers" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="2.2.6" />
|
||||
<Package Id="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
|
||||
<Package Id="Microsoft.AspNetCore.Mvc.Cors" Version="2.2.0" />
|
||||
|
|
@ -102,8 +103,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
|
|||
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Routing" Version="2.2.2" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.2" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.2.6" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
|
||||
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
|
||||
|
|
|
|||
|
|
@ -73,4 +73,8 @@ Later on, this will be checked using this condition:
|
|||
Microsoft.AspNetCore.Server.IIS;
|
||||
</PackagesInPatch>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
|
||||
<PackagesInPatch>
|
||||
</PackagesInPatch>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
|
||||
<AspNetCoreMinorVersion>2</AspNetCoreMinorVersion>
|
||||
<AspNetCorePatchVersion>6</AspNetCorePatchVersion>
|
||||
<AspNetCorePatchVersion>7</AspNetCorePatchVersion>
|
||||
<PreReleaseLabel>servicing</PreReleaseLabel>
|
||||
<PreReleaseBrandingLabel></PreReleaseBrandingLabel>
|
||||
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">$([System.DateTime]::Now.ToString('yyMMdd'))-99</BuildNumber>
|
||||
|
|
|
|||
Loading…
Reference in New Issue