[automated] Merge branch 'release/3.1.2xx' => 'master' by dotnet-maestro-bot · Pull Request #5812 · dotnet/installer

dotnet-maestro-bot · 2019-12-02T18:51:18Z

I detected changes in the release/3.1.2xx 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.2xx by the following committers:

dotnet-maestro[bot]
wli3
wtgodbe
johnbeisner
livarcocc
mmitche

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/3.1.2xx
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.1.2xx

# 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/core-sdk HEAD:merge/release/3.1.2xx-to-master

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.2xx-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.2xx-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.2xx-to-master master
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/3.1.2xx-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.2xx-to-master

or if you are using SSH

git checkout -b merge/release/3.1.2xx-to-master master
git pull git@github.com:dotnet-maestro-bot/core-sdk merge/release/3.1.2xx-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.2xx-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.

…0191101.9 (dotnet#5474) - dotnet-dev-certs - 3.0.1-servicing.19551.9 - dotnet-user-secrets - 3.0.1-servicing.19551.9 - dotnet-watch - 3.0.1-servicing.19551.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19551.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19551.9

…1101.17 (dotnet#5476) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19551.17

…0191104.4 (dotnet#5528) - dotnet-user-secrets - 3.1.0-preview3.19554.4 - dotnet-watch - 3.1.0-preview3.19554.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19554.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19554.4 - dotnet-dev-certs - 3.1.0-preview3.19554.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19554.4

…1104.4 (dotnet#5529) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.4

…1104.7 (dotnet#5535) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19554.3 (parent: Microsoft.Dotnet.Toolset.Internal)

…1104.6 (dotnet#5531) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19554.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19554.2 (parent: Microsoft.Dotnet.Toolset.Internal)

…1104.8 (dotnet#5537) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.8

…5526) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1 * Fix blob URLs for stabilized ASP.NET 3.0.x Unpin 3.0.x ASP.NET targeting pack Revert dotnet-* tools packages to 3.0.0 versions * Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1 * Fix version of the targeting pack * Fix targeting pack version

…1104.11 (dotnet#5541) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19554.11

…1105.3 (dotnet#5549) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19555.3

…0191105.2 (dotnet#5552) - dotnet-user-secrets - 3.1.0-preview3.19555.2 - dotnet-watch - 3.1.0-preview3.19555.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview3.19555.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview3.19555.2 - dotnet-dev-certs - 3.1.0-preview3.19555.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19555.2

* Update dependencies from https://github.com/dotnet/toolset build 20191105.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19555.5 * Update dependencies from https://github.com/dotnet/toolset build 20191105.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19555.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview3.19555.1 (parent: Microsoft.Dotnet.Toolset.Internal)

- System.ServiceModel.Primitives - 4.7.0

…1106.2 (dotnet#5564) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19556.2

…1106.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19556.6

…1107.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19557.1

…om-301xx

…m-301xx

Under the current CPD algorithm, which uses first found, work around issues with pinned dependencies by moving them after other dependencies from the same repository

…1108.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19558.1

Do not use the CDN as this can cause caching issues if bits have to be overwritten (which should not happen automatically, but may happen manually in certain cases)

…1109.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19559.2

[release/3.1.1xx] Merge from release/3.0.1xx

…5769) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.12 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.12 - dotnet-user-secrets - 3.1.0-rtm.19572.12 - dotnet-watch - 3.1.0-rtm.19572.12 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19572.12 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.16 - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.16 - dotnet-user-secrets - 3.1.0-rtm.19572.16 - dotnet-watch - 3.1.0-rtm.19572.16 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19572.16

…5772) * Update dependencies from https://github.com/dotnet/core-setup build 20191122.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.6 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.6 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.6 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.6 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.6 * Update dependencies from https://github.com/dotnet/core-setup build 20191122.8 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.8 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.8 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.8 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.8 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.8 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.8 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.8 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19572.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

…0191122.19 (dotnet#5778) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.19 - dotnet-user-secrets - 3.1.0-rtm.19572.19 - dotnet-watch - 3.1.0-rtm.19572.19 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19572.19

…0191123.3 (dotnet#5781) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19573.3 - dotnet-user-secrets - 3.1.0-rtm.19573.3 - dotnet-watch - 3.1.0-rtm.19573.3 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19573.3

…0191125.1 (dotnet#5783) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19575.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19575.1 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19575.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19575.1 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19575.1 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19575.1 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19575.1

…122.3 (dotnet#5766) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3

NUnit3Templates update

…0191126.4 (dotnet#5791) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.4 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.4 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.4 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.4 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.4

…127.5 (dotnet#5799) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5

…127.5 (dotnet#5811) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5

…3.1.2xx

…3.1.1xx-to-release/3.1.2xx [automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'

…203.16 (dotnet#5823) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16

…ld 20191120.1 (dotnet#5832) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.19570.1

…205.2 (dotnet#5835) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19605.2

…x-to-master' into merge/release/3.1.2xx-to-master

ghost · 2019-12-06T00:26:48Z

Hello @nguerrera!

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.

dotnet-maestro Bot and others added 30 commits November 3, 2019 18:48

Update dependencies from https://github.com/dotnet/toolset build 2019…

c5a4069

…1101.17 (dotnet#5476) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19551.17

Update dependencies from https://github.com/dotnet/toolset build 2019…

2fd1953

…1104.4 (dotnet#5529) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.4

Update dependencies from https://github.com/dotnet/toolset build 2019…

21e769f

…1104.8 (dotnet#5537) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19554.8

Update dependencies from https://github.com/dotnet/toolset build 2019…

17c09ac

…1104.11 (dotnet#5541) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19554.11

Stabilize package versions (dotnet#5540)

a79f317

Update dependencies from aspnetcore (dotnet#5547)

246b25d

Update dependencies from https://github.com/dotnet/toolset build 2019…

9cdce19

…1105.3 (dotnet#5549) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19555.3

Update dependencies from https://github.com/dotnet/wcf build 20191105.3

4e29740

- System.ServiceModel.Primitives - 4.7.0

Update dependencies from https://github.com/dotnet/toolset build 2019…

07b9e33

…1106.2 (dotnet#5564) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19556.2

Update dependencies from https://github.com/dotnet/toolset build 2019…

22495aa

…1106.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19556.6

Update dependencies from https://github.com/dotnet/toolset build 2019…

231e709

…1107.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19557.1

Update implicit package versions for 2.2.7 and 2.1.14 (dotnet#5566)

ec736cb

Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-fr…

ebecffa

…om-301xx

Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-fr…

960aafb

…om-301xx

Fixup version property files

fd5b02d

Merge remote-tracking branch 'origin/merge-from-301xx' into merge-fro…

c8f7bac

…m-301xx

Move pinned dependencies later in file (dotnet#5579)

4abb5e7

Under the current CPD algorithm, which uses first found, work around issues with pinned dependencies by moving them after other dependencies from the same repository

Update dependencies from https://github.com/dotnet/toolset build 2019…

a456420

…1108.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19558.1

Set DOTNET_ROOT in tests (dotnet#5584)

5e44425

Merge release/3.0.1xx into branch

7bb582e

Download from blob storage (dotnet#5586)

bc5f8df

Do not use the CDN as this can cause caching issues if bits have to be overwritten (which should not happen automatically, but may happen manually in certain cases)

Update dependencies from https://github.com/dotnet/toolset build 2019…

36fd0e0

…1109.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19559.2

Merge pull request dotnet#5577 from mmitche/merge-from-301xx

7826cd7

[release/3.1.1xx] Merge from release/3.0.1xx

dotnet-maestro Bot and others added 16 commits November 23, 2019 05:51

Add trigger for internal builds (dotnet#5784)

458eb28

Update dependencies from https://github.com/dotnet/arcade build 20191…

1e2e7f4

…122.3 (dotnet#5766) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3

Merge pull request dotnet#5634 from halex2005/nunit3templates-update

24f420c

NUnit3Templates update

Update dependencies from https://github.com/dotnet/arcade build 20191…

85a5ef8

…127.5 (dotnet#5799) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5

Update dependencies from https://github.com/dotnet/arcade build 20191…

41d2445

…127.5 (dotnet#5811) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5

Merge branch 'release/3.1.2xx' into merge/release/3.1.1xx-to-release/…

289a20c

…3.1.2xx

Merge pull request dotnet#5768 from dotnet-maestro-bot/merge/release/…

731d27c

…3.1.1xx-to-release/3.1.2xx [automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'

Update dependencies from https://github.com/dotnet/arcade build 20191…

326f8a5

…203.16 (dotnet#5823) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16

Update dependencies from https://github.com/dotnet/test-templates bui…

51e15d2

…ld 20191120.1 (dotnet#5832) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.19570.1

Update dependencies from https://github.com/dotnet/arcade build 20191…

0e2f545

…205.2 (dotnet#5835) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19605.2

nguerrera mentioned this pull request Dec 5, 2019

[automated] Merge branch 'release/3.1.1xx' => 'master' #5539

Closed

nguerrera self-assigned this Dec 5, 2019

mmitche and others added 5 commits December 5, 2019 15:18

Update to 3.1.100 rtm sdk (dotnet#5829)

a7599e4

Merge branch 'master' into merge/release/3.1.2xx-to-master

41d020c

Merge remote-tracking branch 'dotnet-maestro-bot/merge/release/3.1.2x…

c474478

…x-to-master' into merge/release/3.1.2xx-to-master

Fix merge error in SDK version

c70a1f7

Fix merge error in arcade version

aece614

nguerrera requested review from a team, dsplaisted and wli3 December 6, 2019 00:06

nguerrera added the auto-merge label Dec 6, 2019

ghost merged commit de3002b into dotnet:master Dec 6, 2019

nguerrera mentioned this pull request Dec 11, 2019

Generate Content for a Test at Run-time -- release/3.1.2xx dotnet/sdk#4045

Merged

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/3.1.2xx' => 'master' - #5812

[automated] Merge branch 'release/3.1.2xx' => 'master'#5812
130 commits merged into
dotnet:masterfrom
dotnet-maestro-bot:merge/release/3.1.2xx-to-master

dotnet-maestro-bot commented Dec 2, 2019

Uh oh!

ghost commented Dec 6, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

dotnet-maestro-bot commented Dec 2, 2019

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

ghost commented Dec 6, 2019

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.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

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.