diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index ef4be98a7..19f989d1e 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -32,6 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\Microsoft.DotNet.Cli.BundledTemplates.proj = build\Microsoft.DotNet.Cli.BundledTemplates.proj
 		build\Microsoft.DotNet.Cli.BundledTemplates.props = build\Microsoft.DotNet.Cli.BundledTemplates.props
 		build\Microsoft.DotNet.Cli.Compile.targets = build\Microsoft.DotNet.Cli.Compile.targets
+		build\Microsoft.DotNet.Cli.CoreSetupInfo.props = build\Microsoft.DotNet.Cli.CoreSetupInfo.props
 		build\Microsoft.DotNet.Cli.DependencyVersions.props = build\Microsoft.DotNet.Cli.DependencyVersions.props
 		build\Microsoft.DotNet.Cli.FileExtensions.props = build\Microsoft.DotNet.Cli.FileExtensions.props
 		build\Microsoft.DotNet.Cli.GitCommitInfo.targets = build\Microsoft.DotNet.Cli.GitCommitInfo.targets
diff --git a/build/Microsoft.DotNet.Cli.BranchInfo.props b/build/Microsoft.DotNet.Cli.BranchInfo.props
index b9c1f1852..5510dc8b9 100644
--- a/build/Microsoft.DotNet.Cli.BranchInfo.props
+++ b/build/Microsoft.DotNet.Cli.BranchInfo.props
@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <Channel>master</Channel>
-    <CoreSetupChannel>master</CoreSetupChannel>
     <BranchName>master</BranchName>
   </PropertyGroup>
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.CoreSetupInfo.props b/build/Microsoft.DotNet.Cli.CoreSetupInfo.props
new file mode 100644
index 000000000..16d4628c2
--- /dev/null
+++ b/build/Microsoft.DotNet.Cli.CoreSetupInfo.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <CoreSetupChannel>master</CoreSetupChannel>
+  </PropertyGroup>
+</Project>
diff --git a/dir.props b/dir.props
index 505bb6f82..be733b87a 100644
--- a/dir.props
+++ b/dir.props
@@ -9,6 +9,7 @@
   <Import Condition=" Exists('$(HostInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(HostInfoProps)" />
   
   <Import Project="build/Microsoft.DotNet.Cli.BranchInfo.props" />
+  <Import Project="build/Microsoft.DotNet.Cli.CoreSetupInfo.props" />
 
   <Import Project="build/Microsoft.DotNet.Cli.DependencyVersions.props" />
   <Import Project="build/Microsoft.DotNet.Cli.FileExtensions.props" />