diff --git a/src/Cli/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Cli/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs
index d583a660b066..6c04aeb99b33 100644
--- a/src/Cli/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs
+++ b/src/Cli/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs
@@ -58,6 +58,9 @@ public void Configure()
             if (ShouldPrintFirstTimeUseNotice())
             {
                 Stopwatch beforeFirstTimeUseNotice = Stopwatch.StartNew();
+                // Migrate the nuget state from earlier SDKs
+                NuGet.Common.Migrations.MigrationRunner.Run();
+
                 if (!_dotnetFirstRunConfiguration.NoLogo)
                 {
                     PrintFirstTimeMessageWelcome();
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs
index 68c9dc91114c..83341f2cda5e 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs
@@ -353,6 +353,12 @@ static int Last2DigitsTo0(int versionBuild)
         [InlineData("net6.0")]
         public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_contained(string targetFramework) {
 
+            // There's a bug when using the 6.0 SDK with 17.4 but we have limited control over the VS version used in helix
+            Version.TryParse(TestContext.Current.ToolsetUnderTest.MSBuildVersion, out Version msbuildVersion);
+            Version.TryParse("17.4.0", out Version maximumVersion);
+            if (msbuildVersion >= maximumVersion)
+                return;
+
             // create a basic library and a basic app, reference the library from the app and then
             // publish the app with a RID specified and self-contained.
             // verify that no warnings about missing the --self-contained flag are emitted.