Merge pull request #176 from nils-a/release/7.0.0

Release/7.0.0

.appveyor.yml

@@ -1,7 +1,7 @@
 #---------------------------------#
 # Build Image #
 #---------------------------------#
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 #---------------------------------#
 # Build Script #

.github/dependabot.yml

@@ -9,10 +9,14 @@ updates:
  target-branch: "develop"
  ignore:
  - dependency-name: "Cake.Core"
+ - dependency-name: "Cake.Common"
+ - dependency-name: "Cake.Testing"
+ labels: [ ]
  - package-ecosystem: "github-actions"
  directory: "/"
  schedule:
  interval: "daily"
  commit-message:
  prefix: "(maint)"
- target-branch: "develop"
+ target-branch: "develop"
+ labels: [ "Build" ]

.github/workflows/build.yml

@@ -9,10 +9,9 @@ on:
 jobs:
  build:
  runs-on: ${{ matrix.os }}
- if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
  strategy:
  matrix:
- os: [windows-latest]
+ os: [ windows-2019, ubuntu-18.04, macos-10.15 ]
 
  env:
  AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -35,10 +34,17 @@ jobs:
  WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
  steps:
  - name: Checkout the repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v2.3.4
+ with:
+ fetch-depth: 0
 
- - name: Fetch all tags and branches
- run: git fetch --prune --unshallow
+ - name: Install dotnet
+ uses: actions/setup-dotnet@v1.9.0
+ with:
+ dotnet-version: |
+ 3.1.x
+ 5.0.x
+ 6.0.x
 
  - name: Cache Tools
  uses: actions/cache@v2

.github/workflows/codeql-analysis.yml

@@ -13,11 +13,12 @@ on:
  branches: [develop]
  schedule:
  - cron: '0 15 * * 6'
+ workflow_dispatch:
 
 jobs:
  analyze:
  name: Analyze
- runs-on: ubuntu-latest
+ runs-on: ubuntu-18.04
 
  strategy:
  fail-fast: false
@@ -34,23 +35,49 @@ jobs:
  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' }}
+ - name: Install dotnet
+ uses: actions/setup-dotnet@v1.9.0
+ with:
+ dotnet-version: |
+ 3.1.x
+ 5.0.x
+ 6.0.x
+
+ - name: Cache Tools
+ uses: actions/cache@v2
+ with:
+ path: tools
+ key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
 
  # 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. 
+ # 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: Build project
+ uses: cake-build/cake-action@v1
+ with:
+ script-path: recipe.cake
+ target: DotNetCore-Build
+ cake-version: 0.38.5
+ cake-bootstrap: true
+ env:
+ COMPlus_DbgEnableMiniDump: 1
+ COMPlus_DbgMiniDumpType: 1
+ COMPlus_DbgMiniDumpName: BuildArtifacts/coredump.dmp
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v1
+
+ - name: Upload CoreDump
+ uses: actions/upload-artifact@v2
+ if: failure()
+ with:
+ if-no-files-found: warn
+ name: CoreDump
+ path: BuildArtifacts/coredump.dmp

.github/workflows/release-notes.yml

@@ -12,22 +12,22 @@ jobs:
  steps:
  - name: Checkout the requested branch
  uses: actions/checkout@v2.3.4
- - name: Fetch all tags and branches
- run: git fetch --prune --unshallow
+  with:
+   fetch-depth: 0
  - name: Cache Tools
  uses: actions/cache@v2.1.4
  with:
  path: tools
  key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
  - name: Set up git version
  if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
- uses: gittools/actions/gitversion/setup@v0.9.9
+ uses: gittools/actions/gitversion/setup@v0.9.11
  with:
  versionSpec: "5.x"
  - name: Run git version
  if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
  id: gitversion
- uses: gittools/actions/gitversion/execute@v0.9.9
+ uses: gittools/actions/gitversion/execute@v0.9.11
  - name: Create release branch ${{ github.event.inputs.version }}
  if: ${{ steps.gitversion.outputs.majorMinorPatch }}
  run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}

recipe.cake

@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.2.0
+#load nuget:?package=Cake.Recipe&version=2.2.1
 
 Environment.SetVariableNames();
 
@@ -8,17 +8,23 @@ BuildParameters.SetParameters(context: Context,
  title: "Cake.Incubator",
  repositoryOwner: "cake-contrib",
  repositoryName: "Cake.Incubator",
- shouldRunCodecov: false,
+ shouldRunCodecov: false,
  shouldGenerateDocumentation: false, // until wyam oin recipe is fixed
  appVeyorAccountName: "cakecontrib",
  shouldRunDotNetCorePack: true,
  preferredBuildProviderType: BuildProviderType.GitHubActions);
 
 BuildParameters.PrintParameters(Context);
 
+ToolSettings.SetToolPreprocessorDirectives(
+ gitVersionTool: "#tool nuget:?package=GitVersion.CommandLine&version=5.8.1",
+ gitVersionGlobalTool: "#tool dotnet:?package=GitVersion.Tool&version=5.8.1",
+ reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.2.2"
+);
+
 ToolSettings.SetToolSettings(context: Context,
  dupFinderExcludePattern: new string[] {
- BuildParameters.RootDirectoryPath + "/src/**/*.AssemblyInfo.cs",
+ BuildParameters.RootDirectoryPath + "/src/**/*.AssemblyInfo.cs",
  BuildParameters.RootDirectoryPath + "/src/Cake.Incubator.Tests/*.cs",
  BuildParameters.RootDirectoryPath + "/src/Cake.Incubator/CustomProjectParser.cs",
  BuildParameters.RootDirectoryPath + "/src/Cake.Incubator/DotNetCoreTestExtensions.cs" },

src/Cake.Incubator.Tests/AssertExtensionsTests.cs

@@ -20,7 +20,7 @@ public void ThrowIfNull_WithMessage_SetsMessage()
 
  Action action = () => obj.ThrowIfNull(nameof(obj), "This is required");
  action.Should().Throw<ArgumentNullException>().WithMessage(
- "This is required\r\nParameter name: obj");
+ "This is required (Parameter 'obj')");
  }
 
  [Fact]

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
+ <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
  <None Remove="sampleprojects\AnotherCSProj.xml" />
@@ -10,10 +10,12 @@
  <None Remove="sampleprojects\CsProj_AbsolutePath.xml" />
  <None Remove="sampleprojects\CsProj_ConditionReference_ValidFile.xml" />
  <None Remove="sampleprojects\CsProj_InvalidFile.xml" />
+ <None Remove="sampleprojects\CsProj_NoAppendTargetFramework.xml" />
  <None Remove="sampleprojects\CsProj_ValidFile.xml" />
  <None Remove="sampleprojects\CsProj_ValidMSTestFile.xml" />
  <None Remove="sampleprojects\CsProj_ValidWebApplication.xml" />
  <None Remove="sampleprojects\CsProj_ValidXUnitTestFile.xml" />
+ <None Remove="sampleprojects\CsProj_AppendTargetFramework.xml" />
  <None Remove="sampleprojects\VS2017_CsProj_NetCoreDefault.xml" />
  <None Remove="sampleprojects\VS2017_CsProj_NetStandard_ValidFile.xml" />
  <None Remove="sampleprojects\VS2017_CsProj_ValidFile.xml" />
@@ -24,49 +26,39 @@
  <EmbeddedResource Include="sampleprojects\CsProjValidFSUnitTestFile.xml" />
  <EmbeddedResource Include="sampleprojects\CsProjValidNUnitTestFile.xml" />
  <EmbeddedResource Include="sampleprojects\CsProj_AbsolutePath.xml" />
+ <EmbeddedResource Include="sampleprojects\CsProj_NoAppendTargetFramework.xml" />
  <EmbeddedResource Include="sampleprojects\CsProj_ConditionReference_ValidFile.xml" />
  <EmbeddedResource Include="sampleprojects\CsProj_InvalidFile.xml" />
  <EmbeddedResource Include="sampleprojects\CsProj_ValidFile.xml" />
  <EmbeddedResource Include="sampleprojects\CsProj_ValidMSTestFile.xml" />
  <EmbeddedResource Include="sampleprojects\CsProj_ValidWebApplication.xml" />
  <EmbeddedResource Include="sampleprojects\CsProj_ValidXUnitTestFile.xml" />
+ <EmbeddedResource Include="sampleprojects\CsProj_AppendTargetFramework.xml" />
  <EmbeddedResource Include="sampleprojects\VS2017_CsProj_NetCoreDefault.xml" />
  <EmbeddedResource Include="sampleprojects\VS2017_CsProj_NetStandard_ValidFile.xml" />
  <EmbeddedResource Include="sampleprojects\VS2017_CsProj_ValidFile.xml" />
  <EmbeddedResource Include="sampleprojects\Cake_Unity_FSharp_Tests_fsproj.xml" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Cake.Common" Version="1.0.0" />
- <PackageReference Include="Cake.Core" Version="1.0.0" />
- <PackageReference Include="coverlet.msbuild" Version="3.0.3">
+ <PackageReference Include="Cake.Common" Version="2.0.0" />
+ <PackageReference Include="Cake.Core" Version="2.0.0" />
+ <PackageReference Include="Cake.Testing" Version="2.0.0" />
+ <PackageReference Include="coverlet.msbuild" Version="3.1.0">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="FakeItEasy" Version="5.1.0" />
- <PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="5.1.0" />
- <PackageReference Include="FluentAssertions" Version="5.6.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+ <PackageReference Include="FakeItEasy" Version="7.2.0" />
+ <PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.0" />
+ <PackageReference Include="FluentAssertions" Version="6.3.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
  <PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\Cake.Incubator\Cake.Incubator.csproj" />
  </ItemGroup>
- <ItemGroup>
- <Compile Update="Resources.Designer.cs">
- <DependentUpon>Resources.resx</DependentUpon>
- <DesignTime>True</DesignTime>
- <AutoGen>True</AutoGen>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Update="Resources.resx">
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <Generator>PublicResXFileCodeGenerator</Generator>
- </EmbeddedResource>
- </ItemGroup>
 </Project>