diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets
index b9f3b6f6e..410cd753d 100644
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@@ -86,40 +86,14 @@
+ DependsOnTargets="CreateTestAssetPackageNuPkgs;">
+ ProjectPath=""$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln"" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs b/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs
index a11e149cb..e1bcbcbf8 100644
--- a/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs
+++ b/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs
@@ -138,50 +138,6 @@ namespace Microsoft.DotNet.TestFramework
return new DirectoryInfo(Path.Combine(baseDirectory, callingMethod + identifier, _assetName));
}
- private IEnumerable LoadInventory(FileInfo file)
- {
- if (!file.Exists)
- {
- return Enumerable.Empty();
- }
-
- var inventory = new List();
-
- var lines = file.OpenText();
-
- while (lines.Peek() > 0)
- {
- inventory.Add(new FileInfo(lines.ReadLine()));
- }
-
- return inventory;
- }
-
- private void SaveInventory(FileInfo file, IEnumerable inventory)
- {
- FileUtility.ReplaceWithLock(
- filePath =>
- {
- if (!_dataDirectory.Exists)
- {
- _dataDirectory.Create();
- }
-
- using (var stream =
- new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None))
- {
- using (var writer = new StreamWriter(stream))
- {
- foreach (var path in inventory.Select(i => i.FullName))
- {
- writer.WriteLine(path);
- }
- }
- }
- },
- file.FullName);
- }
-
private IEnumerable GetFileList()
{
return _root.GetFiles("*.*", SearchOption.AllDirectories)
@@ -195,15 +151,6 @@ namespace Microsoft.DotNet.TestFramework
Action action)
{
var inventory = Enumerable.Empty();
- if (file.Exists)
- {
- inventory = LoadInventory(file);
- }
-
- if(inventory.Any())
- {
- return inventory;
- }
IEnumerable preInventory;
@@ -216,26 +163,21 @@ namespace Microsoft.DotNet.TestFramework
preInventory = beforeAction();
}
- Task.Run(async () => await ConcurrencyUtilities.ExecuteWithFileLockedAsync