Merge pull request #3022 from hvitved/csharp/autobuild/dotnet-clean-try

calumgrant · web-flow · commit 945418869d77 · 2020-03-16T15:10:32.000Z
C#: Ignore `dotnet clean` exit code in autobuilder
diff --git a/csharp/autobuilder/Semmle.Autobuild/DotNetRule.cs b/csharp/autobuilder/Semmle.Autobuild/DotNetRule.cs
@@ -50,7 +50,7 @@ public BuildScript Analyse(Autobuilder builder, bool auto)
 
                         var build = GetBuildScript(builder, dotNetPath, environment, compatibleClr, projectOrSolution.FullPath);
 
-                        ret &= clean & BuildScript.Try(restore) & build;
+                        ret &= BuildScript.Try(clean) & BuildScript.Try(restore) & build;
                     }
                     return ret;
                 });

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public BuildScript Analyse(Autobuilder builder, bool auto)`
`50`	`50`
`51`	`51`	`var build = GetBuildScript(builder, dotNetPath, environment, compatibleClr, projectOrSolution.FullPath);`
`52`	`52`
`53`		`- ret &= clean & BuildScript.Try(restore) & build;`
	`53`	`+ ret &= BuildScript.Try(clean) & BuildScript.Try(restore) & build;`
`54`	`54`	`}`
`55`	`55`	`return ret;`
`56`	`56`	`});`