diff --git a/Directory.Build.props b/Directory.Build.props
index d354b43f1d..801c9ed79e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,5 +16,6 @@
     <RepositoryType>git</RepositoryType>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <EnableSourceControlManagerQueries>true</EnableSourceControlManagerQueries>
+    <GitHubRepositoryName>diagnostics</GitHubRepositoryName>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
index 929f82d0fa..256e12c243 100644
--- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
+++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
@@ -11,9 +11,11 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeSymbols>true</IncludeSymbols>
     <IsShipping>true</IsShipping>
+    <BuildingOutsideDiagnostics>false</BuildingOutsideDiagnostics>
+    <BuildingOutsideDiagnostics Condition="'$(GitHubRepositoryName)' != 'diagnostics'">true</BuildingOutsideDiagnostics>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(GitHubRepositoryName)' == 'runtime'">
+  <PropertyGroup Condition="$(BuildingOutsideDiagnostics)">
     <DefineConstants>$(DefineConstants);DIAGNOSTICS_RUNTIME</DefineConstants>
     <NoWarn>CS1591,CS8073,CS0162</NoWarn>
   </PropertyGroup>
@@ -36,6 +38,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Condition="'$(GitHubRepositoryName)' == 'runtime'" Include="**/*.cs" />
+    <Compile Condition="$(BuildingOutsideDiagnostics)" Include="**/*.cs" />
   </ItemGroup>
 </Project>