[automated] Merge branch 'release/2.1' => 'release/3.1' #18347

dotnet-maestro-bot · 2020-01-15T02:07:40Z

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

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

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/3.1
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/3.1

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/3.1

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/3.1'. 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/3.1 release/3.1
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/3.1

or if you are using SSH

git checkout -b merge/release/2.1-to-release/3.1 release/3.1
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/3.1

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.

Fixed a merge conflict in the code mirror from github into 'internal/release/3.1'

…ositories This pull request updates the following dependencies [marker]: <> (Begin:48752c90-f78c-49ee-575f-08d76e1d56cb) ## From https://github.com/aspnet/EntityFrameworkCore - **Build**: 20191210.7 - **Date Produced**: 12/10/2019 8:25 PM - **Commit**: 813358a5fb4e1f35e5d82463d2bad6616ca6f594 - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.EntityFrameworkCore.Tools** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.SqlServer** -> 3.1.1-servicing.19610.7 - **dotnet-ef** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.InMemory** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.Relational** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.Sqlite** -> 3.1.1-servicing.19610.7 [marker]: <> (End:48752c90-f78c-49ee-575f-08d76e1d56cb)

…ositories This pull request updates the following dependencies [marker]: <> (Begin:facfaf30-1c25-4166-575d-08d76e1d56cb) ## From https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - **Build**: 20191214.11 - **Date Produced**: 12/15/2019 3:03 AM - **Commit**: 07f16c89db55ab6f9f773cc3db6eb5a52908065e - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions** -> 3.1.1 - **Microsoft.AspNetCore.Razor.Language** -> 3.1.1 - **Microsoft.CodeAnalysis.Razor** -> 3.1.1 - **Microsoft.NET.Sdk.Razor** -> 3.1.1 [marker]: <> (End:facfaf30-1c25-4166-575d-08d76e1d56cb)

Stabilize package versions

Update branding to 2.1.16

BrennanConroy · 2020-01-15T02:22:56Z

Not 3.0? What's with the bot @dotnet/aspnet-build

dougbu · 2020-01-15T02:28:25Z

@BrennanConroy the bar is higher for this branch. We are only merging into 'release/3.0' manually i.e. cherry-picks to avoid bringing in unapproved changes.

dotnet-maestro-bot · 2020-01-15T19:09:01Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-01-15T19:09:53Z

This pull request has been updated.

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

analogrelay · 2020-01-15T19:23:12Z

@Tratcher this includes merges from the 2.1 same-site fix. I presume they aren't needed in 3.1 and can be reverted in the merge PR.

analogrelay · 2020-01-15T19:23:45Z

@BrennanConroy SignalR changes are likely the January fixes flowing up now that they've been merged to public? Also, the 2.1 test fix PR.

BrennanConroy · 2020-01-15T19:24:45Z

Yep, I'll work with Justin to update it after lunch

…#17998) - regen ref

* Mark Blazor packages as nonshipping * Explicitly set IsShippingPackage=false * Pin blazor dependency version

Tratcher · 2020-01-15T20:30:35Z

eng/PatchConfig.props

+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.16' ">
+    <PackagesInPatch>
+      Microsoft.AspNetCore.Authentication.Cookies;


These patches aren't needed in 3.1

Suggested change

Microsoft.AspNetCore.Authentication.Cookies;

Tratcher · 2020-01-15T20:30:44Z

eng/PatchConfig.props

+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.16' ">
+    <PackagesInPatch>
+      Microsoft.AspNetCore.Authentication.Cookies;
+      Microsoft.AspNetCore.Mvc.Core;


Suggested change

Microsoft.AspNetCore.Mvc.Core;

Tratcher · 2020-01-15T20:33:40Z

src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs

@@ -169,6 +169,7 @@ public void AppendResponseCookie(HttpContext context, string key, string value,
                HttpOnly = options.HttpOnly,
                Path = options.Path,
                Secure = options.Secure,
+                MaxAge = options.MaxAge,


Not sure why changes in this file are showing up, 3.1 already has these.

Tratcher · 2020-01-15T20:36:58Z

src/Security/CookiePolicy/test/CookieChunkingTests.cs

@@ -21,6 +21,29 @@ public void AppendLargeCookie_Appended()
            Assert.Equal("TestCookie=" + testString + "; path=/; samesite=lax", values[0]);
        }

+        [Fact]


3.1 already has the changes for this file too.

Tratcher · 2020-01-15T20:37:44Z

src/Security/Authentication/test/WsFederation/WsFederationTest.cs

@@ -190,7 +190,7 @@ public async Task RemoteSignoutRequestTriggersSignout()
            response.EnsureSuccessStatusCode();

            var cookie = response.Headers.GetValues(HeaderNames.SetCookie).Single();
-            Assert.Equal(".AspNetCore.Cookies=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; samesite=lax", cookie);
+            Assert.Equal(".AspNetCore.Cookies=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; samesite=lax; httponly", cookie);


Ignore, already in 3.1

src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Startup.cs

Tratcher · 2020-01-15T20:39:15Z

eng/PatchConfig.props

@@ -44,8 +44,16 @@ Later on, this will be checked using this condition:
      Microsoft.AspNetCore.CookiePolicy;
    </PackagesInPatch>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.16' ">


Suggested change

<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.16' ">

<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">

Tratcher · 2020-01-15T20:53:40Z

src/Security/CookiePolicy/test/CookieChunkingTests.cs

-                "TestCookieC4=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax",
-                "TestCookieC5=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax",
-                "TestCookieC6=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax",
-                "TestCookieC7=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax",


This is the 2.2 branch, not the 3.1 branch.

aspnetcore/src/Security/CookiePolicy/test/CookieChunkingTests.cs

Line 120 in 30eec7d

"TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax",

BrennanConroy · 2020-01-15T23:17:01Z

@dotnet/aspnet-build @Tratcher @jkotalik Please take a look ASAP and see if the changes make sense

BrennanConroy · 2020-01-15T23:24:07Z

src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt

@@ -0,0 +1 @@
+


remove these two files?

BrennanConroy · 2020-01-15T23:25:55Z

src/SignalR/server/Core/src/HubConnectionContext.cs

+            }
+            _writeLock.Release();
+
+            // Acquire lock to make sure all writes are completed


Fix duped code

BrennanConroy · 2020-01-15T23:26:23Z

src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs

@@ -32,6 +32,32 @@ public void Dispose()

            var results = _sink.GetLogs().Where(w => w.Write.LogLevel >= LogLevel.Error).ToList();

+#if NETCOREAPP2_1 || NETCOREAPP2_2 || NET461


jkotalik · 2020-01-15T23:26:44Z

build.ps1

@@ -77,6 +77,12 @@ MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
 .PARAMETER MSBuildArguments
 Additional MSBuild arguments to be passed through.

+.PARAMETER DotNetRuntimeSourceFeed


Why are there changes in the build scripts?

jkotalik · 2020-01-15T23:33:53Z

Something seems up with the merge. I see 3.1 commits in the list of commits when it should just be 2.1 commits I believe.

Tratcher

For /Security

dotnet-maestro-bot · 2020-01-16T06:56:50Z

❌ 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/3.1 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.

BrennanConroy and others added 21 commits November 22, 2019 23:28

Merged PR 2918: Cancel Sends if they take too long

0757955

Merged PR 4506: [SignalR] Wait to complete pipe and cancel long sends

a0183b1

Merge in 'release/3.1' changes

a3aaf16

Merge in 'release/2.1' changes

163c80c

Merged PR 4684: Merge 'release/3.1' into internal branch

90aa91a

Fixed a merge conflict in the code mirror from github into 'internal/release/3.1'

Merge in 'release/3.1' changes

f6f3f6f

Merge in 'release/3.1' changes

598e43a

Merge in 'release/3.1' changes

79c2268

Merge in 'release/3.1' changes

0fbb780

Merge in 'release/3.1' changes

1a577b9

Merge in 'release/3.1' changes

d0cca8c

Merge in 'release/3.1' changes

95be2bd

Merge in 'release/3.1' changes

0780fb8

Merge in 'release/3.1' changes

f53765f

Merged PR 4906: [release/3.1] Stabilize package versions

e276c81

Stabilize package versions

Update branding to 3.1.2

32de399

Update branding to 2.1.16

183a09f

Update baselines

6712203

Merge pull request dotnet#18205 from dotnet/johluo/2.1-feb20

0269733

Update branding to 2.1.16

dotnet-maestro-bot requested review from analogrelay, BrennanConroy and halter73 as code owners January 15, 2020 02:07

ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Jan 15, 2020

John Luo added 2 commits January 14, 2020 18:33

Fix CodeCheck

a474170

Fixup templates

eb1150b

Fix TestServer hang with duplex streaming requests (dotnet#17158)

34294a3

dotnet-maestro-bot requested a review from Tratcher as a code owner January 15, 2020 19:09

ajaybhargavb and others added 4 commits January 15, 2020 11:42

Workaround for dotnet#18058 (dotnet#18213)

cba11d7

[Static Web Assets] Allow assets with empty base paths (dotnet#17414)

b4d2f9a

Multi-target all shared framework projects with netcoreapp3.1 (dotnet…

9522e1d

…#17998) - regen ref

[release/3.1] Mark Blazor packages as nonshipping (dotnet#18357)

89d2640

* Mark Blazor packages as nonshipping * Explicitly set IsShippingPackage=false * Pin blazor dependency version

Tratcher requested changes Jan 15, 2020

View reviewed changes

Tratcher reviewed Jan 15, 2020

View reviewed changes

HaoK and others added 3 commits January 15, 2020 13:32

Send confirmation mails for external accounts

109663e

Merge remote-tracking branch 'origin/release/2.1' into release/3.1

dec18fb

fix up

f134fd4

dotnet-maestro-bot requested review from dougbu, jkotalik, ryanbrandenburg and SteveSandersonMS as code owners January 15, 2020 23:08

BrennanConroy reviewed Jan 15, 2020

View reviewed changes

jkotalik reviewed Jan 15, 2020

View reviewed changes

Tratcher approved these changes Jan 15, 2020

View reviewed changes

jkotalik mentioned this pull request Jan 16, 2020

Merge 2.1 into 3.1 #18369

Merged

BrennanConroy closed this Jan 16, 2020

	<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.16' ">
	<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">

		@@ -32,6 +32,32 @@ public void Dispose()

		var results = _sink.GetLogs().Where(w => w.Write.LogLevel >= LogLevel.Error).ToList();

		#if NETCOREAPP2_1 \|\| NETCOREAPP2_2 \|\| NET461

[automated] Merge branch 'release/2.1' => 'release/3.1' #18347

[automated] Merge branch 'release/2.1' => 'release/3.1' #18347

Uh oh!

Conversation

dotnet-maestro-bot commented Jan 15, 2020

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

BrennanConroy commented Jan 15, 2020

Uh oh!

dougbu commented Jan 15, 2020

Uh oh!

dotnet-maestro-bot commented Jan 15, 2020

Uh oh!

dotnet-maestro-bot commented Jan 15, 2020

Uh oh!

analogrelay commented Jan 15, 2020

Uh oh!

analogrelay commented Jan 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BrennanConroy commented Jan 15, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BrennanConroy commented Jan 15, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jkotalik commented Jan 15, 2020

Uh oh!

Tratcher left a comment

Choose a reason for hiding this comment

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

Uh oh!

analogrelay commented Jan 15, 2020 •

edited

Loading