[automated] Merge branch 'release/2.1' => 'release/2.2' #12104

dotnet-maestro-bot · 2019-07-11T22:38:23Z

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

@dougbu

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/2.1
git pull --ff-only
git checkout release/2.2
git pull --ff-only
git merge --no-ff release/2.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2

or if you are using SSH

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull git@github.com:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

* 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

dougbu

Let's get #12100 in first. Note this should be a no-op merge for the most part; perhaps worth waiting 'til later in the patch cycle.

dougbu · 2019-07-12T15:27:38Z

eng/Baseline.Designer.props

@@ -966,7 +966,7 @@
    <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
    <BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.2.0, )" />
    <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, )" />


This is not correct and I'll revert it soon. Microsoft.AspNetCore.Server.HttpSys v.2.2.6 still depends on System.Security.Principal.Windows v4.5.0.

@wtgodbe and @mmitche how did we get into this state -- depending on different versions of this package in release/2.1 and release/2.2? Is there an adjustment we should make in the next 2.2.x patch?

Details

We got a new System.Security.Principal.Windows version in 2.1.6 ProdCon builds. In 6effb13, Nate changed its version in our build/dependencies.props file too. But, nothing similar has happened in 2.2.x builds and Microsoft.AspNetCore.Server.HttpSys v2.1.12 is the only ASP.NET Core package we've released depending on System.Security.Principal.Windows v4.5.1.

We got a new System.Security.Principal.Windows version in 2.1.6 ProdCon builds. In 6effb13, Nate changed its version in our build/dependencies.props file too. But, nothing similar has happened in 2.2.x builds and Microsoft.AspNetCore.Server.HttpSys v2.1.12 is the only ASP.NET Core package we've released depending on System.Security.Principal.Windows v4.5.1.

Maybe a merge between 2.1 and 2.2 was resolved incorrectly?

We couldn't merge the build/dependencies.props change into 'release/2.2' because ProdCon was still flowing System.Security.Principal.Windows v4.5.0. Must be flowing that version or our builds would fail. That said, is the System.Security.Principal.Windows version correct (updated) elsewhere in 2.2?

We discussed this offline and #12129 and #12132 were the result

* Version the SPA template package * Update src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj * Fix templates

dotnet-maestro-bot · 2019-07-12T18:48:30Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

- not shipping this time around

dotnet-maestro-bot · 2019-07-12T19:50:27Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dougbu

Hold off for now

dougbu · 2019-07-14T19:24:01Z

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",


@ryanbrandenburg should this line include the .2.1 suffix in the 'release/2.2' branch now? (Next line is "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2" at the moment.)

Actually I think it should include everything. That is:

"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"

That way we know for sure that when we do dotnet new angular we're getting the one we just built and not just a previous or future framework.

🆗 this is no longer a no-op merge. Have another quick look @ryanbrandenburg

dougbu · 2019-07-15T02:18:26Z

@ryanbrandenburg just waiting for your double-check of my most recent manual merge

ryanbrandenburg

Looks fine, though I'm not

ryanbrandenburg · 2019-07-15T16:32:36Z

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",


Actually I think it should include everything. That is:

"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"

That way we know for sure that when we do dotnet new angular we're getting the one we just built and not just a previous or future framework.

dotnet-maestro-bot · 2019-07-16T15:29:25Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

Update branding to 2.1.12 (dotnet#12096)

59d4334

* 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

dougbu requested a review from a team July 11, 2019 22:40

dougbu requested changes Jul 11, 2019

View reviewed changes

dougbu reviewed Jul 12, 2019

View reviewed changes

dougbu approved these changes Jul 12, 2019

View reviewed changes

Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jul 12, 2019

Version the SPA template package [release/2.1] (dotnet#11774)

c8fc054

* Version the SPA template package * Update src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj * Fix templates

Re-pin System.Threading.Tasks.Extensions

6ed7bf8

- not shipping this time around

dougbu requested changes Jul 13, 2019

View reviewed changes

dougbu approved these changes Jul 14, 2019

View reviewed changes

Merge branch 'release/2.1' into 'release/2.2'

3481238

dougbu force-pushed the merge/release/2.1-to-release/2.2 branch from 2d0b930 to 3481238 Compare July 14, 2019 19:15

dougbu reviewed Jul 14, 2019

View reviewed changes

ryanbrandenburg approved these changes Jul 15, 2019

View reviewed changes

List all SPA project template names

2d335f3

dougbu merged commit a4649e6 into dotnet:release/2.2 Jul 16, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/2.1' => 'release/2.2' #12104

[automated] Merge branch 'release/2.1' => 'release/2.2' #12104

dotnet-maestro-bot commented Jul 11, 2019

dougbu left a comment

dougbu Jul 12, 2019

mmitche Jul 12, 2019

dougbu Jul 12, 2019

dougbu Jul 13, 2019

dotnet-maestro-bot commented Jul 12, 2019

dotnet-maestro-bot commented Jul 12, 2019

dougbu left a comment

dougbu Jul 14, 2019 •

edited

Loading

ryanbrandenburg Jul 15, 2019

dougbu Jul 16, 2019

dougbu commented Jul 15, 2019

ryanbrandenburg left a comment

ryanbrandenburg Jul 15, 2019

dotnet-maestro-bot commented Jul 16, 2019

[automated] Merge branch 'release/2.1' => 'release/2.2' #12104

[automated] Merge branch 'release/2.1' => 'release/2.2' #12104

Conversation

dotnet-maestro-bot commented Jul 11, 2019

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

dougbu left a comment

Choose a reason for hiding this comment

dougbu Jul 12, 2019

Choose a reason for hiding this comment

Details

mmitche Jul 12, 2019

Choose a reason for hiding this comment

dougbu Jul 12, 2019

Choose a reason for hiding this comment

dougbu Jul 13, 2019

Choose a reason for hiding this comment

dotnet-maestro-bot commented Jul 12, 2019

dotnet-maestro-bot commented Jul 12, 2019

dougbu left a comment

Choose a reason for hiding this comment

dougbu Jul 14, 2019 • edited Loading

Choose a reason for hiding this comment

ryanbrandenburg Jul 15, 2019

Choose a reason for hiding this comment

dougbu Jul 16, 2019

Choose a reason for hiding this comment

dougbu commented Jul 15, 2019

ryanbrandenburg left a comment

Choose a reason for hiding this comment

ryanbrandenburg Jul 15, 2019

Choose a reason for hiding this comment

dotnet-maestro-bot commented Jul 16, 2019

dougbu Jul 14, 2019 •

edited

Loading