diff --git a/Directory.Build.props b/Directory.Build.props
index ee3df9e5b..f011ac19c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -33,6 +33,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.231" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8ad57eb8f..6bfa4c338 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -343,7 +343,52 @@ jobs:
       version: 2.1.x
   - powershell: dotnet tool update --global nbgv
     displayName: ⚙ Install nbgv
-  - script: dotnet pack -c $(BuildConfiguration)
+  - script: dotnet build -c $(BuildConfiguration)
+    displayName: 🏭 dotnet build
+    workingDirectory: apidocs
+  - task: EsrpCodeSigning@1
+    displayName: ✒ Assembly sign
+    inputs:
+      ConnectedServiceName: Xlang Code Signing
+      FolderPath: $(System.DefaultWorkingDirectory)/bin/$(BuildConfiguration)/netstandard2.0
+      Pattern: '*.dll'
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-230012",
+            "operationSetCode": "SigntoolSign",
+            "parameters": [
+              {
+                "parameterName": "OpusName",
+                "parameterValue": "Microsoft"
+              },
+              {
+                "parameterName": "OpusInfo",
+                "parameterValue": "http://www.microsoft.com"
+              },
+              {
+                "parameterName": "PageHash",
+                "parameterValue": "/NPH"
+              },
+              {
+                "parameterName": "FileDigest",
+                "parameterValue": "/fd sha256"
+              },
+              {
+                "parameterName": "TimeStamp",
+                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+              }
+            ],
+            "toolName": "signtool.exe",
+            "toolVersion": "6.2.9304.0"
+          }
+        ]
+      SessionTimeout: 60
+      MaxConcurrency: 50
+      MaxRetryAttempts: 5
+    condition: and(succeeded(), eq(variables['SignFiles'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))
+  - script: dotnet pack Microsoft.Windows.SDK.Win32Docs --no-build -c $(BuildConfiguration) -p:BuildProjectReferences=false
     displayName: 📦 dotnet pack
     workingDirectory: apidocs
   - task: EsrpCodeSigning@1
diff --git a/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj b/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj
index 2f2ff88eb..ba4294a81 100644
--- a/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj
+++ b/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj
@@ -23,8 +23,4 @@
     <ProjectReference Include="..\Win32MetadataInterop\Win32MetadataInterop.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/sources/ConstantsScraper/ConstantsScraper.csproj b/sources/ConstantsScraper/ConstantsScraper.csproj
index 6397980d9..56994cc57 100644
--- a/sources/ConstantsScraper/ConstantsScraper.csproj
+++ b/sources/ConstantsScraper/ConstantsScraper.csproj
@@ -13,8 +13,4 @@
     <ProjectReference Include="..\MetadataUtils\MetadataUtils.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj b/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj
index e9ad51f2f..6fed8c9f7 100644
--- a/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj
+++ b/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj
@@ -15,8 +15,4 @@
     <ProjectReference Include="..\..\MetadataUtils\MetadataUtils.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/sources/MetadataUtils/MetadataUtils.csproj b/sources/MetadataUtils/MetadataUtils.csproj
index c4a12f98d..9e227581f 100644
--- a/sources/MetadataUtils/MetadataUtils.csproj
+++ b/sources/MetadataUtils/MetadataUtils.csproj
@@ -22,8 +22,4 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/sources/Win32MetadataInterop/Win32MetadataInterop.csproj b/sources/Win32MetadataInterop/Win32MetadataInterop.csproj
index 583640316..de7687486 100644
--- a/sources/Win32MetadataInterop/Win32MetadataInterop.csproj
+++ b/sources/Win32MetadataInterop/Win32MetadataInterop.csproj
@@ -16,8 +16,4 @@
     <NoWarn>1701;1702;0649</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/sources/WinmdUtils/WinmdUtils.csproj b/sources/WinmdUtils/WinmdUtils.csproj
index 57e25fdbe..54f4b4206 100644
--- a/sources/WinmdUtils/WinmdUtils.csproj
+++ b/sources/WinmdUtils/WinmdUtils.csproj
@@ -15,8 +15,4 @@
     <ProjectReference Include="..\Win32MetadataInterop\Win32MetadataInterop.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj b/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj
index 85093ebce..f44bd6bd8 100644
--- a/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj
+++ b/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj
@@ -14,12 +14,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\sources\ClangSharpSourceToWinmd\ClangSharpSourceToWinmd.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
 </Project>
diff --git a/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj b/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj
index 864d69bfd..2d04b7f8e 100644
--- a/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj
+++ b/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj
@@ -45,8 +45,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/tests/TestCommon/TestCommon.csproj b/tests/TestCommon/TestCommon.csproj
index e095c6435..351e524e7 100644
--- a/tests/TestCommon/TestCommon.csproj
+++ b/tests/TestCommon/TestCommon.csproj
@@ -8,8 +8,4 @@
     <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/tests/VtablesFromPdb/VtablesFromPdb.csproj b/tests/VtablesFromPdb/VtablesFromPdb.csproj
index c9e9e6b43..6afee797e 100644
--- a/tests/VtablesFromPdb/VtablesFromPdb.csproj
+++ b/tests/VtablesFromPdb/VtablesFromPdb.csproj
@@ -26,8 +26,4 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>
diff --git a/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj b/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj
index 9d0bb1094..7f57bc611 100644
--- a/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj
+++ b/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="$(LastWin32MetadataReleaseVersion)" GeneratePathProperty="True">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    
+
   </ItemGroup>
 
   <ItemGroup>
@@ -46,8 +46,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
-  </ItemGroup>
-
 </Project>