# 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