(build) artifacts using pwsh scripts

Author: arturcic

build.config

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-DOTNET_VERSION=2.1.803,3.1.102
+DOTNET_VERSION=2.1.804,3.1.102

build/artifacts-test.cake

@@ -6,6 +6,10 @@ Task("Artifacts-Prepare")
     .IsDependentOnWhen("Pack-Nuget", singleStageRun)
     .Does<BuildParameters>((parameters) =>
 {
+    foreach(var dockerImage in parameters.Docker.Images)
+    {
+        DockerPullImage(dockerImage, parameters);
+    }
 });
 
 Task("Artifacts-DotnetTool-Test")
@@ -19,10 +23,7 @@ Task("Artifacts-DotnetTool-Test")
 
     foreach(var dockerImage in parameters.Docker.Images)
     {
-        var cmd = $"$result = dotnet tool install GitVersion.Tool --version {version} --tool-path {rootPrefix}/gitversion --add-source {rootPrefix}/nuget | out-null; ";
-        cmd += "if($LASTEXITCODE -eq 0) { ";
-        cmd += $"{rootPrefix}/gitversion/dotnet-gitversion {rootPrefix}/repo /showvariable FullSemver;";
-        cmd += "} else { echo $result }";
+        var cmd = $"-file {rootPrefix}/scripts/Test-DotnetGlobalTool.ps1 -version {version} -repoPath {rootPrefix}/repo -nugetPath {rootPrefix}/nuget -toolPath {rootPrefix}/gitversion";
 
         DockerTestArtifact(dockerImage, parameters, cmd);
     }
@@ -40,10 +41,8 @@ Task("Artifacts-MsBuild-Test")
     foreach(var dockerImage in parameters.Docker.Images)
     {
         var (os, distro, targetframework) = dockerImage;
-        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; ";
-        cmd += "if($LASTEXITCODE -eq 0) { ";
-        cmd += $"dotnet {rootPrefix}/repo/test/build/corefx/{targetframework}/TestRepo.dll;";
-        cmd += "} else { echo $result }";
+
+        var cmd = $"-file {rootPrefix}/scripts/Test-MsBuild.ps1 -version {version} -repoPath {rootPrefix}/repo/test -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
 
         DockerTestArtifact(dockerImage, parameters, cmd);
     }

build/utils/docker.cake

@@ -99,14 +99,19 @@ void DockerTestArtifact(DockerImage dockerImage, BuildParameters parameters, str
     var (os, distro, targetframework) = dockerImage;
     var tag = $"gittools/build-images:{distro}-sdk-{targetframework.Replace("netcoreapp", "")}";
 
-    cmd = "-Command " + cmd; // powershell 7 needs a -Command parameter
-
     Information("Docker tag: {0}", tag);
-    Information("Docker cmd: {0}", cmd);
+    Information("Docker cmd: pwsh {0}", cmd);
 
     DockerTestRun(settings, parameters, tag, "pwsh", cmd);
 }
 
+void DockerPullImage(DockerImage dockerImage, BuildParameters parameters)
+{
+    var (os, distro, targetframework) = dockerImage;
+    var tag = $"gittools/build-images:{distro}-sdk-{targetframework.Replace("netcoreapp", "")}";
+    DockerPull(tag);
+}
+
 DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
 {
     var currentDir = MakeAbsolute(Directory("."));
@@ -116,7 +121,8 @@ DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
         Volume = new[]
         {
             $"{currentDir}:{parameters.DockerRootPrefix}/repo",
-            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{parameters.DockerRootPrefix}/nuget"
+            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{parameters.DockerRootPrefix}/nuget",
+            $"{currentDir}/test-scripts:{parameters.DockerRootPrefix}/scripts"
         }
     };
 

src/Docker/docker.json

@@ -17,10 +17,10 @@
     },
     "windows": {
         "2.1": [
-            "nanoserver-1809"
+            "nanoserver"
         ],
         "3.1": [
-            "nanoserver-1809"
+            "nanoserver"
         ]
     }
 }

test-scripts/Test-DotnetGlobalTool.ps1

@@ -0,0 +1,14 @@
+param(
+    [parameter(Mandatory=$true, Position=0)][string] $version,
+    [parameter(Mandatory=$true, Position=1)][string] $nugetPath,
+    [parameter(Mandatory=$true, Position=2)][string] $repoPath,
+    [parameter(Mandatory=$true, Position=3)][string] $toolPath
+)
+
+$result = dotnet tool install GitVersion.Tool --version $version --tool-path $toolPath --add-source $nugetPath | out-null;
+
+if($LASTEXITCODE -eq 0) {
+    & "$rootPrefix/gitversion/dotnet-gitversion" $repoPath /showvariable FullSemver;
+} else {
+    Write-Output $result
+}

test-scripts/Test-MsBuild.ps1

@@ -0,0 +1,14 @@
+param(
+    [parameter(Mandatory=$true, Position=0)][string] $version,
+    [parameter(Mandatory=$true, Position=1)][string] $nugetPath,
+    [parameter(Mandatory=$true, Position=2)][string] $repoPath,
+    [parameter(Mandatory=$true, Position=3)][string] $targetframework
+)
+
+$result = dotnet build $repoPath --source $nugetPath --source https://api.nuget.org/v3/index.json -p:GitVersionTaskVersion=$version -p:TargetFramework=$targetframework *>&1;
+
+if($LASTEXITCODE -eq 0) {
+    & "dotnet" $repoPath/build/corefx/$targetframework/TestRepo.dll;
+} else {
+    Write-Output $result
+}

test/TestRepoCore.csproj

@@ -15,6 +15,7 @@
   </Target>
 
   <ItemGroup>
+	<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
     <PackageReference Include="GitVersionTask" Version="$(GitVersionTaskVersion)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>