Skip to content

[automated] Merge branch 'release/3.1' => 'master' #1846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
49 commits merged into from
Sep 12, 2019

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/3.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.

merge button instructions

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/3.1
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.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/wpf HEAD:merge/release/3.1-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/wpf HEAD:merge/release/3.1-to-master

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/3.1-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/3.1-to-master master
git pull https://github.com/dotnet-maestro-bot/wpf merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/wpf HEAD:merge/release/3.1-to-master
or if you are using SSH
git checkout -b merge/release/3.1-to-master master
git pull [email protected]:dotnet-maestro-bot/wpf merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/wpf HEAD:merge/release/3.1-to-master

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.

vatsan-madhavan and others added 13 commits September 5, 2019 16:16
Merging missing commits from release/3.0 -> release/3.1
…905.21 (dotnet#1794)

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19455.21
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.21
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19455.21
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19455.21
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19455.21
… (dotnet#1796)

* Fixing removal of None from Page under certain conditions (EnableDefaultApplicationDefinition or EnableDefaultPageItems is false).
Further adding a fix to ensure this doesn't result in ApplicationDefinition being included in Page as well when EnableDefaultApplicationDefinition is false.

* Fixing removal of ApplicationDefinition from Page to be unconditional.

* Removing extraneous ApplicationDefinition

* Clarifying comments
…90906.5 (dotnet#1801)

- Microsoft.Private.Winforms - 4.8.1-preview1.19456.5

Dependency coherency updates

- Microsoft.Win32.Registry - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-rc1-19429-05 (parent: Microsoft.Private.Winforms)
- System.CodeDom - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Configuration.ConfigurationManager - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Diagnostics.EventLog - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.DirectoryServices - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Drawing.Common - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Reflection.Emit - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Reflection.MetadataLoadContext - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Security.AccessControl - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Xml - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Security.Principal.Windows - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.Windows.Extensions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.Platforms - 3.0.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- System.IO.Packaging - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.Runtime.CoreCLR)
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILAsm - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…906.10 (dotnet#1810)

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19456.10
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19456.10
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19456.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19456.10
…90907.5 (dotnet#1812)

- Microsoft.Private.Winforms - 4.8.1-preview1.19457.5
…907.1 (dotnet#1815)

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19457.1
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19457.1
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19457.1
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19457.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19457.1
…90908.4 (dotnet#1816)

- Microsoft.Private.Winforms - 4.8.1-preview1.19458.4
…908.2 (dotnet#1821)

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19458.2
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19458.2
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19458.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19458.2
…90909.6 (dotnet#1822)

- Microsoft.Private.Winforms - 4.8.1-preview1.19459.6
…909.10 (dotnet#1828)

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19459.10
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19459.10
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19459.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19459.10
…90910.5 (dotnet#1830)

- Microsoft.Private.Winforms - 4.8.1-preview1.19460.5
…910.3 (dotnet#1843)

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19460.3
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19460.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19460.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19460.3
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Sep 11, 2019
@ghost ghost requested a review from SamBent September 11, 2019 13:24
…90911.5 (dotnet#1847)

- Microsoft.Private.Winforms - 4.8.1-preview1.19461.5
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

dotnet-maestro bot and others added 9 commits September 11, 2019 14:35
…90911.6 (dotnet#1848)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.6

Dependency coherency updates

- Microsoft.NETCore.App - 5.0.0-alpha1.19461.4 (parent: Microsoft.Private.Winforms)
…90911.7 (dotnet#1850)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.7
…90911.9 (dotnet#1851)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.9

Dependency coherency updates

- Microsoft.NETCore.App - 5.0.0-alpha1.19461.8 (parent: Microsoft.Private.Winforms)
…90911.11 (dotnet#1853)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.11

Dependency coherency updates

- Microsoft.NETCore.App - 5.0.0-alpha1.19461.9 (parent: Microsoft.Private.Winforms)
dotnet-maestro bot and others added 4 commits September 11, 2019 23:00
…90911.16 (dotnet#1855)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.16

Dependency coherency updates

- Microsoft.NETCore.App - 5.0.0-alpha1.19461.17 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.Runtime.CoreCLR)
- Microsoft.NETCore.Runtime.CoreCLR - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.Runtime.CoreCLR)
            .NET Core 3.1 SDK hasn't consumed the fix for NuGet/Home#8467 yet.
            Suppress these warnings temporarily
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

dotnet-maestro bot and others added 10 commits September 12, 2019 00:50
…90911.18 (dotnet#1857)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.18

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 5.0.0-alpha1.19461.26 (parent: Microsoft.Private.Winforms)
- System.CodeDom - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.DirectoryServices - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Drawing.Common - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Reflection.Emit - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Security.AccessControl - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Security.Principal.Windows - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Windows.Extensions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.IO.Packaging - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
- System.Resources.Extensions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App)
…90911.19 (dotnet#1858)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.19

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 5.0.0-alpha1.19461.33 (parent: Microsoft.Private.Winforms)
- System.CodeDom - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.DirectoryServices - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Drawing.Common - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Reflection.Emit - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Security.AccessControl - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Security.Principal.Windows - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Windows.Extensions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.IO.Packaging - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
- System.Resources.Extensions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App)
…90911.20 (dotnet#1859)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19461.20

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 5.0.0-alpha1.19461.40 (parent: Microsoft.Private.Winforms)
- System.CodeDom - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.DirectoryServices - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Drawing.Common - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Reflection.Emit - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Security.AccessControl - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Security.Principal.Windows - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Windows.Extensions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.IO.Packaging - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
- System.Resources.Extensions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App)
…90912.1 (dotnet#1861)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.1

Dependency coherency updates

- Microsoft.NETCore.App - 5.0.0-alpha1.19461.47 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.Runtime.CoreCLR)
- Microsoft.NETCore.Runtime.CoreCLR - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…90912.2 (dotnet#1862)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.2
…90912.3 (dotnet#1863)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.3
…911.7

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19461.7
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19461.7
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19461.7
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19461.7
…5d4c-41e8-969e-1459046fae84

[release/3.1] Update dependencies from dotnet/arcade
…otnet-wpf-int build 20190912.4 (dotnet#1866)

- Microsoft.DotNet.Wpf.DncEng - 5.0.0-alpha1.19462.4
* Update dependencies from https://github.com/dotnet/winforms build 20190912.5

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.5

* Update dependencies from https://github.com/dotnet/winforms build 20190912.4

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.4
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

…90912.6 (dotnet#1871)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.6
…90912.8 (dotnet#1872)

- Microsoft.Private.Winforms - 4.8.1-preview1.19462.8
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

…90912.9 (dotnet#1876)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.9

Dependency coherency updates

- Microsoft.NETCore.App - 5.0.0-alpha1.19462.1 (parent: Microsoft.Private.Winforms)
…90912.11 (dotnet#1877)

- Microsoft.Private.Winforms - 5.0.0-alpha1.19462.11

Dependency coherency updates

- Microsoft.NETCore.App - 5.0.0-alpha1.19462.5 (parent: Microsoft.Private.Winforms)
…otnet-wpf-int build 20190911.39 (dotnet#1869)

- Microsoft.DotNet.Wpf.DncEng - 4.8.1-preview1.19461.39
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@vatsan-madhavan vatsan-madhavan added the auto_merge bot-command label Sep 12, 2019
@ghost
Copy link

ghost commented Sep 12, 2019

Hello @vatsan-madhavan!

Because this pull request has the auto_merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 11a8ba5 into dotnet:master Sep 12, 2019
@ghost ghost locked as resolved and limited conversation to collaborators Apr 14, 2022
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto_merge bot-command PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants