Skip to content
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

[automated] Merge branch 'release/3.0' => 'master' #2219

Merged
merged 6 commits into from
Aug 22, 2019

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/3.0 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.0 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.0
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.0

# 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/Common HEAD:merge/release/3.0-to-master
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/Common HEAD:merge/release/3.0-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.0-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.0-to-master master
git pull https://github.com/dotnet-maestro-bot/Common merge/release/3.0-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common merge/release/3.0-to-master
or if you are using SSH
git checkout -b merge/release/3.0-to-master master
git pull git@github.com:dotnet-maestro-bot/Common merge/release/3.0-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/Common merge/release/3.0-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.

dotnet-maestro bot and others added 5 commits August 21, 2019 09:47
…821.1 (dotnet#2211)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19421.1
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19421.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19421.1
…3.0-preview9-to-release/3.0

[automated] Merge branch 'release/3.0-preview9' => 'release/3.0'
dotnet#2217)

* Update dependencies from https://github.com/dotnet/core-setup build 20190821.22

- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19421-22
- NETStandard.Library.Ref - 2.1.0-rc1-19421-22
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19421-22

Dependency coherency updates

- Microsoft.Win32.Registry - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.7.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 3.0.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/roslyn build 20190822.1

- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19422-01
…otnet#2210)

- unblocks work on dotnet/aspnetcore#4923
  - arguments for inside and outside men of service reference doc gen tool are mixed by default
  - users may add either argument type to the end of the outside man's command line
- e.g. "command --unexpected unexpectedValue --expected" can now set the "expected" option
  - only "--unexpected" and "unexpectedValue" are added to RemainingArguments in that case

- default behaviour of the command-line parser is unchanged to avoid breaking existing applications
- new switch is supported only when calling `CommandLineApplication` constructor for top-level commands
  - `dotnet-getdocument` (the outside man) has no (sub)commands and expanding scope would increase churn

nits: take VS suggestions in changed files
Copy link
Member

@dougbu dougbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and brings in a newer Arcade

@wtgodbe wtgodbe merged commit 14efea2 into dotnet:master Aug 22, 2019
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 12, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from dotnet/extensions@14efea2
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 15, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from dotnet/extensions@14efea2
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Feb 28, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'


Commit migrated from dotnet/extensions@14efea2
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Mar 2, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'


Commit migrated from dotnet/extensions@14efea2
@ghost ghost locked as resolved and limited conversation to collaborators May 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants