Minor tweaks. Noticed the presence of MSBuild_Logs, which I haven't s…

…een before -> not sure what that means and if it's an issue, but made reference to broken pipes.
dotnet · Aug 18, 2021 · 820a580 · 820a580
1 parent 3512c06
commit 820a580
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/dotnet-monitor.sln b/dotnet-monitor.sln
@@ -38,7 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.Tool.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj", "{0DBE362D-82F1-4740-AE6A-40C1A82EDCDB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.ExecuteApp", "src\Tests\Microsoft.Diagnostics.Monitoring.ExecuteActionApp\Microsoft.Diagnostics.Monitoring.ExecuteApp.csproj", "{A5A0CAAB-C200-44D2-BC93-8445C6E748AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.ExecuteActionApp", "src\Tests\Microsoft.Diagnostics.Monitoring.ExecuteActionApp\Microsoft.Diagnostics.Monitoring.ExecuteActionApp.csproj", "{A5A0CAAB-C200-44D2-BC93-8445C6E748AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/....Diagnostics.Monitoring.ExecuteApp.csproj → ...ostics.Monitoring.ExecuteActionApp.csproj b/....Diagnostics.Monitoring.ExecuteApp.csproj → ...ostics.Monitoring.ExecuteActionApp.csproj
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.ExecuteActionApp/Program.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.ExecuteActionApp/Program.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Threading;
 
-namespace Microsoft.Diagnostics.Monitoring.ExecuteApp
+namespace Microsoft.Diagnostics.Monitoring.ExecuteActionApp
 {
     internal class Program
     {

diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ExecuteActionTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ExecuteActionTests.cs
@@ -63,10 +63,10 @@ public async Task ExecuteAction_TokenCancellation()
             options.Path = DotNetHost.HostExePath;
             options.Arguments = GenerateArgumentsString(new string[] { "TokenCancellation" }); ;
 
-            TaskCanceledException invalidOperationException = await Assert.ThrowsAsync<TaskCanceledException>(
+            TaskCanceledException taskCanceledException = await Assert.ThrowsAsync<TaskCanceledException>(
                 () => action.ExecuteAsync(options, null, CreateCancellationToken()));
 
-            Assert.Contains(TaskCanceledMessage, invalidOperationException.Message);
+            Assert.Contains(TaskCanceledMessage, taskCanceledException.Message);
         }
 
         [Fact]
@@ -108,9 +108,7 @@ public async Task ExecuteAction_InvalidPath()
             string uniquePathName = Guid.NewGuid().ToString();
 
             options.Path = uniquePathName;
-            options.Arguments = Assembly.GetExecutingAssembly().Location.Replace(
-                Assembly.GetExecutingAssembly().GetName().Name,
-                "Microsoft.Diagnostics.Monitoring.ExecuteApp");
+            options.Arguments = GenerateArgumentsString(Array.Empty<string>());
 
             FileNotFoundException fileNotFoundException = await Assert.ThrowsAsync<FileNotFoundException>(
                 () => action.ExecuteAsync(options, null, CreateCancellationToken()));
@@ -122,7 +120,7 @@ private static string GenerateArgumentsString(string[] additionalArgs)
         {
             return Assembly.GetExecutingAssembly().Location.Replace(
                 Assembly.GetExecutingAssembly().GetName().Name,
-                "Microsoft.Diagnostics.Monitoring.ExecuteApp") + ' ' + string.Join(' ', additionalArgs);
+                "Microsoft.Diagnostics.Monitoring.ExecuteActionApp") + ' ' + string.Join(' ', additionalArgs);
         }
 
         private static CancellationToken CreateCancellationToken()

diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/ExecuteAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/ExecuteAction.cs
@@ -29,7 +29,6 @@ public async Task<CollectionRuleActionResult> ExecuteAsync(ExecuteOptions option
             using Process process = new Process();
 
             process.StartInfo = new ProcessStartInfo(path, arguments);
-
             process.EnableRaisingEvents = true;
 
             // Completion source that is signaled when the process exits

diff --git a/...otnet-monitor/MSBuild_Logs/MSBuild_pid-20748_0f5b6cf9316c46308d2e3abe6d4df13b.failure.txt b/...otnet-monitor/MSBuild_Logs/MSBuild_pid-20748_0f5b6cf9316c46308d2e3abe6d4df13b.failure.txt