Merge remote-tracking branch 'upstream/release/3.0.1xx' into merges/release/3.0.1xx-to-master
* upstream/release/3.0.1xx: Update dependencies from https://github.com/dotnet/cli build 20190716.7 (#3269) Update dependencies from https://github.com/dotnet/toolset build 20190716.11 Update dependencies from https://github.com/dotnet/templating build 20190715.3 (#3243) [release/3.0.1xx] Update dependencies from dotnet/toolset (#3252) Update dependencies from https://github.com/dotnet/cli build 20190715.13 (#3253) Update dependencies from https://github.com/aspnet/AspNetCore build 20190715.7 (#3250) Update dependencies from https://github.com/dotnet/toolset build 20190713.14 (#3159) Update dependencies from https://github.com/dotnet/cli build 20190713.8 (#3157) Update dependencies from https://github.com/dotnet/toolset build 20190713.13 (#3156) Update dependencies from https://github.com/aspnet/AspNetCore build 20190713.1 (#3154) Update dependencies from https://github.com/dotnet/toolset build 20190713.1 (#3129) Update dependencies from https://github.com/dotnet/toolset build 20190712.26 (#3128) Update dependencies from https://github.com/dotnet/cli build 20190712.17 (#3126) Update dependencies from https://github.com/dotnet/toolset build 20190712.23 (#3122) Update dependencies from https://github.com/dotnet/core-setup build 20190712.14 (#3121) [release/3.0.1xx] Update dependencies from dotnet/toolset (#3104) Update dependencies from https://github.com/dotnet/cli build 20190712.9 (#3105) [release/3.0.1xx] Update dependencies from dotnet/sdk (#3101) Conflicts: eng/Version.Details.xml eng/Versions.props
This commit is contained in:
commit
21cf12ad86