diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index 5b844070a..48566a86d 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -1713,4 +1713,5 @@ IF %ERRORLEVEL% NEQ 0 (echo ====================================================
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj b/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj
index 5d807cfe0..3a8c02b37 100644
--- a/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj
+++ b/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj
@@ -159,4 +159,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
index 4cec487e4..5fc6088d6 100644
--- a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
+++ b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
@@ -146,4 +146,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj b/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj
index 49b40d46f..c2571ca05 100644
--- a/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj
+++ b/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj
@@ -125,4 +125,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj b/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj
index a16832663..f9607fcfc 100644
--- a/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj
+++ b/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj
@@ -121,4 +121,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj b/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj
index 66a955b50..ac04cc3d5 100644
--- a/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj
+++ b/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj
@@ -121,4 +121,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/gl/renderdoc_gl.vcxproj b/renderdoc/driver/gl/renderdoc_gl.vcxproj
index 51b0ba3f2..0ccc09150 100644
--- a/renderdoc/driver/gl/renderdoc_gl.vcxproj
+++ b/renderdoc/driver/gl/renderdoc_gl.vcxproj
@@ -196,4 +196,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/ihv/amd/AMD.vcxproj b/renderdoc/driver/ihv/amd/AMD.vcxproj
index 7d896674b..7e3bede54 100644
--- a/renderdoc/driver/ihv/amd/AMD.vcxproj
+++ b/renderdoc/driver/ihv/amd/AMD.vcxproj
@@ -132,4 +132,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj b/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj
index 8abea2bcb..85167105a 100644
--- a/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj
+++ b/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj
@@ -120,4 +120,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj b/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
index ea5cbffc6..f38eb7e6f 100644
--- a/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
+++ b/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
@@ -222,4 +222,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
index 858994159..684ea5944 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
@@ -206,4 +206,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoc/renderdoc.props b/renderdoc/renderdoc.props
new file mode 100644
index 000000000..26dba20d2
--- /dev/null
+++ b/renderdoc/renderdoc.props
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Thanks to https://stackoverflow.com/a/43815817/4070143 -->
+
+  <!-- fetch the path of the assembly, and unescape it so MSBuild doesn't choke on brackets in "Program Files (x86)" -->
+  <PropertyGroup>
+    <LibGit2SharpPath>$([MSBuild]::Unescape("$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\LibGit2Sharp.dll"))</LibGit2SharpPath>
+  </PropertyGroup>
+
+  <!-- Declare the task with some inline code -->
+  <UsingTask TaskName="GetGitCommit" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <Sha1 ParameterType="System.String" Required="False" Output="True" />
+      <Repository ParameterType="System.String" Required="True" Output="False" />
+      <LibGit2SharpAssemblyPath ParameterType="System.String" Required="True" Output="False" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="$(LibGit2SharpPath)" />
+      <Code Type="Class" Language="cs">
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+namespace GitIntrospection {
+  public class GetGitCommit : Microsoft.Build.Utilities.Task {
+    public override bool Execute() {
+      System.AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => {
+        if (args.Name.Contains("LibGit2Sharp")) {
+          return System.Reflection.Assembly.LoadFrom(LibGit2SharpAssemblyPath);
+        }
+        return null;
+      };
+      GetCommit();
+      return !Log.HasLoggedErrors;
+    }
+    private void GetCommit() {
+      try {
+        Sha1 = (new LibGit2Sharp.Repository(Repository)).Commits.First().Id.Sha;
+      } catch(LibGit2Sharp.RepositoryNotFoundException) {
+      }
+    }
+
+    [Microsoft.Build.Framework.Required] public string Repository { get; set; }
+    [Microsoft.Build.Framework.Required] public string LibGit2SharpAssemblyPath { get; set; }
+    [Microsoft.Build.Framework.Output] public string Sha1 { get; set; }
+  }
+}
+      </Code>
+    </Task>
+  </UsingTask>
+
+  <!-- Only actually run the task if we located the assembly for LibGit2Sharp. Otherwise silently skip this step. -->
+  <Target Name="RunTask" BeforeTargets="PrepareForBuild" Condition="exists('$(LibGit2SharpPath)')">
+    <GetGitCommit Repository="$(SolutionDir)" LibGit2SharpAssemblyPath="$(LibGit2SharpPath)" ContinueOnError="WarnAndContinue">
+      <Output TaskParameter="Sha1" PropertyName="CommitId" />
+    </GetGitCommit>
+    <Message Text="Building from Git commit $(CommitId)" />
+
+    <ItemGroup Condition="$(CommitId.Length) > 0">
+      <ClCompile>
+        <PreprocessorDefinitions>GIT_COMMIT_HASH="$(CommitId)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      </ClCompile>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj
index 6f7e3fd8d..345c55d55 100644
--- a/renderdoc/renderdoc.vcxproj
+++ b/renderdoc/renderdoc.vcxproj
@@ -488,4 +488,5 @@
     <Copy SourceFiles="$(ProjectDir)3rdparty\dbghelp\$(Platform)\dbghelp.dll" DestinationFolder="$(OutDir)">
     </Copy>
   </Target>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdoccmd/renderdoccmd.vcxproj b/renderdoccmd/renderdoccmd.vcxproj
index f37f243c2..5a681cffa 100644
--- a/renderdoccmd/renderdoccmd.vcxproj
+++ b/renderdoccmd/renderdoccmd.vcxproj
@@ -222,4 +222,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file
diff --git a/renderdocshim/renderdocshim.vcxproj b/renderdocshim/renderdocshim.vcxproj
index e6344a4e4..8b1667869 100644
--- a/renderdocshim/renderdocshim.vcxproj
+++ b/renderdocshim/renderdocshim.vcxproj
@@ -200,4 +200,5 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <Import Project="$(SolutionDir)\renderdoc\renderdoc.props" />
 </Project>
\ No newline at end of file