diff --git a/.gitmodules b/.gitmodules
index d30b825732..3e20502e0f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 	path = nuget/helpers/lib/NuGet.Client
 	url = https://github.com/NuGet/NuGet.Client
 	branch = release-6.12.x
+[submodule "nuget/helpers/lib/dotnet-core"]
+	path = nuget/helpers/lib/dotnet-core
+	url = https://github.com/dotnet/core
diff --git a/nuget/helpers/lib/NuGetUpdater/.gitignore b/nuget/helpers/lib/NuGetUpdater/.gitignore
index 6b39588b66..3a80b6dc44 100644
--- a/nuget/helpers/lib/NuGetUpdater/.gitignore
+++ b/nuget/helpers/lib/NuGetUpdater/.gitignore
@@ -4,4 +4,5 @@ bin/
 obj/
 Properties/launchSettings.json
 NuGetUpdater.sln.DotSettings.user
+NuGetUpdater.Core/dotnet-package-correlation.json
 *.binlog
diff --git a/nuget/helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Program.cs b/nuget/helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Program.cs
index 65e8ca248a..db0c576f7c 100644
--- a/nuget/helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Program.cs
+++ b/nuget/helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Program.cs
@@ -20,8 +20,8 @@ public static async Task<int> Main(string[] args)
             // the tool is expected to be given the path to the .NET Core repository, but the correlator only needs a specific subdirectory
             var releaseNotesDirectory = new DirectoryInfo(Path.Combine(coreLocationDirectory.FullName, "release-notes"));
             var correlator = new Correlator(releaseNotesDirectory);
-            var result = await correlator.RunAsync();
-            var json = JsonSerializer.Serialize(result, Correlator.SerializerOptions);
+            var (packages, _warnings) = await correlator.RunAsync();
+            var json = JsonSerializer.Serialize(packages, Correlator.SerializerOptions);
             await File.WriteAllTextAsync(output.FullName, json);
         }, coreLocationOption, outputOption);
         var exitCode = await command.InvokeAsync(args);
diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/EnsureDotNetPackageCorrelation.targets b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/EnsureDotNetPackageCorrelation.targets
new file mode 100644
index 0000000000..42e20bebcb
--- /dev/null
+++ b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/EnsureDotNetPackageCorrelation.targets
@@ -0,0 +1,24 @@
+<Project>
+
+  <PropertyGroup>
+    <PackageCorrelationDirectory>$(MSBuildThisFileDirectory)..\DotNetPackageCorrelation</PackageCorrelationDirectory>
+    <DotNetCoreDirectory>$(MSBuildThisFileDirectory)..\..\dotnet-core</DotNetCoreDirectory>
+    <PackageCorrelationFile>$(MSBuildThisFileDirectory)dotnet-package-correlation.json</PackageCorrelationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(PackageCorrelationFile)" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <Target Name="BuildDotNetPackageCorrelationFile" BeforeTargets="Build" DependsOnTargets="Restore">
+    <Exec Command="dotnet run --core-location &quot;$(DotNetCoreDirectory)&quot; --output &quot;$(PackageCorrelationFile)&quot;" WorkingDirectory="$(PackageCorrelationDirectory)" />
+  </Target>
+
+  <Target Name="CleanDotNetPackageCorrelationFile" BeforeTargets="Clean">
+    <Delete Files="$(PackageCorrelationFile)" Condition="Exists('$(PackageCorrelationFile)')" />
+  </Target>
+
+  <Target Name="RebuildDotNetPackageCorrelationFile" BeforeTargets="Rebuild" DependsOnTargets="CleanDotNetPackageCorrelationFile">
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/NuGetUpdater.Core.csproj b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/NuGetUpdater.Core.csproj
index 7bb1102c92..e01f1bbebd 100644
--- a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/NuGetUpdater.Core.csproj
+++ b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/NuGetUpdater.Core.csproj
@@ -31,4 +31,6 @@
     <InternalsVisibleTo Include="NuGetUpdater.Core.Test" />
   </ItemGroup>
 
+  <Import Project="EnsureDotNetPackageCorrelation.targets" />
+
 </Project>
diff --git a/nuget/helpers/lib/dotnet-core b/nuget/helpers/lib/dotnet-core
new file mode 160000
index 0000000000..649080cc3a
--- /dev/null
+++ b/nuget/helpers/lib/dotnet-core
@@ -0,0 +1 @@
+Subproject commit 649080cc3a0e927abb88d05591256e23c29e2170