Merge branch 'release/6.0.0'

* release/6.0.0:
  (GH-118) Update Cake.Incubator to target Cake v1.0.0
  (GH-128) Compile against .NET 5.0
  (GH-127) Add dependabot configuration
  (GH-126) Add more GHA workflows

.github/dependabot.yml

@@ -0,0 +1,18 @@
+version: 2
+updates:
+ - package-ecosystem: "nuget"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ commit-message:
+ prefix: "(maint)"
+ target-branch: "develop"
+ ignore:
+ - dependency-name: "Cake.Core"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ commit-message:
+ prefix: "(maint)"
+ target-branch: "develop"

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,56 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+ push:
+ branches: [develop]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [develop]
+ schedule:
+ - cron: '0 15 * * 6'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ # Override automatic language detection by changing the below list
+ # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+ language: ['csharp']
+ # Learn more...
+ # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2.3.4
+ with:
+ fetch-depth: 0
+
+ # If this run was triggered by a pull request event, then checkout
+ # the head of the pull request instead of the merge commit.
+ - run: git checkout HEAD^2
+ if: ${{ github.event_name == 'pull_request' }}
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file. 
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+ - run: ./build.ps1
+ shell: pwsh
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1

.github/workflows/dependabot-cake.yml

@@ -0,0 +1,13 @@
+name: Run dependabot for cake
+on:
+ workflow_dispatch:
+ schedule:
+ # run everyday at 6
+ - cron: '0 6 * * *'
+
+jobs:
+ dependabot-cake:
+ runs-on: ubuntu-latest # linux, because this is a docker-action
+ steps:
+ - name: check/update cake dependencies
+ uses: nils-org/dependabot-cake-action@v1

.github/workflows/publishDocs.yml

@@ -0,0 +1,36 @@
+name: Publish Documentation
+
+on:
+ workflow_dispatch:
+
+env:
+ WYAM_ACCESS_TOKEN: ${{ secrets.API_TOKEN }}
+ # secrets.GITHUB_TOKEN has no permissions to push, sadly.
+ WYAM_DEPLOY_BRANCH: 'gh-pages'
+ WYAM_DEPLOY_REMOTE: "${{ github.event.repository.html_url }}"
+
+jobs:
+ cake:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: checkout
+ uses: actions/checkout@v2.3.4 #https://github.com/actions/checkout
+ with:
+ fetch-depth: 0 # GitVersion is somewhat irritated when fetch-depth is "1"....
+ ref: ${{ github.event.ref }}
+
+ - name: Cache Tools
+ uses: actions/cache@v2
+ with:
+ path: tools
+ key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
+
+ - name: Publishing documentation
+ uses: cake-build/cake-action@v1
+ with:
+ script-path: recipe.cake
+ target: Force-Publish-Documentation
+ verbosity: Diagnostic
+ cake-version: 0.38.5
+ cake-bootstrap: true

src/Cake.Incubator.Tests/Cake.Incubator.Tests.csproj

@@ -36,8 +36,8 @@
  <EmbeddedResource Include="sampleprojects\Cake_Unity_FSharp_Tests_fsproj.xml" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Cake.Common" Version="0.33.0" />
- <PackageReference Include="Cake.Core" Version="0.33.0" />
+ <PackageReference Include="Cake.Common" Version="1.0.0" />
+ <PackageReference Include="Cake.Core" Version="1.0.0" />
  <PackageReference Include="coverlet.msbuild" Version="3.0.3">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>

src/Cake.Incubator.Tests/DotNetBuildSettingsExtensionsTests.cs

@@ -1,9 +1,11 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
 namespace Cake.Incubator.Tests
 {
- using Cake.Common.Tools;
+ using Cake.Common.Tools.DotNetCore.MSBuild;
  using Cake.Incubator.DotNetBuildExtensions;
  using FluentAssertions;
  using Xunit;
@@ -15,7 +17,7 @@ public void CanAddMultipleTargets()
  {
  var targets = new[] { "One", "Two" };
 
- var settings = new DotNetBuildSettings("a.sln");
+ var settings = new DotNetCoreMSBuildSettings();
  settings.WithTargets(targets);
 
  settings.Targets.Should().HaveCount(2).And.Contain(targets);

src/Cake.Incubator.Tests/Fakes/CakeFixture.cs

@@ -25,7 +25,7 @@ public CakeFixture()
  var log = new NullLog();
  var reg = new WindowsRegistry();
  var config = new CakeConfiguration(new Dictionary<string, string>());
- var strategy = new ToolResolutionStrategy(FileSystem, env, globber, config);
+ var strategy = new ToolResolutionStrategy(FileSystem, env, globber, config, log);
  var toolLocator = new ToolLocator(env, new ToolRepository(env), strategy);
  var cakeDataService = new FakeDataService();
  var runner = new ProcessRunner(FileSystem, env, log, toolLocator, config);
@@ -53,6 +53,11 @@ public bool HasArgument(string name)
  throw new NotImplementedException();
  }
 
+ public ICollection<string> GetArguments(string name)
+ {
+ throw new NotImplementedException();
+ }
+
  public string GetArgument(string name)
  {
  throw new NotImplementedException();

src/Cake.Incubator/Cake.Incubator.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFrameworks>net50;netstandard2.0</TargetFrameworks>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <IncludeSymbols>true</IncludeSymbols>
  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -23,8 +23,8 @@
  <DefineConstants>NETSTANDARD2_0;</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Cake.Common" Version="0.33.0" PrivateAssets="All" />
- <PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Common" Version="1.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>

src/Cake.Incubator/DotNetBuildSettingsExtensions.cs

@@ -5,7 +5,7 @@
 namespace Cake.Incubator.DotNetBuildExtensions
 {
  using System.Collections.Generic;
- using Cake.Common.Tools;
+ using Cake.Common.Tools.DotNetCore.MSBuild;
  using Cake.Core.Annotations;
  using Cake.Incubator.AssertExtensions;
  using Cake.Incubator.EnumerableExtensions;
@@ -21,14 +21,14 @@ public static class DotNetBuildSettingsExtensions
  /// </summary>
  /// <param name="settings">The settings.</param>
  /// <param name="targets">The .NET build targets.</param>
- /// <returns>The same <see cref="DotNetBuildSettings"/> instance so that multiple calls can be chained.</returns>
+ /// <returns>The same <see cref="DotNetCoreMSBuildSettings"/> instance so that multiple calls can be chained.</returns>
  /// <example>
  /// Add many targets to the build settings
  /// <code>
- /// var settings = new DotNetBuildSettings().WithTargets(new[] { "Clean", "Build", "Publish" });
+ /// var settings = new DotNetCoreMSBuildSettings().WithTargets(new[] { "Clean", "Build", "Publish" });
  /// </code>
  /// </example>
- public static DotNetBuildSettings WithTargets(this DotNetBuildSettings settings, IEnumerable<string> targets)
+ public static DotNetCoreMSBuildSettings WithTargets(this DotNetCoreMSBuildSettings settings, IEnumerable<string> targets)
  {
  settings.ThrowIfNull(nameof(settings));
  targets.Each(target => settings.Targets.Add(target));