feedback

src/NuGet.Core/NuGet.Common/Migrations/Migration1.cs

@@ -79,8 +79,7 @@ void AddAllParentDirectoriesUpToHome(string path)
             {
                 pathsToCheck.Add(path);
 
-                // Unix-based systems support only the forward slash which is returned by Path.AltDirectorySeparatorChar
-                if (!path.StartsWith(homePath + Path.AltDirectorySeparatorChar, StringComparison.Ordinal))
+                if (!path.StartsWith(homePath + Path.DirectorySeparatorChar, StringComparison.Ordinal))
                 {
                     return;
                 }

src/NuGet.Core/NuGet.Common/Migrations/MigrationRunner.cs

@@ -32,33 +32,36 @@ public static void Run()
                 // so use a global mutex and then check if someone else already did the work.
                 using (var mutex = new Mutex(false, "NuGet-Migrations"))
                 {
+                    bool captured;
                     try
                     {
-                        if (mutex.WaitOne(TimeSpan.FromMinutes(1), false))
+                        captured = mutex.WaitOne(TimeSpan.FromMinutes(1), false);
+                    }
+                    catch (AbandonedMutexException ex)
+                    {
+                        ex.Mutex?.ReleaseMutex();
+                        captured = true;
+                    }
+                    if (captured)
+                    {
+                        if (!File.Exists(expectedMigrationFilename))
                         {
-                            if (!File.Exists(expectedMigrationFilename))
+                            // Only run migrations that have not already been run
+                            int highestMigrationRun = GetHighestMigrationRun(migrationsDirectory);
+                            for (int i = highestMigrationRun + 1; i < Migrations.Count; i++)
                             {
-                                // Only run migrations that have not already been run
-                                int highestMigrationRun = GetHighestMigrationRun(migrationsDirectory);
-                                for (int i = highestMigrationRun + 1; i < Migrations.Count; i++)
+                                try
                                 {
-                                    try
-                                    {
-                                        Migrations[i]();
-                                        // Create file for every migration run, so that if an older version of NuGet is run, it doesn't try to run
-                                        // migrations again.
-                                        string migrationFile = Path.Combine(migrationsDirectory, (i + 1).ToString(CultureInfo.InvariantCulture));
-                                        File.WriteAllText(migrationFile, string.Empty);
-                                    }
-                                    catch { }
+                                    Migrations[i]();
+                                    // Create file for every migration run, so that if an older version of NuGet is run, it doesn't try to run
+                                    // migrations again.
+                                    string migrationFile = Path.Combine(migrationsDirectory, (i + 1).ToString(CultureInfo.InvariantCulture));
+                                    File.WriteAllText(migrationFile, string.Empty);
                                 }
+                                catch { }
                             }
-                            mutex.ReleaseMutex();
                         }
-                    }
-                    catch (AbandonedMutexException ex)
-                    {
-                        ex.Mutex?.ReleaseMutex();
+                        mutex.ReleaseMutex();
                     }
                 }
             }

test/NuGet.Core.Tests/NuGet.Common.Test/MigrationRunnerTests.cs

@@ -1,12 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
+using System.Threading;
 using NuGet.Common.Migrations;
-using NuGet.PackageManagement;
 using Xunit;
 
 namespace NuGet.Common.Test
@@ -15,25 +13,29 @@ namespace NuGet.Common.Test
     public class MigrationRunnerTests
     {
         [Fact]
-        public async Task WhenExecutedInParallelOnlyOneFileIsCreatedForEveryMigration_SuccessAsync()
+        public void WhenExecutedInParallelOnlyOneFileIsCreatedForEveryMigration_Success()
         {
-            var tasks = new List<Task>();
+            var threads = new List<Thread>();
 
             // Arrange
             string directory = MigrationRunner.GetMigrationsDirectory();
             if (Directory.Exists(directory))
                 Directory.Delete(path: directory, recursive: true);
 
             // Act
-            for(int count = 0; count < 5; count++)           
-                tasks.Add(Task.Run(() => MigrationRunner.Run()));  
+            for (int count = 0; count < 5; count++)
+            {
+                var thread = new Thread(MigrationRunner.Run);
+                thread.Start();
+                threads.Add(thread);
+            }
 
-            Task t = Task.WhenAll(tasks);
-            await t;
+            foreach (var thread in threads)
+            {
+                thread.Join();
+            }
 
             // Assert
-            Assert.True(t.IsCompleted);
-            Assert.Equal(TaskStatus.RanToCompletion, t.Status);
             Assert.True(Directory.Exists(directory));
             Assert.Equal(1, Directory.GetFiles(directory).Length);
         }