Skip to content

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

Closed
dotnet-maestro-bot wants to merge 93 commits into
dotnet:masterfrom
dotnet-maestro-bot:merge/release/3.1.1xx-to-master
Closed

[automated] Merge branch 'release/3.1.1xx' => 'master'#5539
dotnet-maestro-bot wants to merge 93 commits into
dotnet:masterfrom
dotnet-maestro-bot:merge/release/3.1.1xx-to-master

Conversation

@dotnet-maestro-bot

Copy link
Copy Markdown

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

  • wtgodbe
  • dotnet-maestro[bot]

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

# 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.1xx-to-master
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.1xx-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.1xx-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.1xx-to-master master
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/3.1.1xx-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.1xx-to-master
or if you are using SSH
git checkout -b merge/release/3.1.1xx-to-master master
git pull git@github.com:dotnet-maestro-bot/core-sdk merge/release/3.1.1xx-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.1xx-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 30 commits November 3, 2019 18:48
…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)
…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
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
dotnet-maestro Bot and others added 13 commits November 13, 2019 14:03
…1113.5 (dotnet#5660)

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19563.5
* Update dependencies from https://github.com/dotnet/toolset build 20191114.6

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview3.19564.6

* Update dependencies from https://github.com/dotnet/toolset build 20191114.7

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.7

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.100-preview3.19564.2 (parent: Microsoft.Dotnet.Toolset.Internal)
* Update dependencies from https://github.com/dotnet/toolset build 20191114.8

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.8

* Update dependencies from https://github.com/dotnet/toolset build 20191114.9

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.9
…0191114.3 (dotnet#5678)

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Ref - 3.1.0
- Microsoft.NETCore.App.Host.win-x64 - 3.1.0
- Microsoft.NETCore.App.Internal - 3.1.0-rtm.19564.3
- Microsoft.NETCore.DotNetHostResolver - 3.1.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0
- Microsoft.NETCore.App.Ref - 3.1.0
* Update dependencies from https://github.com/dotnet/toolset build 20191114.10

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.10

* Update dependencies from https://github.com/dotnet/toolset build 20191114.11

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19564.11

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19564.1 (parent: Microsoft.Dotnet.Toolset.Internal)
…0191114.3 (dotnet#5679)

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19564.3
- dotnet-user-secrets - 3.1.0-preview3.19564.3
- dotnet-watch - 3.1.0-preview3.19564.3
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-preview3.19564.3
…1115.1 (dotnet#5680)

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.1

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.100-rtm.19564.5 (parent: Microsoft.Dotnet.Toolset.Internal)
…0191114.4 (dotnet#5683)

- Microsoft.NETCore.App.Ref - 3.1.0
- Microsoft.NETCore.App.Internal - 3.1.0-rtm.19564.4
- Microsoft.NETCore.App.Host.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Ref - 3.1.0
- Microsoft.NETCore.DotNetHostResolver - 3.1.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0
* Updating the 3.0 template installation diretory from "3.0.0" to "3.0.1"
* Adding a NuGet feed to locate the 3.0.1 Asp.Net templates
…0191115.5 (dotnet#5688)

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19565.5
- dotnet-user-secrets - 3.1.0-rtm.19565.5
- dotnet-watch - 3.1.0-rtm.19565.5
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19565.5
@nguerrera

Copy link
Copy Markdown

Ping @dotnet/dotnet-cli for review

dotnet-maestro Bot and others added 6 commits November 16, 2019 09:01
…5690)

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

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Ref - 3.1.0
- Microsoft.NETCore.App.Host.win-x64 - 3.1.0
- Microsoft.NETCore.App.Internal - 3.1.0-rtm.19565.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0
- Microsoft.NETCore.App.Ref - 3.1.0

Dependency coherency updates

- Microsoft.NETCore.Platforms - 3.1.0 (parent: Microsoft.NetCore.App.Internal)
- Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-rtm.19564.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19565.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Add back feed
* Update dependencies from https://github.com/dotnet/toolset build 20191115.2

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.2

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19564.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.4

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.4

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.3

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.3

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.5

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.5

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.6

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.6

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.7

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.7

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.9

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.9

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.10

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.10

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.14

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.14

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.5 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.15

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.15

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.6 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.16

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.16

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.6 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20191115.18

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.18

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.7 (parent: Microsoft.Dotnet.Toolset.Internal)

* templating nuget

* Update dependencies from https://github.com/dotnet/toolset build 20191115.19

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19565.19

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19565.7 (parent: Microsoft.Dotnet.Toolset.Internal)

* 65f
…5694)

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191116.1

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19566.1
- dotnet-user-secrets - 3.1.0-rtm.19566.1
- dotnet-watch - 3.1.0-rtm.19566.1
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19566.1

* fixup
* Update dependencies from https://github.com/dotnet/toolset build 20191116.3

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19566.3

* fixup
…1116.4 (dotnet#5697)

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19566.4

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19566.1 (parent: Microsoft.Dotnet.Toolset.Internal)
@nguerrera

Copy link
Copy Markdown

Merging in latest of both sides and resolving conflicts...

@ViktorHofer

ViktorHofer commented Dec 4, 2019

Copy link
Copy Markdown
Member

@nguerrera @dsplaisted can you please help getting this in? We would like to take a dependency on a newer 5.0 SDK with a working variant for rhel.6.

@nguerrera

Copy link
Copy Markdown

Looking at this

@nguerrera

nguerrera commented Dec 5, 2019

Copy link
Copy Markdown

Replaced by #5812 via 3.1.2xx. I'll look at that one.

@nguerrera nguerrera closed this Dec 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants