Merge branch 'master' into dev/dagood/into-master
authorDavis Goodin <dagood@microsoft.com>
Fri, 19 Jul 2019 03:43:36 +0000 (22:43 -0500)
committerDavis Goodin <dagood@microsoft.com>
Fri, 19 Jul 2019 03:43:36 +0000 (22:43 -0500)
# Conflicts:
# BranchInfo.props
# dir.props
# src/managed/CommonManaged.props
# src/test/HostActivation.Tests/DependencyResolution/PortableAppRidAssetResolution.cs
# src/test/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs
# tools-local/setuptools/dotnet-deb-tool/dotnet-deb-tool.csproj

Commit migrated from https://github.com/dotnet/core-setup/commit/76796fa18c0d23279f0d92205eaf3b8b62cd1a73

1  2 
src/installer/test/HostActivation.Tests/Constants.cs
src/installer/test/HostActivation.Tests/DependencyResolution/ComponentDependencyResolutionBase.cs
src/installer/test/HostActivation.Tests/DependencyResolution/DependencyResolutionBase.cs
src/installer/test/HostActivation.Tests/DependencyResolution/DependencyResolutionCommandResultExtensions.cs
src/installer/test/HostActivation.Tests/DependencyResolution/PerAssemblyVersionResolution.cs
src/installer/test/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs
src/installer/test/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs
src/installer/test/HostActivation.Tests/DotNetBuilder.cs
src/installer/test/HostActivation.Tests/NetCoreAppBuilder.cs
src/installer/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs