diff --git a/Directory.Build.props b/Directory.Build.props
index 3fcf35e8..75d32e1f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -48,13 +48,15 @@
     <Company>Microsoft</Company>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/microsoft/Omex</RepositoryUrl>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <Tags>Omex</Tags>
     <Description>$(MSBuildProjectName)</Description>
+    <Tags>Omex</Tags>
   </PropertyGroup>
   <PropertyGroup Label="Debug Information" >
+    <EnableSourceControlManagerQueries Condition="'$(CommitSha)' != ''">false</EnableSourceControlManagerQueries>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/microsoft/Omex</RepositoryUrl>
+    <RevisionId>$(CommitSha)</RevisionId>
     <!-- Don't need them due to source linking -->
     <IncludeSource>false</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
@@ -65,5 +67,6 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <!-- Optional: Include the PDB in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <SourceRootLocation>$(MSBuildThisFileDirectory)</SourceRootLocation>
   </PropertyGroup>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 00a79cad..bd4a8f3e 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -10,4 +10,7 @@
   <ItemGroup Condition="'$(UseVstsSourceLink)' == ''">
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(Microsoft_SourceLink_GitHub_Version)" PrivateAssets="All"/>
   </ItemGroup>
+  <ItemGroup Condition="'$(CommitSha)' != ''">
+    <SourceRoot Include="$(SourceRootLocation)" RepositoryUrl="$(RepositoryUrl)" SourceControl="git" RevisionId="$(CommitSha)" />
+  </ItemGroup>
 </Project>
\ No newline at end of file