diff --git a/Directory.Build.props b/Directory.Build.props
index 32117a114f1e0..56dd8a72a0ea3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,6 +10,8 @@
   -->
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" />
 
+  <Import Project="$(RepositoryEngineeringDir)DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />
+
   <!-- Common paths -->
   <PropertyGroup>
     <!-- Set these properties early enough for libraries as they import the Arcade SDK not early enough.  -->
@@ -30,13 +32,13 @@
     <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>
 
     <DocsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))</DocsDir>
-    <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir>    
+    <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'installer', 'manpages'))</ManPagesDir>
   </PropertyGroup>
 
   <!-- Packaging properties -->
   <PropertyGroup>
     <!--
-      This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used 
+      This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used
       to find source code for debugging. It is also used to name the build output manifest for orchestrated builds.
     -->
     <GitHubRepositoryName>runtime</GitHubRepositoryName>
@@ -45,4 +47,4 @@
     <LicenseUrl>https://github.com/dotnet/runtime/blob/master/LICENSE.TXT</LicenseUrl>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/Subsets.props b/eng/Subsets.props
index ce00016777ef9..2fcfa4950867e 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -48,7 +48,7 @@
   -->
 
   <PropertyGroup>
-    <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
+    <SkipImportArcadeSdkFromRoot Condition="'$(MSBuildProjectFile)' == 'Build.proj'">true</SkipImportArcadeSdkFromRoot>
   </PropertyGroup>
 
   <!-- Import only when imported by Arcade's Build.proj as we import Directory.Build.props ourselves. -->
@@ -69,7 +69,7 @@
 
   <ItemGroup>
     <!-- Global -->
-    <SubsetName Include="RegenerateReadmeTable" Category="" OnDemand="true" Description="Regenerates the table of asset links in the README.md file." />    
+    <SubsetName Include="RegenerateReadmeTable" Category="" OnDemand="true" Description="Regenerates the table of asset links in the README.md file." />
 
     <!-- Libraries -->
     <SubsetName Include="All" Category="Libraries" Description="The .NET libraries comprising the shared framework." />
@@ -97,7 +97,7 @@
 
   <!-- Installer sets -->
   <ItemGroup Condition="$(_subsetCategory.Contains('installer')) and $(_subset.Contains('corehost'))">
-    <CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost\build.proj" SignPhase="Binaries" />
+    <CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost\corehost.proj" SignPhase="Binaries" />
     <ProjectToBuild Include="@(CorehostProjectToBuild)" />
   </ItemGroup>
 
diff --git a/src/installer/corehost/build.proj b/src/installer/corehost/corehost.proj
similarity index 100%
rename from src/installer/corehost/build.proj
rename to src/installer/corehost/corehost.proj