ff

dellis1972 · dellis1972 · commit fa2d459d206a · 2021-01-07T12:47:49.000Z
diff --git a/tests/MSBuildDeviceIntegration/Tests/DeploymentTest.cs b/tests/MSBuildDeviceIntegration/Tests/DeploymentTest.cs
@@ -64,10 +64,11 @@ public void AfterDeploymentTests ()
 			if (HasDevices && proj != null)
 				RunAdbCommand ($"uninstall {proj.PackageName}");
 
-			if (TestContext.CurrentContext.Result.FailCount == 0 && builder != null && Directory.Exists (Path.Combine (Root, builder.ProjectDirectory)))
-				Directory.Delete (Path.Combine (Root, builder.ProjectDirectory), recursive: true);
+			string output = Path.Combine (Root, builder.ProjectDirectory);
+			if (TestContext.CurrentContext.Result.FailCount == 0 && builder != null && Directory.Exists (output))
+				Directory.Delete (output, recursive: true);
 
-			foreach (var file in Directory.GetFiles (Path.Combine (Root, builder.ProjectDirectory), "*.log", SearchOption.AllDirectories)) {
+			foreach (var file in Directory.GetFiles (output, "*.log", SearchOption.AllDirectories)) {
 				TestContext.AddTestAttachment (file, Path.GetFileName (output));
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,11 @@ public void AfterDeploymentTests ()`
`64`	`64`	`if (HasDevices && proj != null)`
`65`	`65`	`RunAdbCommand ($"uninstall {proj.PackageName}");`
`66`	`66`
`67`		`- if (TestContext.CurrentContext.Result.FailCount == 0 && builder != null && Directory.Exists (Path.Combine (Root, builder.ProjectDirectory)))`
`68`		`- Directory.Delete (Path.Combine (Root, builder.ProjectDirectory), recursive: true);`
	`67`	`+ string output = Path.Combine (Root, builder.ProjectDirectory);`
	`68`	`+ if (TestContext.CurrentContext.Result.FailCount == 0 && builder != null && Directory.Exists (output))`
	`69`	`+ Directory.Delete (output, recursive: true);`
`69`	`70`
`70`		`- foreach (var file in Directory.GetFiles (Path.Combine (Root, builder.ProjectDirectory), "*.log", SearchOption.AllDirectories)) {`
	`71`	`+ foreach (var file in Directory.GetFiles (output, "*.log", SearchOption.AllDirectories)) {`
`71`	`72`	`TestContext.AddTestAttachment (file, Path.GetFileName (output));`
`72`	`73`	`}`
`73`	`74`	`}`