Skip to content

Commit 3637026

Browse files
gep13gep13
committed
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
2 parents 1ebc50f + a0c8c8b commit 3637026

9 files changed

+142
-12
lines changed

‎.github/dependabot.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "nuget"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
commit-message:
8+
prefix: "(maint)"
9+
target-branch: "develop"
10+
ignore:
11+
- dependency-name: "Cake.Core"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"
16+
commit-message:
17+
prefix: "(maint)"
18+
target-branch: "develop"

‎.github/workflows/codeql-analysis.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
name: "CodeQL"
7+
8+
on:
9+
push:
10+
branches: [develop]
11+
pull_request:
12+
# The branches below must be a subset of the branches above
13+
branches: [develop]
14+
schedule:
15+
- cron: '0 15 * * 6'
16+
17+
jobs:
18+
analyze:
19+
name: Analyze
20+
runs-on: ubuntu-latest
21+
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
# Override automatic language detection by changing the below list
26+
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
27+
language: ['csharp']
28+
# Learn more...
29+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
30+
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v2.3.4
34+
with:
35+
fetch-depth: 0
36+
37+
# If this run was triggered by a pull request event, then checkout
38+
# the head of the pull request instead of the merge commit.
39+
- run: git checkout HEAD^2
40+
if: ${{ github.event_name == 'pull_request' }}
41+
42+
# Initializes the CodeQL tools for scanning.
43+
- name: Initialize CodeQL
44+
uses: github/codeql-action/init@v1
45+
with:
46+
languages: ${{ matrix.language }}
47+
# If you wish to specify custom queries, you can do so here or in a config file.
48+
# By default, queries listed here will override any specified in a config file.
49+
# Prefix the list here with "+" to use these queries and those in the config file.
50+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
51+
52+
- run: ./build.ps1
53+
shell: pwsh
54+
55+
- name: Perform CodeQL Analysis
56+
uses: github/codeql-action/analyze@v1

‎.github/workflows/dependabot-cake.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Run dependabot for cake
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
# run everyday at 6
6+
- cron: '0 6 * * *'
7+
8+
jobs:
9+
dependabot-cake:
10+
runs-on: ubuntu-latest # linux, because this is a docker-action
11+
steps:
12+
- name: check/update cake dependencies
13+
uses: nils-org/dependabot-cake-action@v1

‎.github/workflows/publishDocs.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Publish Documentation
2+
3+
on:
4+
workflow_dispatch:
5+
6+
env:
7+
WYAM_ACCESS_TOKEN: ${{ secrets.API_TOKEN }}
8+
# secrets.GITHUB_TOKEN has no permissions to push, sadly.
9+
WYAM_DEPLOY_BRANCH: 'gh-pages'
10+
WYAM_DEPLOY_REMOTE: "${{ github.event.repository.html_url }}"
11+
12+
jobs:
13+
cake:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: checkout
18+
uses: actions/checkout@v2.3.4 #https://github.com/actions/checkout
19+
with:
20+
fetch-depth: 0 # GitVersion is somewhat irritated when fetch-depth is "1"....
21+
ref: ${{ github.event.ref }}
22+
23+
- name: Cache Tools
24+
uses: actions/cache@v2
25+
with:
26+
path: tools
27+
key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
28+
29+
- name: Publishing documentation
30+
uses: cake-build/cake-action@v1
31+
with:
32+
script-path: recipe.cake
33+
target: Force-Publish-Documentation
34+
verbosity: Diagnostic
35+
cake-version: 0.38.5
36+
cake-bootstrap: true

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<EmbeddedResource Include="sampleprojects\Cake_Unity_FSharp_Tests_fsproj.xml" />
3737
</ItemGroup>
3838
<ItemGroup>
39-
<PackageReference Include="Cake.Common" Version="0.33.0" />
40-
<PackageReference Include="Cake.Core" Version="0.33.0" />
39+
<PackageReference Include="Cake.Common" Version="1.0.0" />
40+
<PackageReference Include="Cake.Core" Version="1.0.0" />
4141
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
4242
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4343
<PrivateAssets>all</PrivateAssets>

‎src/Cake.Incubator.Tests/DotNetBuildSettingsExtensionsTests.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
// This Source Code Form is subject to the terms of the Mozilla Public
22
// License, v. 2.0. If a copy of the MPL was not distributed with this
33
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
46
namespace Cake.Incubator.Tests
57
{
6-
using Cake.Common.Tools;
8+
using Cake.Common.Tools.DotNetCore.MSBuild;
79
using Cake.Incubator.DotNetBuildExtensions;
810
using FluentAssertions;
911
using Xunit;
@@ -15,7 +17,7 @@ public void CanAddMultipleTargets()
1517
{
1618
var targets = new[] { "One", "Two" };
1719

18-
var settings = new DotNetBuildSettings("a.sln");
20+
var settings = new DotNetCoreMSBuildSettings();
1921
settings.WithTargets(targets);
2022

2123
settings.Targets.Should().HaveCount(2).And.Contain(targets);

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public CakeFixture()
2525
var log = new NullLog();
2626
var reg = new WindowsRegistry();
2727
var config = new CakeConfiguration(new Dictionary<string, string>());
28-
var strategy = new ToolResolutionStrategy(FileSystem, env, globber, config);
28+
var strategy = new ToolResolutionStrategy(FileSystem, env, globber, config, log);
2929
var toolLocator = new ToolLocator(env, new ToolRepository(env), strategy);
3030
var cakeDataService = new FakeDataService();
3131
var runner = new ProcessRunner(FileSystem, env, log, toolLocator, config);
@@ -53,6 +53,11 @@ public bool HasArgument(string name)
5353
throw new NotImplementedException();
5454
}
5555

56+
public ICollection<string> GetArguments(string name)
57+
{
58+
throw new NotImplementedException();
59+
}
60+
5661
public string GetArgument(string name)
5762
{
5863
throw new NotImplementedException();

‎src/Cake.Incubator/Cake.Incubator.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
3+
<TargetFrameworks>net50;netstandard2.0</TargetFrameworks>
44
<GenerateDocumentationFile>true</GenerateDocumentationFile>
55
<IncludeSymbols>true</IncludeSymbols>
66
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -23,8 +23,8 @@
2323
<DefineConstants>NETSTANDARD2_0;</DefineConstants>
2424
</PropertyGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Cake.Common" Version="0.33.0" PrivateAssets="All" />
27-
<PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
26+
<PackageReference Include="Cake.Common" Version="1.0.0" PrivateAssets="All" />
27+
<PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
2828
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
<PrivateAssets>all</PrivateAssets>

‎src/Cake.Incubator/DotNetBuildSettingsExtensions.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Cake.Incubator.DotNetBuildExtensions
66
{
77
using System.Collections.Generic;
8-
using Cake.Common.Tools;
8+
using Cake.Common.Tools.DotNetCore.MSBuild;
99
using Cake.Core.Annotations;
1010
using Cake.Incubator.AssertExtensions;
1111
using Cake.Incubator.EnumerableExtensions;
@@ -21,14 +21,14 @@ public static class DotNetBuildSettingsExtensions
2121
/// </summary>
2222
/// <param name="settings">The settings.</param>
2323
/// <param name="targets">The .NET build targets.</param>
24-
/// <returns>The same <see cref="DotNetBuildSettings"/> instance so that multiple calls can be chained.</returns>
24+
/// <returns>The same <see cref="DotNetCoreMSBuildSettings"/> instance so that multiple calls can be chained.</returns>
2525
/// <example>
2626
/// Add many targets to the build settings
2727
/// <code>
28-
/// var settings = new DotNetBuildSettings().WithTargets(new[] { "Clean", "Build", "Publish" });
28+
/// var settings = new DotNetCoreMSBuildSettings().WithTargets(new[] { "Clean", "Build", "Publish" });
2929
/// </code>
3030
/// </example>
31-
public static DotNetBuildSettings WithTargets(this DotNetBuildSettings settings, IEnumerable<string> targets)
31+
public static DotNetCoreMSBuildSettings WithTargets(this DotNetCoreMSBuildSettings settings, IEnumerable<string> targets)
3232
{
3333
settings.ThrowIfNull(nameof(settings));
3434
targets.Each(target => settings.Targets.Add(target));

0 commit comments

Comments
 (0)