diff --git a/gc-azure-pipelines.yml b/gc-azure-pipelines.yml
index cf6b208a8ee..1d1fd31fb48 100644
--- a/gc-azure-pipelines.yml
+++ b/gc-azure-pipelines.yml
@@ -1,5 +1,5 @@
-# Project: src\benchmarks\gc\GC.Infrastructure\GC.Infrastructure.NotebookTests\GC.Infrastructure.NotebookTests.csproj. 
-# Output: artifacts\bin\GC.Infrastructure.NotebookTests\Debug\net8.0\GC.Infrastructure.NotebookTests.dll
+# Project: src/benchmarks/gc/GC.Infrastructure/GC.Infrastructure.Core.UnitTests/GC.Infrastructure.Core.UnitTests.csproj.
+# Output: artifacts\bin\GC.Infrastructure.Core.UnitTests\Debug\net8.0\GC.Infrastructure.Core.UnitTests.dll
 
 resources:
   containers:
@@ -26,15 +26,15 @@ pr:
 jobs:
 
   # TODO: Add back once we have validated windows.
-  # - job: GCNotebookValidation_Ubuntu
+  # - job: GCInfrastructureValidation_Ubuntu
   #     pool:
   #       vmImage: ubuntu-latest
   #     container: ubuntu_x64_build_container
 
   # TODO: Add.
-  - job: GCNotebookValidation_Windows 
+  - job: GCInfrastructureValidation_Windows
     pool:
-      vmImage: windows-2019
+      vmImage: windows-2025
  
     steps:
     # Install dotnet. We temporarily need both .NET 8 (for building and running the projects) and .NET 9 (for installing deps).
@@ -52,10 +52,17 @@ jobs:
       inputs:
         version: 10.0.x
         includePreviewVersions: true
+    - task: UseDotNet@2
+      displayName: Install .NET 11.0 
+      inputs:
+        version: 11.0.x
+        includePreviewVersions: true
     - script: dotnet tool restore
     - script: dotnet tool install --global dotnet-repl 
-    - script: dotnet build src/benchmarks/gc/GC.Infrastructure/GC.Infrastructure.NotebookTests/GC.Infrastructure.NotebookTests.csproj --configuration Debug --framework net8.0
-    - script: dotnet build src/benchmarks/gc/GC.Infrastructure/GC.Analysis.API/GC.Analysis.API.csproj --configuration Release --framework net8.0
+    - script: dotnet build src/benchmarks/gc/GC.Infrastructure/GC.Infrastructure.Core/GC.Infrastructure.Core.csproj --configuration Debug --framework net8.0
+    - script: dotnet build src/benchmarks/gc/GC.Infrastructure/GC.Infrastructure.Core.UnitTests/GC.Infrastructure.Core.UnitTests.csproj --configuration Debug --framework net8.0
+    - script: dotnet build src/benchmarks/gc/GC.Infrastructure/GC.Analysis.API/GC.Analysis.API.csproj --configuration Debug --framework net8.0
+    - script: dotnet build src/benchmarks/gc/GC.Infrastructure/GC.Analysis.API.UnitTests/GC.Analysis.API.UnitTests.csproj --configuration Debug --framework net8.0
 
     # Run tests. Template installed from: https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/vstest-v3?view=azure-pipelines
     - task: VSTest@3
@@ -63,16 +70,36 @@ jobs:
         # -------------- #
         # Test selection #
         # -------------- #
-        testAssemblyVer2: GC.Infrastructure.NotebookTests.dll
-        searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/bin/GC.Infrastructure.NotebookTests/Debug/net8.0'
+        testAssemblyVer2: GC.Infrastructure.Core.UnitTests.dll
+        searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/bin/GC.Infrastructure.Core.UnitTests/Debug/net8.0'
+        otherConsoleOptions: '--Framework:net8.0'
         # Uncomment to save results in the future.
         # resultsFolder: '$(Agent.TempDirectory)\TestResults' # string. Test results folder. Default: $(Agent.TempDirectory)\TestResults.
 
         # ----------------- #
         # Reporting options #
         # ----------------- #
-        testRunTitle: 'GC Notebook Test' 
+        testRunTitle: 'GC Infrastructure Core Unit Test'
         # TODO: Double Check.
         platform: 'Windows' ## string. Build platform. 
         # TODO: Double Check.
-        configuration: 'Test Notebooks' # string. Build configuration. 
\ No newline at end of file
+        configuration: 'Test GC Infrastructure Core' # string. Build configuration.
+    - task: VSTest@3
+      inputs:
+        # -------------- #
+        # Test selection #
+        # -------------- #
+        testAssemblyVer2: GC.Analysis.API.UnitTests.dll
+        searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/bin/GC.Analysis.API.UnitTests/Debug/net8.0'
+        otherConsoleOptions: '--Framework:net8.0'
+        # Uncomment to save results in the future.
+        # resultsFolder: '$(Agent.TempDirectory)\TestResults' # string. Test results folder. Default: $(Agent.TempDirectory)\TestResults.
+
+        # ----------------- #
+        # Reporting options #
+        # ----------------- #
+        testRunTitle: 'GC Analysis API Unit Test'
+        # TODO: Double Check.
+        platform: 'Windows' ## string. Build platform.
+        # TODO: Double Check.
+        configuration: 'Test GC Analysis API' # string. Build configuration.