From: Davis Goodin Date: Fri, 19 Jul 2019 03:43:36 +0000 (-0500) Subject: Merge branch 'master' into dev/dagood/into-master X-Git-Tag: submit/tizen/20210909.063632~11032^2~122^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69d35087f7e031469095d089e550acf1ce78284d;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Merge branch 'master' into dev/dagood/into-master # 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 --- 69d35087f7e031469095d089e550acf1ce78284d diff --cc src/installer/test/HostActivation.Tests/DependencyResolution/ComponentDependencyResolutionBase.cs index 0000000,4dcdfc7..4dcdfc7 mode 000000,100644..100644 --- a/src/installer/test/HostActivation.Tests/DependencyResolution/ComponentDependencyResolutionBase.cs +++ b/src/installer/test/HostActivation.Tests/DependencyResolution/ComponentDependencyResolutionBase.cs diff --cc src/installer/test/HostActivation.Tests/DependencyResolution/PerAssemblyVersionResolution.cs index 0000000,8f78af9..8f78af9 mode 000000,100644..100644 --- a/src/installer/test/HostActivation.Tests/DependencyResolution/PerAssemblyVersionResolution.cs +++ b/src/installer/test/HostActivation.Tests/DependencyResolution/PerAssemblyVersionResolution.cs diff --cc src/installer/test/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs index 0000000,ed9062e..ed9062e mode 000000,100644..100644 --- a/src/installer/test/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs +++ b/src/installer/test/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs