Skip to content

Commit 0924174

Browse files
nils-anils-a
authored
Merge pull request #176 from nils-a/release/7.0.0
Release/7.0.0
2 parents 3637026 + 186d9f1 commit 0924174

29 files changed

+537
-940
lines changed

‎.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#---------------------------------#
22
# Build Image #
33
#---------------------------------#
4-
image: Visual Studio 2019
4+
image: Visual Studio 2022
55

66
#---------------------------------#
77
# Build Script #

‎.github/dependabot.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@ updates:
99
target-branch: "develop"
1010
ignore:
1111
- dependency-name: "Cake.Core"
12+
- dependency-name: "Cake.Common"
13+
- dependency-name: "Cake.Testing"
14+
labels: [ ]
1215
- package-ecosystem: "github-actions"
1316
directory: "/"
1417
schedule:
1518
interval: "daily"
1619
commit-message:
1720
prefix: "(maint)"
18-
target-branch: "develop"
21+
target-branch: "develop"
22+
labels: [ "Build" ]

‎.github/workflows/build.yml

+11-5
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ on:
99
jobs:
1010
build:
1111
runs-on: ${{ matrix.os }}
12-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
1312
strategy:
1413
matrix:
15-
os: [windows-latest]
14+
os: [ windows-2019, ubuntu-18.04, macos-10.15 ]
1615

1716
env:
1817
AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -35,10 +34,17 @@ jobs:
3534
WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
3635
steps:
3736
- name: Checkout the repository
38-
uses: actions/checkout@v2
37+
uses: actions/checkout@v2.3.4
38+
with:
39+
fetch-depth: 0
3940

40-
- name: Fetch all tags and branches
41-
run: git fetch --prune --unshallow
41+
- name: Install dotnet
42+
uses: actions/setup-dotnet@v1.9.0
43+
with:
44+
dotnet-version: |
45+
3.1.x
46+
5.0.x
47+
6.0.x
4248
4349
- name: Cache Tools
4450
uses: actions/cache@v2

‎.github/workflows/codeql-analysis.yml

+36-9
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ on:
1313
branches: [develop]
1414
schedule:
1515
- cron: '0 15 * * 6'
16+
workflow_dispatch:
1617

1718
jobs:
1819
analyze:
1920
name: Analyze
20-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-18.04
2122

2223
strategy:
2324
fail-fast: false
@@ -34,23 +35,49 @@ jobs:
3435
with:
3536
fetch-depth: 0
3637

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' }}
38+
- name: Install dotnet
39+
uses: actions/setup-dotnet@v1.9.0
40+
with:
41+
dotnet-version: |
42+
3.1.x
43+
5.0.x
44+
6.0.x
45+
46+
- name: Cache Tools
47+
uses: actions/cache@v2
48+
with:
49+
path: tools
50+
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
4151

4252
# Initializes the CodeQL tools for scanning.
4353
- name: Initialize CodeQL
4454
uses: github/codeql-action/init@v1
4555
with:
4656
languages: ${{ matrix.language }}
4757
# 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.
58+
# By default, queries listed here will override any specified in a config file.
4959
# Prefix the list here with "+" to use these queries and those in the config file.
5060
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5161

52-
- run: ./build.ps1
53-
shell: pwsh
62+
- name: Build project
63+
uses: cake-build/cake-action@v1
64+
with:
65+
script-path: recipe.cake
66+
target: DotNetCore-Build
67+
cake-version: 0.38.5
68+
cake-bootstrap: true
69+
env:
70+
COMPlus_DbgEnableMiniDump: 1
71+
COMPlus_DbgMiniDumpType: 1
72+
COMPlus_DbgMiniDumpName: BuildArtifacts/coredump.dmp
5473

5574
- name: Perform CodeQL Analysis
56-
uses: github/codeql-action/analyze@v1
75+
uses: github/codeql-action/analyze@v1
76+
77+
- name: Upload CoreDump
78+
uses: actions/upload-artifact@v2
79+
if: failure()
80+
with:
81+
if-no-files-found: warn
82+
name: CoreDump
83+
path: BuildArtifacts/coredump.dmp

‎.github/workflows/release-notes.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ jobs:
1212
steps:
1313
- name: Checkout the requested branch
1414
uses: actions/checkout@v2.3.4
15-
- name: Fetch all tags and branches
16-
run: git fetch --prune --unshallow
15+
with:
16+
fetch-depth: 0
1717
- name: Cache Tools
1818
uses: actions/cache@v2.1.4
1919
with:
2020
path: tools
2121
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
2222
- name: Set up git version
2323
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
24-
uses: gittools/actions/gitversion/setup@v0.9.9
24+
uses: gittools/actions/gitversion/setup@v0.9.11
2525
with:
2626
versionSpec: "5.x"
2727
- name: Run git version
2828
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
2929
id: gitversion
30-
uses: gittools/actions/gitversion/execute@v0.9.9
30+
uses: gittools/actions/gitversion/execute@v0.9.11
3131
- name: Create release branch ${{ github.event.inputs.version }}
3232
if: ${{ steps.gitversion.outputs.majorMinorPatch }}
3333
run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}

‎recipe.cake

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#load nuget:?package=Cake.Recipe&version=2.2.0
1+
#load nuget:?package=Cake.Recipe&version=2.2.1
22

33
Environment.SetVariableNames();
44

@@ -8,17 +8,23 @@ BuildParameters.SetParameters(context: Context,
88
title: "Cake.Incubator",
99
repositoryOwner: "cake-contrib",
1010
repositoryName: "Cake.Incubator",
11-
shouldRunCodecov: false,
11+
shouldRunCodecov: false,
1212
shouldGenerateDocumentation: false, // until wyam oin recipe is fixed
1313
appVeyorAccountName: "cakecontrib",
1414
shouldRunDotNetCorePack: true,
1515
preferredBuildProviderType: BuildProviderType.GitHubActions);
1616

1717
BuildParameters.PrintParameters(Context);
1818

19+
ToolSettings.SetToolPreprocessorDirectives(
20+
gitVersionTool: "#tool nuget:?package=GitVersion.CommandLine&version=5.8.1",
21+
gitVersionGlobalTool: "#tool dotnet:?package=GitVersion.Tool&version=5.8.1",
22+
reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.2.2"
23+
);
24+
1925
ToolSettings.SetToolSettings(context: Context,
2026
dupFinderExcludePattern: new string[] {
21-
BuildParameters.RootDirectoryPath + "/src/**/*.AssemblyInfo.cs",
27+
BuildParameters.RootDirectoryPath + "/src/**/*.AssemblyInfo.cs",
2228
BuildParameters.RootDirectoryPath + "/src/Cake.Incubator.Tests/*.cs",
2329
BuildParameters.RootDirectoryPath + "/src/Cake.Incubator/CustomProjectParser.cs",
2430
BuildParameters.RootDirectoryPath + "/src/Cake.Incubator/DotNetCoreTestExtensions.cs" },

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void ThrowIfNull_WithMessage_SetsMessage()
2020

2121
Action action = () => obj.ThrowIfNull(nameof(obj), "This is required");
2222
action.Should().Throw<ArgumentNullException>().WithMessage(
23-
"This is required\r\nParameter name: obj");
23+
"This is required (Parameter 'obj')");
2424
}
2525

2626
[Fact]

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

+15-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
66
<None Remove="sampleprojects\AnotherCSProj.xml" />
@@ -10,10 +10,12 @@
1010
<None Remove="sampleprojects\CsProj_AbsolutePath.xml" />
1111
<None Remove="sampleprojects\CsProj_ConditionReference_ValidFile.xml" />
1212
<None Remove="sampleprojects\CsProj_InvalidFile.xml" />
13+
<None Remove="sampleprojects\CsProj_NoAppendTargetFramework.xml" />
1314
<None Remove="sampleprojects\CsProj_ValidFile.xml" />
1415
<None Remove="sampleprojects\CsProj_ValidMSTestFile.xml" />
1516
<None Remove="sampleprojects\CsProj_ValidWebApplication.xml" />
1617
<None Remove="sampleprojects\CsProj_ValidXUnitTestFile.xml" />
18+
<None Remove="sampleprojects\CsProj_AppendTargetFramework.xml" />
1719
<None Remove="sampleprojects\VS2017_CsProj_NetCoreDefault.xml" />
1820
<None Remove="sampleprojects\VS2017_CsProj_NetStandard_ValidFile.xml" />
1921
<None Remove="sampleprojects\VS2017_CsProj_ValidFile.xml" />
@@ -24,49 +26,39 @@
2426
<EmbeddedResource Include="sampleprojects\CsProjValidFSUnitTestFile.xml" />
2527
<EmbeddedResource Include="sampleprojects\CsProjValidNUnitTestFile.xml" />
2628
<EmbeddedResource Include="sampleprojects\CsProj_AbsolutePath.xml" />
29+
<EmbeddedResource Include="sampleprojects\CsProj_NoAppendTargetFramework.xml" />
2730
<EmbeddedResource Include="sampleprojects\CsProj_ConditionReference_ValidFile.xml" />
2831
<EmbeddedResource Include="sampleprojects\CsProj_InvalidFile.xml" />
2932
<EmbeddedResource Include="sampleprojects\CsProj_ValidFile.xml" />
3033
<EmbeddedResource Include="sampleprojects\CsProj_ValidMSTestFile.xml" />
3134
<EmbeddedResource Include="sampleprojects\CsProj_ValidWebApplication.xml" />
3235
<EmbeddedResource Include="sampleprojects\CsProj_ValidXUnitTestFile.xml" />
36+
<EmbeddedResource Include="sampleprojects\CsProj_AppendTargetFramework.xml" />
3337
<EmbeddedResource Include="sampleprojects\VS2017_CsProj_NetCoreDefault.xml" />
3438
<EmbeddedResource Include="sampleprojects\VS2017_CsProj_NetStandard_ValidFile.xml" />
3539
<EmbeddedResource Include="sampleprojects\VS2017_CsProj_ValidFile.xml" />
3640
<EmbeddedResource Include="sampleprojects\Cake_Unity_FSharp_Tests_fsproj.xml" />
3741
</ItemGroup>
3842
<ItemGroup>
39-
<PackageReference Include="Cake.Common" Version="1.0.0" />
40-
<PackageReference Include="Cake.Core" Version="1.0.0" />
41-
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
43+
<PackageReference Include="Cake.Common" Version="2.0.0" />
44+
<PackageReference Include="Cake.Core" Version="2.0.0" />
45+
<PackageReference Include="Cake.Testing" Version="2.0.0" />
46+
<PackageReference Include="coverlet.msbuild" Version="3.1.0">
4247
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4348
<PrivateAssets>all</PrivateAssets>
4449
</PackageReference>
45-
<PackageReference Include="FakeItEasy" Version="5.1.0" />
46-
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="5.1.0" />
47-
<PackageReference Include="FluentAssertions" Version="5.6.0" />
48-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
49-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
50+
<PackageReference Include="FakeItEasy" Version="7.2.0" />
51+
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.0" />
52+
<PackageReference Include="FluentAssertions" Version="6.3.0" />
53+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
54+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
5055
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5156
<PrivateAssets>all</PrivateAssets>
5257
</PackageReference>
5358
<PackageReference Include="xunit" Version="2.4.1" />
54-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
59+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
5560
</ItemGroup>
5661
<ItemGroup>
5762
<ProjectReference Include="..\Cake.Incubator\Cake.Incubator.csproj" />
5863
</ItemGroup>
59-
<ItemGroup>
60-
<Compile Update="Resources.Designer.cs">
61-
<DependentUpon>Resources.resx</DependentUpon>
62-
<DesignTime>True</DesignTime>
63-
<AutoGen>True</AutoGen>
64-
</Compile>
65-
</ItemGroup>
66-
<ItemGroup>
67-
<EmbeddedResource Update="Resources.resx">
68-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
69-
<Generator>PublicResXFileCodeGenerator</Generator>
70-
</EmbeddedResource>
71-
</ItemGroup>
7264
</Project>

0 commit comments

Comments
 (0)