Release/8.0.0

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
         "cake.tool": {
-        "version": "0.38.5",
+        "version": "1.3.0",
         "commands": [
             "dotnet-cake"
         ]

.github/workflows/build.yml

@@ -32,22 +32,22 @@ jobs:
       WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
       WYAM_DEPLOY_BRANCH: "gh-pages"
       WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
+      COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Install dotnet
-        uses: actions/setup-dotnet@v1.9.0
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
-            5.0.x
             6.0.x
+            7.0.x
 
       - name: Cache Tools
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
@@ -58,18 +58,17 @@ jobs:
           script-path: recipe.cake
           target: CI
           verbosity: Normal
-          cake-version: 0.38.5
-          cake-bootstrap: true
+          cake-version: tool-manifest
 
       - name: Upload Issues-Report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           if-no-files-found: warn
           name: issues
           path: BuildArtifacts/report.html
 
       - name: Upload Packages
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           if-no-files-found: warn
           name: package

.github/workflows/codeql-analysis.yml

@@ -31,27 +31,26 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Install dotnet
-      uses: actions/setup-dotnet@v1.9.0
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          3.1.x
-          5.0.x
           6.0.x
+          7.0.x
 
     - name: Cache Tools
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       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
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,18 +63,17 @@ jobs:
       with:
         script-path: recipe.cake
         target: DotNetCore-Build
-        cake-version: 0.38.5
-        cake-bootstrap: true
+        cake-version: tool-manifest
       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@v2
 
     - name: Upload CoreDump
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       if: failure()
       with:
         if-no-files-found: warn

.github/workflows/publishDocs.yml

@@ -15,13 +15,13 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2.3.4 #https://github.com/actions/checkout
+      uses: actions/checkout@v3 #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
+      uses: actions/cache@v3
       with:
         path: tools
         key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
@@ -32,5 +32,4 @@ jobs:
         script-path: recipe.cake
         target: Force-Publish-Documentation
         verbosity: Diagnostic
-        cake-version: 0.38.5
-        cake-bootstrap: true
+        cake-version: tool-manifest

.github/workflows/release-notes.yml

@@ -11,23 +11,23 @@ jobs:
 
     steps:
       - name: Checkout the requested branch
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Cache Tools
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3
         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.11
+        uses: gittools/actions/gitversion/setup@v0.9.15
         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.11
+        uses: gittools/actions/gitversion/execute@v0.9.15
       - name: Create release branch ${{ github.event.inputs.version }}
         if: ${{ steps.gitversion.outputs.majorMinorPatch }}
         run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}
@@ -43,5 +43,4 @@ jobs:
           script-path: recipe.cake
           target: releasenotes
           verbosity: Diagnostic
-          cake-version: 0.38.5
-          cake-bootstrap: true
+          cake-version: tool-manifest

build.ps1

@@ -6,10 +6,6 @@ Write-Host "Restoring .NET Core tools"
 dotnet tool restore
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
-Write-Host "Bootstrapping Cake"
-dotnet cake $SCRIPT_NAME --bootstrap
-if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
 Write-Host "Running Build"
 dotnet cake $SCRIPT_NAME @args
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

build.sh

@@ -4,8 +4,5 @@ SCRIPT_NAME="recipe.cake"
 echo "Restoring .NET Core tools"
 dotnet tool restore
 
-echo "Bootstrapping Cake"
-dotnet cake $SCRIPT_NAME --bootstrap
-
 echo "Running Build"
 dotnet cake $SCRIPT_NAME "$@"

recipe.cake

@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.2.1
+#load nuget:?package=Cake.Recipe&version=3.0.1
 
 Environment.SetVariableNames();
 
@@ -23,11 +23,6 @@ ToolSettings.SetToolPreprocessorDirectives(
 );
 
 ToolSettings.SetToolSettings(context: Context,
-                            dupFinderExcludePattern: new string[] {
-                                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" },
                             testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[FakeItEasy]* -[FluentAssertions]* -[FluentAssertions.Core]*",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="sampleprojects\AnotherCSProj.xml" />
@@ -11,11 +11,13 @@
     <None Remove="sampleprojects\CsProj_ConditionReference_ValidFile.xml" />
     <None Remove="sampleprojects\CsProj_InvalidFile.xml" />
     <None Remove="sampleprojects\CsProj_NoAppendTargetFramework.xml" />
+    <None Remove="sampleprojects\CsProj_NoAppendTargetFrameworkWithOutputPath.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\CsProj_AppendTargetFrameworkWithOutputPath.xml" />
     <None Remove="sampleprojects\VS2017_CsProj_NetCoreDefault.xml" />
     <None Remove="sampleprojects\VS2017_CsProj_NetStandard_ValidFile.xml" />
     <None Remove="sampleprojects\VS2017_CsProj_ValidFile.xml" />
@@ -27,36 +29,38 @@
     <EmbeddedResource Include="sampleprojects\CsProjValidNUnitTestFile.xml" />
     <EmbeddedResource Include="sampleprojects\CsProj_AbsolutePath.xml" />
     <EmbeddedResource Include="sampleprojects\CsProj_NoAppendTargetFramework.xml" />
+    <EmbeddedResource Include="sampleprojects\CsProj_NoAppendTargetFrameworkWithOutputPath.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\CsProj_AppendTargetFrameworkWithOutputPath.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="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">
+    <PackageReference Include="Cake.Common" Version="3.0.0" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" />
+    <PackageReference Include="Cake.Testing" Version="3.0.0" />
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <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="FakeItEasy" Version="7.3.1" />
+    <PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
+    <PackageReference Include="FluentAssertions" Version="6.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <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.3" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cake.Incubator\Cake.Incubator.csproj" />

src/Cake.Incubator.Tests/CustomProjectParserTests.cs

@@ -53,6 +53,8 @@ public class CustomProjectParserTests
         private readonly FakeFile validCsProjWithAbsoluteFilePaths;
         private readonly FakeFile validCsProjAppendTargetFrameworkFile;
         private readonly FakeFile validCsProjNoAppendTargetFrameworkFile;
+        private readonly FakeFile validCsProjAppendTargetFrameworkOutputPathFile;
+        private readonly FakeFile validCsProjNoAppendTargetFrameworkOutputPathFile;
         private readonly FakeFileSystem fs;
 
         public CustomProjectParserTests()
@@ -67,6 +69,8 @@ public CustomProjectParserTests()
             validCsProjWithAbsoluteFilePaths = fs.CreateFakeFile("CsProj_AbsolutePath".SafeLoad());
             validCsProjAppendTargetFrameworkFile = fs.CreateFakeFile("CsProj_AppendTargetFramework".SafeLoad());
             validCsProjNoAppendTargetFrameworkFile = fs.CreateFakeFile("CsProj_NoAppendTargetFramework".SafeLoad());
+            validCsProjAppendTargetFrameworkOutputPathFile = fs.CreateFakeFile("CsProj_AppendTargetFrameworkWithOutputPath".SafeLoad());
+            validCsProjNoAppendTargetFrameworkOutputPathFile = fs.CreateFakeFile("CsProj_NoAppendTargetFrameworkWithOutputPath".SafeLoad());
         }
 
         [Fact]
@@ -121,6 +125,24 @@ public void CustomProjectParser_RespectNoAppendTargetFrameworkToOutputPath_ForDe
             result.OutputPath.ToString().Should().Be("bin/debug");
         }
 
+        [Fact]
+        public void CustomProjectParser_RespectAppendTargetFrameworkOutputPathToOutputPath_ForDebugConfig()
+        {
+            var result = validCsProjAppendTargetFrameworkOutputPathFile.ParseProjectFile("debug");
+
+            result.Configuration.Should().Be("debug");
+            result.OutputPath.ToString().Should().Be("bin/debug/net48");
+        }
+
+        [Fact]
+        public void CustomProjectParser_RespectNoAppendTargetFrameworkOutputPathToOutputPath_ForDebugConfig()
+        {
+            var result = validCsProjNoAppendTargetFrameworkOutputPathFile.ParseProjectFile("debug");
+
+            result.Configuration.Should().Be("debug");
+            result.OutputPath.ToString().Should().Be("bin/debug");
+        }
+
         [Fact]
         public void CustomProjectParser_RespectAppendTargetFrameworkToOutputPath_ForDebugConfig()
         {

src/Cake.Incubator.Tests/DotNetBuildSettingsExtensionsTests.cs

@@ -5,7 +5,7 @@
 
 namespace Cake.Incubator.Tests
 {
-    using Cake.Common.Tools.DotNetCore.MSBuild;
+    using Cake.Common.Tools.DotNet.MSBuild;
     using Cake.Incubator.DotNetBuildExtensions;
     using FluentAssertions;
     using Xunit;
@@ -17,7 +17,7 @@ public void CanAddMultipleTargets()
         {
             var targets = new[] { "One", "Two" };
 
-            var settings = new DotNetCoreMSBuildSettings();
+            var settings = new DotNetMSBuildSettings();
             settings.WithTargets(targets);
 
             settings.Targets.Should().HaveCount(2).And.Contain(targets);