[Build] Update Nuke to 5.1.1

reegeek · reegeek · commit 2326e86743ef · 2021-04-24T23:07:23.000+02:00
diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v1
-      
+
       - name: Setup .NET 2.2
         uses: actions/setup-dotnet@v1
         with:
@@ -45,10 +45,17 @@ jobs:
         with:
           dotnet-version: 5.0.*
 
+      - name: Cache .nuke/temp, ~/.nuget/packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            .nuke/temp
+            ~/.nuget/packages
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
       - name: Run './build.cmd Test Pack'
         run: ./build.cmd Test Pack
         env:
-            GitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          GitHubToken: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/upload-artifact@v1
         with:
           name: test-results
diff --git a/.github/workflows/continuousCore.yml b/.github/workflows/continuousCore.yml
@@ -45,10 +45,17 @@ jobs:
         with:
           dotnet-version: 5.0.*
 
+      - name: Cache .nuke/temp, ~/.nuget/packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            .nuke/temp
+            ~/.nuget/packages
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
       - name: Run './build.cmd TestCoreOnly'
         run: ./build.cmd TestCoreOnly
         env:
-            GitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          GitHubToken: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/upload-artifact@v1
         with:
           name: test-results
@@ -58,31 +65,17 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v1
-
-      - name: Setup .NET 2.2
-        uses: actions/setup-dotnet@v1
+      - name: Cache .nuke/temp, ~/.nuget/packages
+        uses: actions/cache@v2
         with:
-          dotnet-version: 2.2.*
-
-      - name: Setup .NET 3.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.0.*
-
-      - name: Setup .NET 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.*
-
-      - name: Setup .NET 5.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.*
-
+          path: |
+            .nuke/temp
+            ~/.nuget/packages
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
       - name: Run './build.cmd TestCoreOnly'
         run: ./build.cmd TestCoreOnly
         env:
-            GitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          GitHubToken: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/upload-artifact@v1
         with:
           name: test-results
diff --git a/.nuke b/.nuke
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -0,0 +1,119 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Build Schema",
+  "$ref": "#/definitions/build",
+  "definitions": {
+    "build": {
+      "type": "object",
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
+          "enum": [
+            "Debug",
+            "Release"
+          ]
+        },
+        "Continue": {
+          "type": "boolean",
+          "description": "Indicates to continue a previously failed build attempt"
+        },
+        "GitHubToken": {
+          "type": "string",
+          "description": "GitHub Token"
+        },
+        "Help": {
+          "type": "boolean",
+          "description": "Shows the help text for this build assembly"
+        },
+        "Host": {
+          "type": "string",
+          "description": "Host for execution. Default is 'automatic'",
+          "enum": [
+            "AppVeyor",
+            "AzurePipelines",
+            "Bamboo",
+            "Bitrise",
+            "GitHubActions",
+            "GitLab",
+            "Jenkins",
+            "SpaceAutomation",
+            "TeamCity",
+            "Terminal",
+            "TravisCI"
+          ]
+        },
+        "NoLogo": {
+          "type": "boolean",
+          "description": "Disables displaying the NUKE logo"
+        },
+        "Plan": {
+          "type": "boolean",
+          "description": "Shows the execution plan (HTML)"
+        },
+        "Profile": {
+          "type": "array",
+          "description": "Defines the profiles to load",
+          "items": {
+            "type": "string"
+          }
+        },
+        "Root": {
+          "type": "string",
+          "description": "Root directory during build execution"
+        },
+        "Skip": {
+          "type": "array",
+          "description": "List of targets to be skipped. Empty list skips all dependencies",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Clean",
+              "Compile",
+              "CompileCoreOnly",
+              "Pack",
+              "PackCoreOnly",
+              "Restore",
+              "Test",
+              "TestCoreOnly"
+            ]
+          }
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded"
+        },
+        "Target": {
+          "type": "array",
+          "description": "List of targets to be invoked. Default is '{default_target}'",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Clean",
+              "Compile",
+              "CompileCoreOnly",
+              "Pack",
+              "PackCoreOnly",
+              "Restore",
+              "Test",
+              "TestCoreOnly"
+            ]
+          }
+        },
+        "TestPartition": {
+          "type": "string"
+        },
+        "Verbosity": {
+          "type": "string",
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "enum": [
+            "Minimal",
+            "Normal",
+            "Quiet",
+            "Verbose"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/.nuke/parameters.json b/.nuke/parameters.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "./build.schema.json",
+  "Solution": "StructLinq.sln"
+}
diff --git a/Build/Nuke/Build.AzurePipelinesAttribute.cs b/Build/Nuke/Build.AzurePipelinesAttribute.cs
@@ -61,7 +61,7 @@ protected override AzurePipelinesJob GetJob(ExecutableTarget executableTarget, L
             };
             var symbol = dictionary.GetValueOrDefault(job.Name);
             var prefix = symbol == null ? "" : $"{symbol} ";
-            job.DisplayName = job.PartitionName == null
+            job.DisplayName = job.Parallel == 0
                 ? $"{prefix}{job.DisplayName}"
                 : $"{prefix}{job.DisplayName} 🧩";
             return job;
diff --git a/Build/Nuke/NukeBuild.csproj b/Build/Nuke/NukeBuild.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net50</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <NoWarn>CS0649;CS0169</NoWarn>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <NukeRootDirectory>..\..</NukeRootDirectory>
     <NukeScriptDirectory>..\..</NukeScriptDirectory>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="5.0.2" />
+    <PackageReference Include="Nuke.Common" Version="5.1.1" />
     <PackageDownload Include="GitVersion.Tool" Version="[5.6.8]" />
   </ItemGroup>
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -36,6 +36,11 @@ stages:
         displayName: '⚙️ Compile'
         dependsOn: [ Setup ]
         steps:
+          - task: Cache@2
+            inputs:
+              key: $(Agent.OS) | **/global.json, **/*.csproj
+              restoreKeys: $(Agent.OS)
+              path: ~/.nuget/packages
           - task: CmdLine@2
             inputs:
               script: './build.cmd Restore Compile --skip'
@@ -45,6 +50,11 @@ stages:
         strategy:
           parallel: 4
         steps:
+          - task: Cache@2
+            inputs:
+              key: $(Agent.OS) | **/global.json, **/*.csproj
+              restoreKeys: $(Agent.OS)
+              path: ~/.nuget/packages
           - task: CmdLine@2
             inputs:
               script: './build.cmd Test --skip --test-partition $(System.JobPositionInPhase)'
@@ -56,6 +66,11 @@ stages:
         displayName: '📦 Pack'
         dependsOn: [ Compile ]
         steps:
+          - task: Cache@2
+            inputs:
+              key: $(Agent.OS) | **/global.json, **/*.csproj
+              restoreKeys: $(Agent.OS)
+              path: ~/.nuget/packages
           - task: CmdLine@2
             inputs:
               script: './build.cmd Pack --skip'
diff --git a/build.cmd b/build.cmd
@@ -1,6 +1,7 @@
 :; set -eo pipefail
-:; ./build.sh "$@"
+:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+:; ${SCRIPT_DIR}/build.sh "$@"
 :; exit $?
 
 @ECHO OFF
-powershell -ExecutionPolicy ByPass -NoProfile %0\..\build.ps1 %*
+powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*
diff --git a/build.ps1 b/build.ps1
@@ -13,19 +13,16 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 # CONFIGURATION
 ###########################################################################
 
-
 $BuildProjectFile = "$PSScriptRoot\Build\Nuke\NukeBuild.csproj"
+$TempDirectory = "$PSScriptRoot\\.nuke\temp"
 
-$TempDirectory = "$PSScriptRoot\.tmp"
-
-$DotNetGlobalFile = "$PSScriptRoot\global.json"
+$DotNetGlobalFile = "$PSScriptRoot\\global.json"
 $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
 $DotNetChannel = "Current"
 
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 $env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
 $env:DOTNET_MULTILEVEL_LOOKUP = 0
-$env:DOTNET_ROLL_FORWARD = "Major"
 
 ###########################################################################
 # EXECUTION
@@ -40,11 +37,11 @@ function ExecSafe([scriptblock] $cmd) {
 Get-Item -Path Env:* | Sort-Object -Property Name | ForEach-Object {"{0}={1}" -f $_.Name,$_.Value}
 
 # If dotnet CLI is installed globally and it matches requested version, use for execution
- if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
+if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
      $(dotnet --version) -and $LASTEXITCODE -eq 0) {
-     $env:DOTNET_EXE = (Get-Command "dotnet").Path
- }
- else {
+    $env:DOTNET_EXE = (Get-Command "dotnet").Path
+}
+else {
     # Download install script
     $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
     New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
@@ -67,11 +64,9 @@ Get-Item -Path Env:* | Sort-Object -Property Name | ForEach-Object {"{0}={1}" -f
         ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
     }
     $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
- }
-
-Write-Output "Path: $($env:DOTNET_EXE)"
+}
 
 Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
 
-ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary }
+ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
 ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }
diff --git a/build.sh b/build.sh

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "$schema": "./build.schema.json",
 +  "Solution": "StructLinq.sln"
 +}