From 59d43346e6578985e9e9570c3ac3bb9154919bad Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Thu, 11 Jul 2019 15:35:47 -0700
Subject: [PATCH 1/4] 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
---
build/dependencies.props | 6 +--
docs/PreparingPatchUpdates.md | 44 +++++++++++--------
eng/Baseline.Designer.props | 6 +--
eng/Baseline.xml | 4 +-
eng/PatchConfig.props | 4 ++
.../ArchiveBaseline.2.1.12.txt | 1 +
.../ArchiveBaseline.2.1.12.txt | 1 +
version.props | 2 +-
8 files changed, 40 insertions(+), 28 deletions(-)
create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt
create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt
diff --git a/build/dependencies.props b/build/dependencies.props
index 062cf99832c1..da966e4990b5 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -2,10 +2,10 @@
- 2.1.11
- 2.1.11
+ 2.1.12
+ 2.1.12
- 4.5.2
+ 4.5.2
diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md
index 34813e816267..05e334abb06e 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.
-
-* For each repository still listed as a ``, update the version.props file in that submodule. For example, https://github.com/aspnet/Templating/pull/824
-
- * 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.
-
- ```diff
-
- - 2.1.4
- + 2.1.7
- ```
+ * `` 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/EntityFrameworkCore/pull/15369/files#diff-2a92b4d7f8df251ffd3a0aa63e97aad5
+
+ * 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
+
+ - 8
+ + 11
+ ```
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 519b19b9dbd9..a830a6604482 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.1.11
+ 2.1.12
@@ -898,14 +898,14 @@
- 2.1.1
+ 2.1.12
-
+
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 6011202d8304..dff0b069c0fe 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.1.x. Update this list when preparing for a new patch.
-->
-
+
@@ -97,7 +97,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
-
+
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 47f840db700e..0965ea09dae0 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -40,4 +40,8 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.Server.HttpSys;
+
+
+
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index 8c94afbed85c..e65ef2347945 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
2
1
- 12
+ 13
servicing
Servicing
t000
From c8fc054096fccbcec3a01e919f0402e68428b57b Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg
Date: Fri, 12 Jul 2019 11:45:46 -0700
Subject: [PATCH 2/4] Version the SPA template package [release/2.1] (#11774)
* Version the SPA template package
* Update src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
* Fix templates
---
build/artifacts.props | 2 +-
src/AzureIntegration/build/repo.targets | 2 +-
src/Templating/NuGetPackageVerifier.json | 2 +-
.../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 1 +
.../content/Angular-CSharp/.template.config/template.json | 2 +-
.../test/Templates.Test/Helpers/TemplatePackageInstaller.cs | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build/artifacts.props b/build/artifacts.props
index 075e0d5d2032..e51a66c3f875 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -145,7 +145,7 @@
-
+
diff --git a/src/AzureIntegration/build/repo.targets b/src/AzureIntegration/build/repo.targets
index 4f6c94e8f2f8..856963004f05 100644
--- a/src/AzureIntegration/build/repo.targets
+++ b/src/AzureIntegration/build/repo.targets
@@ -70,7 +70,7 @@
-
+
diff --git a/src/Templating/NuGetPackageVerifier.json b/src/Templating/NuGetPackageVerifier.json
index c3c62e30d333..42e021f20233 100644
--- a/src/Templating/NuGetPackageVerifier.json
+++ b/src/Templating/NuGetPackageVerifier.json
@@ -24,7 +24,7 @@
"Template"
]
},
- "Microsoft.DotNet.Web.Spa.ProjectTemplates": {
+ "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1": {
"packageTypes": [
"Template"
]
diff --git a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index 576f4673055f..37899ac5e38d 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -4,6 +4,7 @@
netcoreapp2.1
+ Microsoft.DotNet.Web.Spa.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)
Single Page Application templates for ASP.NET Core
$(PackageTags);spa
diff --git a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
index e7b2a5989277..fb783b15d79b 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
+++ b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
@@ -140,4 +140,4 @@
"continueOnError": true
}
]
-}
\ No newline at end of file
+}
diff --git a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
index 4493d1fb31d3..fd60b79630a4 100644
--- a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
+++ b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
@@ -21,7 +21,7 @@ internal static class TemplatePackageInstaller
"Microsoft.DotNet.Web.ProjectTemplates.1.x",
"Microsoft.DotNet.Web.ProjectTemplates.2.0",
"Microsoft.DotNet.Web.ProjectTemplates.2.1",
- "Microsoft.DotNet.Web.Spa.ProjectTemplates",
+ "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1",
};
public static string CustomHivePath { get; } = Path.Combine(AppContext.BaseDirectory, ".templateengine");
From 6ed7bf85b198a22a3cdd5b61c4eca5657959dadc Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 12 Jul 2019 11:11:45 -0700
Subject: [PATCH 3/4] Re-pin System.Threading.Tasks.Extensions - not shipping
this time around
---
build/dependencies.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/dependencies.props b/build/dependencies.props
index da966e4990b5..0b1adf4cf105 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -5,7 +5,6 @@
2.1.12
2.1.12
- 4.5.2
@@ -188,6 +187,7 @@
4.5.0
5.2.0
3.1.1
+ 4.5.3
4.5.3
4.3.4
4.5.3
@@ -205,8 +205,8 @@
4.5.0
4.5.0
4.9.0
+ 4.5.2
4.5.0
- 4.5.3
4.5.3
1.3.7
9.0.1
From 2d335f3647f14f03be843f1e097fc19b05ef0674 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Mon, 15 Jul 2019 18:22:29 -0700
Subject: [PATCH 4/4] List all SPA project template names
---
.../test/Templates.Test/Helpers/TemplatePackageInstaller.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
index 304bfb3dd5cf..27133552f07b 100644
--- a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
+++ b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
@@ -46,6 +46,7 @@ internal static class TemplatePackageInstaller
"Microsoft.DotNet.Web.ProjectTemplates.2.2",
"Microsoft.DotNet.Web.ProjectTemplates.3.0",
"Microsoft.DotNet.Web.Spa.ProjectTemplates",
+ "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1",
"Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2",
"Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0"
};