Skip to content

Commit b29f842

Browse files
authored
Merge pull request #29040 from dotnet/marcpopMSFT-callnugetcleanup4xx
Migrate the nuget state from earlier SDKs
2 parents 2fc0b9c + 6fa3515 commit b29f842

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/Cli/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ public void Configure()
5858
if (ShouldPrintFirstTimeUseNotice())
5959
{
6060
Stopwatch beforeFirstTimeUseNotice = Stopwatch.StartNew();
61+
// Migrate the nuget state from earlier SDKs
62+
NuGet.Common.Migrations.MigrationRunner.Run();
63+
6164
if (!_dotnetFirstRunConfiguration.NoLogo)
6265
{
6366
PrintFirstTimeMessageWelcome();

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,12 @@ static int Last2DigitsTo0(int versionBuild)
354354
public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_contained(string targetFramework)
355355
{
356356

357+
// 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
358+
Version.TryParse(TestContext.Current.ToolsetUnderTest.MSBuildVersion, out Version msbuildVersion);
359+
Version.TryParse("17.4.0", out Version maximumVersion);
360+
if (msbuildVersion >= maximumVersion)
361+
return;
362+
357363
// create a basic library and a basic app, reference the library from the app and then
358364
// publish the app with a RID specified and self-contained.
359365
// verify that no warnings about missing the --self-contained flag are emitted.

0 commit comments

Comments
 (0)