File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -19,8 +19,11 @@ Task("Artifacts-DotnetTool-Test")
19
19
20
20
foreach ( var dockerImage in parameters . Docker . Images )
21
21
{
22
- var cmd = $ "dotnet tool install GitVersion.Tool --version { version } --tool-path { rootPrefix } /gitversion --add-source { rootPrefix } /nuget | out-null; ";
22
+ var cmd = $ "$result = dotnet tool install GitVersion.Tool --version { version } --tool-path { rootPrefix } /gitversion --add-source { rootPrefix } /nuget | out-null; ";
23
+ cmd += "if($LASTEXITCODE -eq 0) { " ;
23
24
cmd += $ "{ rootPrefix } /gitversion/dotnet-gitversion { rootPrefix } /repo /showvariable FullSemver;";
25
+ cmd += "} else { echo $result }" ;
26
+
24
27
25
28
DockerTestArtifact ( dockerImage , parameters , cmd ) ;
26
29
}
@@ -38,8 +41,10 @@ Task("Artifacts-MsBuild-Test")
38
41
foreach ( var dockerImage in parameters . Docker . Images )
39
42
{
40
43
var ( os , distro , targetframework ) = dockerImage ;
41
- var cmd = $ "dotnet build { rootPrefix } /repo/test --source { rootPrefix } /nuget --source https://api.nuget.org/v3/index.json -p:GitVersionTaskVersion={ version } -p:TargetFramework={ targetframework } | out-null; ";
44
+ var cmd = $ "$result = dotnet build { rootPrefix } /repo/test --source { rootPrefix } /nuget --source https://api.nuget.org/v3/index.json -p:GitVersionTaskVersion={ version } -p:TargetFramework={ targetframework } *>&1; ";
45
+ cmd += "if($LASTEXITCODE -eq 0) { " ;
42
46
cmd += $ "dotnet { rootPrefix } /repo/test/build/corefx/{ targetframework } /TestRepo.dll;";
47
+ cmd += "} else { echo $result }" ;
43
48
44
49
DockerTestArtifact ( dockerImage , parameters , cmd ) ;
45
50
}
You can’t perform that action at this time.
0 commit comments