Merge branch 'release/5.0.0'

* release/5.0.0: (GH-25) Update to latest Cake internals (GH-25) Update Cake.AppVeyor to target Cake v1.0.0 (GH-27) Add .NET 5.0 for package output (GH-30) Add workflow for publishing docs (GH-29) Add workflow for Cake dependencies (GH-28) Add workflow for CodeQL analysis (GH-26) Add dependabot config
cake-contrib · Feb 22, 2021 · 99c3ae7 · 99c3ae7
2 parents 5cb8ed8 + bfbd16f
commit 99c3ae7
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 14 deletions.
diff --git a/.github/dependabot.yml b/.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"
diff --git a/.github/workflows/codeql-analysis.yml b/.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/[email protected]
+      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
diff --git a/.github/workflows/dependabot-cake.yml b/.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
diff --git a/.github/workflows/publishDocs.yml b/.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/[email protected] #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
diff --git a/src/Cake.AppVeyor.Tests/Cake.AppVeyor.Tests.csproj b/src/Cake.AppVeyor.Tests/Cake.AppVeyor.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net50;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.33.0" />
-    <PackageReference Include="Cake.Testing" Version="0.33.0" />
+    <PackageReference Include="Cake.Core" Version="1.0.0" />
+    <PackageReference Include="Cake.Testing" Version="1.0.0" />
     <PackageReference Include="coverlet.msbuild" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Cake.AppVeyor.Tests/Fakes/FakeCakeArguments.cs b/src/Cake.AppVeyor.Tests/Fakes/FakeCakeArguments.cs
@@ -1,18 +1,19 @@
 using System;
 using Cake.Core;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Cake.AppVeyor.Fakes
 {
     internal sealed class FakeCakeArguments : ICakeArguments
     {
-        private readonly Dictionary<string, string> _arguments;
+        private readonly Dictionary<string, List<string>> _arguments;
 
         /// <summary>
         /// Gets the arguments.
         /// </summary>
         /// <value>The arguments.</value>
-        public IReadOnlyDictionary<string, string> Arguments
+        public IReadOnlyDictionary<string, List<string>> Arguments
         {
             get { return _arguments; }
         }
@@ -22,14 +23,14 @@ public IReadOnlyDictionary<string, string> Arguments
         /// </summary>
         public FakeCakeArguments()
         {
-            _arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            _arguments = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
         }
 
         /// <summary>
         /// Initializes the argument list.
         /// </summary>
         /// <param name="arguments">The arguments.</param>
-        public void SetArguments(IDictionary<string, string> arguments)
+        public void SetArguments(IDictionary<string, List<string>> arguments)
         {
             if (arguments == null)
             {
@@ -61,8 +62,13 @@ public bool HasArgument(string name)
         /// <returns>The argument value.</returns>
         public string GetArgument(string name)
         {
-            return _arguments.ContainsKey(name)
-                ? _arguments[name] : null;
+            return GetArguments(name).LastOrDefault();
+        }
+
+        public ICollection<string> GetArguments(string name)
+        {
+            _arguments.TryGetValue(name, out var arguments);
+            return arguments ?? (ICollection<string>)Array.Empty<string>();
         }
     }
 }

diff --git a/src/Cake.AppVeyor.Tests/Fakes/FakeCakeContext.cs b/src/Cake.AppVeyor.Tests/Fakes/FakeCakeContext.cs
@@ -20,13 +20,13 @@ public FakeCakeContext()
 
 			log = new FakeLog();
 			var fileSystem = new FileSystem();
-			var environment = new CakeEnvironment(new CakePlatform(), new CakeRuntime(), log);
+			var environment = new CakeEnvironment(new CakePlatform(), new CakeRuntime());
 			var globber = new Globber(fileSystem, environment);
 			var args = new FakeCakeArguments();
 			var registry = new WindowsRegistry();
 			var toolRepo = new ToolRepository(environment);
 			var config = new Core.Configuration.CakeConfigurationProvider(fileSystem, environment).CreateConfiguration(testsDir, new Dictionary<string, string>());
-			var toolResolutionStrategy = new ToolResolutionStrategy(fileSystem, environment, globber, config);
+			var toolResolutionStrategy = new ToolResolutionStrategy(fileSystem, environment, globber, config, log);
 			var toolLocator = new ToolLocator(environment, toolRepo, toolResolutionStrategy);
 			var processRunner = new ProcessRunner(fileSystem, environment, log, toolLocator, config);
 			var data = Substitute.For<ICakeDataService>();

diff --git a/src/Cake.AppVeyor/Cake.AppVeyor.csproj b/src/Cake.AppVeyor/Cake.AppVeyor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net50;netstandard2.0;net461</TargetFrameworks>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeSymbols>true</IncludeSymbols>
@@ -25,8 +25,8 @@
   </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>