Respond to PR feedback

* Move WaitForUtcNowToAdvance to reusable place and reuse it appropriately
* Add comment explaining ".." in path
* Remove unnecessary TestLibrary restore

Author: nguerrera

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

@@ -80,15 +80,5 @@ public void ResolvePackageAssets_runs_incrementally()
             var cacheWriteTime4 = File.GetLastWriteTimeUtc(assetsCachePath);
             cacheWriteTime4.Should().NotBe(cacheWriteTime3);
         }
-
-        private static void WaitForUtcNowToAdvance()
-        {
-            var start = DateTime.UtcNow;
-
-            while (DateTime.UtcNow <= start)
-            {
-                Thread.Sleep(millisecondsTimeout: 1);
-            }
-        }
     }
 }

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs

@@ -114,6 +114,7 @@ public void It_does_not_build_when_nobuild_is_set(string targetFramework, string
 
             // capture modification time of all binaries before publish
             var modificationTimes = GetLastWriteTimesUtc(buildCommand, "*.exe", "*.dll", "*.resources", "*.pdb");
+            WaitForUtcNowToAdvance();
 
             // publish (with NoBuild set)
             publishCommand.Execute("/p:NoBuild=true").Should().Pass();
@@ -140,7 +141,7 @@ private static IEnumerable<string> EnumerateFiles(MSBuildCommand command, params
         {
             return searchPatterns.SelectMany(
                 pattern => Directory.EnumerateFiles(
-                    Path.Combine(command.ProjectRootPath, ".."),
+                    Path.Combine(command.ProjectRootPath, ".."), // up one level from TestApp to also get TestLibrary P2P files
                     pattern,
                     SearchOption.AllDirectories));
         }
@@ -162,7 +163,6 @@ private PublishCommand GetPublishCommand(string targetFramework, [CallerMemberNa
                 });
 
             testAsset.Restore(Log, "TestApp");
-            testAsset.Restore(Log, "TestLibrary");
 
             var appProjectDirectory = Path.Combine(testAsset.TestRoot, "TestApp");
 

src/Tests/Microsoft.NET.TestFramework/SdkTest.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using Xunit.Abstractions;
 
 namespace Microsoft.NET.TestFramework
@@ -20,5 +21,15 @@ protected SdkTest(ITestOutputHelper log)
         {
             Log = log;
         }
+
+        protected static void WaitForUtcNowToAdvance()
+        {
+            var start = DateTime.UtcNow;
+
+            while (DateTime.UtcNow <= start)
+            {
+                Thread.Sleep(millisecondsTimeout: 1);
+            }
+        }
     }
 }