diff --git a/BuildTools/BuildTools.proj b/BuildTools/BuildTools.proj
index cf7a0d52..c150d30c 100644
--- a/BuildTools/BuildTools.proj
+++ b/BuildTools/BuildTools.proj
@@ -14,6 +14,6 @@
     <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="$(LastWin32MetadataReleaseVersion)" GeneratePathProperty="True">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Direct3D.D3D12" Version="1.618.2" GeneratePathProperty="true"/>
+    <PackageReference Include="Microsoft.Direct3D.D3D12" Version="1.618.5" GeneratePathProperty="true"/>
   </ItemGroup>
 </Project>
diff --git a/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.h b/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.h
index 82cfbe61..4a0d4d5d 100644
--- a/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.h
+++ b/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.h
@@ -1163,6 +1163,8 @@ extern "C"{
 
 #define	D3D12_MIP_LOD_RANGE_BIT_COUNT	( 8 )
 
+#define	D3D12_MS_DISPATCH_MAX_THREAD_GROUPS_PER_GRID	( 4194303 )
+
 #define D3D12_MULTISAMPLE_ANTIALIAS_LINE_WIDTH	( 1.4f )
 #define	D3D12_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT	( 0 )
 
@@ -1479,6 +1481,8 @@ extern "C"{
 
 #define	D3D12_WORK_GRAPHS_BACKING_MEMORY_ALIGNMENT_IN_BYTES	( 8 )
 
+#define	D3D12_WORK_GRAPHS_DISPATCH_MAX_THREAD_GROUPS_PER_GRID	( 16777215 )
+
 #define	D3D12_WORK_GRAPHS_MAX_NODE_DEPTH	( 32 )
 
 #endif
diff --git a/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.idl b/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.idl
index f87746ab..a3f01256 100644
--- a/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.idl
+++ b/generation/WinSDK/RecompiledIdlHeaders/um/d3d12.idl
@@ -287,6 +287,7 @@ cpp_quote("#define D3D12_MIP_LOD_BIAS_MAX	( 15.99f )")
 cpp_quote("#define D3D12_MIP_LOD_BIAS_MIN	( -16.0f )")
 const UINT D3D12_MIP_LOD_FRACTIONAL_BIT_COUNT = 8;
 const UINT D3D12_MIP_LOD_RANGE_BIT_COUNT = 8;
+const UINT D3D12_MS_DISPATCH_MAX_THREAD_GROUPS_PER_GRID = 4194303;
 cpp_quote("#define D3D12_MULTISAMPLE_ANTIALIAS_LINE_WIDTH	( 1.4f )")
 const UINT D3D12_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT = 0;
 const UINT D3D12_OS_RESERVED_REGISTER_SPACE_VALUES_END = 0xffffffff;
@@ -451,6 +452,7 @@ const UINT D3D12_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT = 10;
 const UINT D3D12_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP = 25;
 const UINT D3D12_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP = 25;
 const UINT D3D12_WORK_GRAPHS_BACKING_MEMORY_ALIGNMENT_IN_BYTES = 8;
+const UINT D3D12_WORK_GRAPHS_DISPATCH_MAX_THREAD_GROUPS_PER_GRID = 16777215;
 const UINT D3D12_WORK_GRAPHS_MAX_NODE_DEPTH = 32;
 cpp_quote("#endif")
 
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index e88e365e..4d8c2ed3 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -65,3 +65,6 @@ Windows.Win32.NetworkManagement.WindowsFilteringPlatform.IPSEC_SA_CONTEXT_ENUM_H
 Windows.Win32.NetworkManagement.WindowsFilteringPlatform.IPSEC_SA_ENUM_HANDLE added
 # Make ITfCandidateListUIElement::GetPageIndex pIndex parameter optional
 Windows.Win32.UI.TextServices.ITfCandidateListUIElement.GetPageIndex : pIndex : [NativeArrayInfo(CountParamIndex=1),Out] => [NativeArrayInfo(CountParamIndex=1),Optional,Out]
+# Upgrade D3D12 Agility SDK to 1.618.5
+Windows.Win32.Graphics.Direct3D12.Apis.D3D12_MS_DISPATCH_MAX_THREAD_GROUPS_PER_GRID added
+Windows.Win32.Graphics.Direct3D12.Apis.D3D12_WORK_GRAPHS_DISPATCH_MAX_THREAD_GROUPS_PER_GRID added