From 4fd1d01467df0e6439ef16d33cc13c220d32931d Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 12 Jul 2019 06:56:50 -0700
Subject: [PATCH] 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
---
build/dependencies.props | 16 +++++++--------
build/submodules.props | 2 +-
docs/PreparingPatchUpdates.md | 38 ++++++++++++++++++++---------------
eng/Baseline.Designer.props | 19 +++++++++++-------
eng/Baseline.xml | 11 +++++-----
eng/PatchConfig.props | 4 ++++
version.props | 2 +-
7 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/build/dependencies.props b/build/dependencies.props
index ff1b314c33..5f51ce3667 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -2,17 +2,17 @@
- 2.2.5
- 2.2.5
+ 2.2.6
+ 2.2.6
- 2.2.4
- 2.2.4
- 2.2.4
- 2.2.4
- 2.2.4
- 2.2.4
+ 2.2.6
+ 2.2.6
+ 2.2.6
+ 2.2.6
+ 2.2.6
+ 2.2.6
diff --git a/build/submodules.props b/build/submodules.props
index a088430493..4370c412c7 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -37,6 +37,6 @@
-
+
diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md
index 34813e8162..05e334abb0 100644
--- a/docs/PreparingPatchUpdates.md
+++ b/docs/PreparingPatchUpdates.md
@@ -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).
- * `` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch.
- * `` items represent repos which will produce new packages in this patch.
- * It is usually best to move everything to `` and then iteratively add them back to `` as new repos receive approval to patch.
- * Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed.
+ * `` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch.
+ * `` items represent repos which will produce new packages in this patch.
+ * It is usually best to move everything to `` and then iteratively add them back to `` 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 ``, update the version.props file in that submodule. For example, https://github.com/aspnet/Templating/pull/824
+* **For each repository still listed as a ``:** 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
-
- - 2.1.4
- + 2.1.7
- ```
+ ```diff
+
+ - 8
+ + 11
+ ```
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 62cc7a6854..02e35937c3 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.2.5
+ 2.2.6
@@ -77,12 +77,12 @@
- 2.2.5
+ 2.2.6
- 2.2.5
+ 2.2.6
@@ -649,6 +649,11 @@
2.2.0
+
+
+ 2.2.6
+
+
2.2.0
@@ -954,7 +959,7 @@
- 2.2.0
+ 2.2.6
@@ -965,13 +970,13 @@
- 2.2.2
+ 2.2.6
-
+
@@ -1347,4 +1352,4 @@
-
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index cc802678a3..4edbdbadf4 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -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.
-->
-
+
@@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
-
-
+
+
@@ -74,6 +74,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
+
@@ -102,8 +103,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
-
-
+
+
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 3daf32fba4..196624c7d6 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -73,4 +73,8 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.Server.IIS;
+
+
+
+
diff --git a/version.props b/version.props
index f5ceabf956..6dd444f335 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
2
2
- 6
+ 7
servicing
$([System.DateTime]::Now.ToString('yyMMdd'))-99