Merge branch 'hotfix/6.0.2' into develop

RLittlesII · Apr 12, 2022 · c748538 · c748538
2 parents d045671 + 39e3bc3
commit c748538
Show file tree

Hide file tree

Showing 59 changed files with 2,403 additions and 135 deletions.
diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Run './build.cmd Test Pack'
         run: ./build.cmd Test Pack
         env:
-          GITHUB_CONTEXT: ${{ toJSON(github) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   ubuntu-latest:
     name: ubuntu-latest
     runs-on: ubuntu-latest
@@ -57,7 +57,7 @@ jobs:
       - name: Run './build.cmd Test Pack'
         run: ./build.cmd Test Pack
         env:
-          GITHUB_CONTEXT: ${{ toJSON(github) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   macOS-latest:
     name: macOS-latest
     runs-on: macOS-latest
@@ -73,4 +73,4 @@ jobs:
       - name: Run './build.cmd Test Pack'
         run: ./build.cmd Test Pack
         env:
-          GITHUB_CONTEXT: ${{ toJSON(github) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -11,7 +11,7 @@
         },
         "CodecovToken": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "Configuration": {
           "type": "string",
@@ -26,11 +26,11 @@
         },
         "GitHubRegistryApiKey": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "GitterAuthToken": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "GitterRoomId": {
           "type": "string"
@@ -91,15 +91,15 @@
         },
         "PublicNuGetApiKey": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "Root": {
           "type": "string",
           "description": "Root directory during build execution"
         },
         "SignPathApiToken": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "SignPathOrganizationId": {
           "type": "string"
@@ -146,7 +146,7 @@
         },
         "SlackWebhook": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "Solution": {
           "type": "string",
@@ -188,19 +188,19 @@
         },
         "TwitterAccessToken": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "TwitterAccessTokenSecret": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "TwitterConsumerKey": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "TwitterConsumerSecret": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "UseHttps": {
           "type": "boolean"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added GitHub Actions support for submodules and fetch-depth
 - Added AppVeyor support for submodules
 
+## [6.0.2] / 2022-04-13
+- Fixed `Update` command to use `net6.0`
+- Fixed handling of common errors
+- Fixed assertion messages to only include argument expression when message is `null`
+- Fixed log file pattern to use `-` instead of `:` for time
+- Fixed padding of target names in logging
+- Fixed logging to use `ExecutingTarget` instead of `Target` to reduce clashing
+- Fixed concurrent writing of shell-completion files
+- Fixed telemetry to check for interactive console
+- Fixed passing build instance for value injection in components
+- Fixed `ValueInjectionAttributeBase.GetMemberValue` to consider members from components
+- Fixed resolution of members from parameter files
+- Fixed reporting of exceptions in summary when not thrown from targets
+- Fixed naming for .NET SDK in bootstrapping scripts
+- Fixed GitHub Actions to use `GITHUB_TOKEN` instead of `GITHUB_CONTEXT`
+- Fixed GitHub Actions assertion messages
+- Fixed missing output types for `ReportGeneratorTasks`
+- Fixed missing arguments for `HelmTasks`
+- Fixed missing arguments for `SonarScannerTasks`
+- Fixed missing command for `KubernetesTasks`
+- Fixed path resolution in `PowerShellTasks` to use PowerShell Core on non-Windows systems
+- Fixed missing runtime types in `NSwagTasks`
+
 ## [6.0.1] / 2022-01-10
 - Fixed invisible output for `SystemConsoleHostTheme`
 - Fixed `GetRelativePath` for same parts in different places
@@ -883,7 +906,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added CLT tasks for Git
 - Fixed background color in console output
 
-[vNext]: https://github.com/nuke-build/nuke/compare/6.0.1...HEAD
+[vNext]: https://github.com/nuke-build/nuke/compare/6.0.2...HEAD
+[6.0.2]: https://github.com/nuke-build/nuke/compare/6.0.1...6.0.2
 [6.0.1]: https://github.com/nuke-build/nuke/compare/6.0.0...6.0.1
 [6.0.0]: https://github.com/nuke-build/nuke/compare/5.3.0...6.0.0
 [5.3.0]: https://github.com/nuke-build/nuke/compare/5.2.1...5.3.0

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,10 @@
+# docker build --no-cache --progress=plain -t my-image .
+ARG registryUrl
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder
+
+WORKDIR /
+COPY ./ /code
+
+WORKDIR /code/build
+RUN dotnet run
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ NUKE builds and tests itself on several different CI servers, which helps ensuri
 - [AvaloniaUI](https://avaloniaui.net/) <sup><a href="https://github.com/AvaloniaUI/Avalonia">1</a></sup>
 - **[Aviva Solutions B.V.](https://www.avivasolutions.nl/)** <sup><a href="https://github.com/avivasolutionsnl/sitecore-commerce-docker">1</a> <a href="https://github.com/avivasolutionsnl/sitecore-docker">2</a></sup>
 - [ChilliCream](https://chillicream.com/) <sup><a href="https://github.com/ChilliCream/hotchocolate">1</a></sup>
-- [CvsHelper](https://joshclose.github.io/CsvHelper/) <sup><a href="https://github.com/JoshClose/CsvHelper">1</a></sup>
+- [CsvHelper](https://joshclose.github.io/CsvHelper/) <sup><a href="https://github.com/JoshClose/CsvHelper">1</a></sup>
 - [DNN Community](https://dnncommunity.org/) <sup><a href="https://github.com/DNNCommunity/Dnn.ModuleCreator">1</a></sup>
 - [FluentAssertions](https://fluentassertions.com/) <sup><a href="https://github.com/fluentassertions/fluentassertions">1</a></sup>
 - **[JetBrains s.r.o.](https://www.jetbrains.com/)** <sup><a href="https://github.com/JetBrains/space-dotnet-sdk">1</a> <a href="https://github.com/JetBrains/YouTrackSharp">2</a></sup>

diff --git a/build.ps1 b/build.ps1
@@ -74,7 +74,7 @@ else {
     $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
 }
 
-Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
+Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
 
 ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary }
 ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }
diff --git a/build.sh b/build.sh
@@ -67,7 +67,7 @@ else
     export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
 fi
 
-echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
+echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
 
 "$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary
 "$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"
diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs
@@ -15,7 +15,7 @@
     PublishArtifacts = false,
     InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
     CacheKeyFiles = new[] { "global.json", "source/**/*.csproj" },
-    EnableGitHubContext = true)]
+    EnableGitHubToken = true)]
 partial class Build
 {
 }
diff --git a/source/Directory.Build.props b/source/Directory.Build.props
@@ -41,19 +41,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.EndsWith('Tests'))">
     <PackageReference Include="coverlet.msbuild" Version="3.1.0" />
-    <PackageReference Include="FluentAssertions" Version="6.1.0"/>
+    <PackageReference Include="FluentAssertions" Version="6.6.0"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.27"/>
-    <PackageReference Include="Verify.Xunit" Version="13.2.2" />
-    <PackageReference Include="Verify.DiffPlex" Version="1.0.0" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36"/>
+    <PackageReference Include="Verify.Xunit" Version="16.5.4" />
+    <PackageReference Include="Verify.DiffPlex" Version="1.2.0" />
     <PackageReference Include="xunit" Version="2.4.1"/>
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0"/>
+    <PackageReference Include="GitHubActionsTestLogger" Version="1.3.0"/>
   </ItemGroup>
 
 </Project>
diff --git a/...enerationTest.Test_testName=simple-triggers_attribute=GitHubActionsAttribute.verified.txt b/...enerationTest.Test_testName=simple-triggers_attribute=GitHubActionsAttribute.verified.txt
@@ -35,7 +35,7 @@ jobs:
         run: ./build.cmd Test
         env:
           ApiKey: ${{ secrets.API_KEY }}
-          GITHUB_CONTEXT: ${{ toJSON(github) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/upload-artifact@v1
         with:
           name: src
@@ -64,7 +64,7 @@ jobs:
         run: ./build.cmd Test
         env:
           ApiKey: ${{ secrets.API_KEY }}
-          GITHUB_CONTEXT: ${{ toJSON(github) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/upload-artifact@v1
         with:
           name: src
@@ -93,7 +93,7 @@ jobs:
         run: ./build.cmd Test
         env:
           ApiKey: ${{ secrets.API_KEY }}
-          GITHUB_CONTEXT: ${{ toJSON(github) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/upload-artifact@v1
         with:
           name: src

diff --git a/source/Nuke.Common.Tests/CI/ConfigurationGenerationTest.cs b/source/Nuke.Common.Tests/CI/ConfigurationGenerationTest.cs
@@ -126,7 +126,7 @@ public class TestBuild : NukeBuild
                         On = new[] { GitHubActionsTrigger.Push, GitHubActionsTrigger.PullRequest },
                         InvokedTargets = new[] { nameof(Test) },
                         ImportSecrets = new[] { nameof(ApiKey) },
-                        EnableGitHubContext = true
+                        EnableGitHubToken = true
                     }
                 );
 

diff --git a/source/Nuke.Common.Tests/ExecutionTestsInitializer.cs b/source/Nuke.Common.Tests/ExecutionTestsInitializer.cs
@@ -0,0 +1,20 @@
+// Copyright 2022 Maintainers of NUKE.
+// Distributed under the MIT License.
+// https://github.com/nuke-build/nuke/blob/master/LICENSE
+
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Nuke.Common.Execution;
+
+namespace Nuke.Common.Tests
+{
+    public static class ExecutionTestsInitializer
+    {
+        [ModuleInitializer]
+        public static void Initialize()
+        {
+            Environment.SetEnvironmentVariable(Telemetry.OptOutEnvironmentKey, "true");
+        }
+    }
+}
diff --git a/source/Nuke.Common.Tests/SchemaUtilityTest.TestGetBuildSchema.verified.txt b/source/Nuke.Common.Tests/SchemaUtilityTest.TestGetBuildSchema.verified.txt
@@ -1,4 +1,4 @@
-{
+{
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Build Schema",
   "$ref": "#/definitions/build",
@@ -71,7 +71,7 @@
         },
         "Secret": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "Skip": {
           "type": "array",

diff --git a/source/Nuke.Common.Tests/SettingsTest.cs b/source/Nuke.Common.Tests/SettingsTest.cs
@@ -11,6 +11,7 @@
 using Nuke.Common.Tools.Xunit;
 using Nuke.Common.IO;
 using Nuke.Common.Tooling;
+using Nuke.Common.Utilities;
 using Xunit;
 
 namespace Nuke.Common.Tests
@@ -37,15 +38,15 @@ public void TestMSBuild()
                     .SetConfiguration("Release")
                     .DisableNodeReuse()
                     .EnableNoLogo(),
-                $"{projectFile} /nodeReuse:False /nologo /p:Platform=AnyCPU /p:Configuration=Release");
+                $"{projectFile.ToString().DoubleQuoteIfNeeded()} /nodeReuse:False /nologo /p:Platform=AnyCPU /p:Configuration=Release");
 
             Assert<MSBuildSettings>(x => x
                     .SetProjectFile(solutionFile)
                     .SetTargetPlatform(MSBuildTargetPlatform.MSIL)
                     .EnableNodeReuse()
                     .DisableNoLogo()
                     .ToggleRunCodeAnalysis(),
-                $"{solutionFile} /nodeReuse:True /p:Platform=\"Any CPU\" /p:RunCodeAnalysis=True");
+                $"{solutionFile.ToString().DoubleQuoteIfNeeded()} /nodeReuse:True /p:Platform=\"Any CPU\" /p:RunCodeAnalysis=True");
         }
 
         [Fact]
@@ -77,7 +78,7 @@ public void TestOpenCover()
                     .SetTargetPath(projectFile)
                     .AddFilters("+[*]*", "-[xunit.*]*", "-[NUnit.*]*")
                     .SetTargetArguments("-diagnostics -HTML \"new folder\\data.xml\""),
-                $"-target:{projectFile} -targetargs:\"-diagnostics -HTML \\\"new folder\\data.xml\\\"\" -filter:\"+[*]* -[xunit.*]* -[NUnit.*]*\"");
+                $"-target:{projectFile.ToString().DoubleQuoteIfNeeded()} -targetargs:\"-diagnostics -HTML \\\"new folder\\data.xml\\\"\" -filter:\"+[*]* -[xunit.*]* -[NUnit.*]*\"");
         }
     }
 }
diff --git a/source/Nuke.Common.Tests/VerifyTestsInitializer.cs b/source/Nuke.Common.Tests/VerifyTestsInitializer.cs
@@ -15,7 +15,7 @@ public static class VerifyTestsInitializer
         public static void Initialize()
         {
             Environment.SetEnvironmentVariable("DiffEngine_Disabled", "true");
-            VerifierSettings.DisableClipboard();
+            Environment.SetEnvironmentVariable("Verify_DisableClipboard", "true");
             VerifyDiffPlex.Initialize();
         }
     }