Merge pull request #282 from nils-a/release/3.0.0

Release/3.0.0
cake-contrib · Dec 6, 2022 · 190d838 · 190d838
2 parents c7d1c95 + 0a6cd95
commit 190d838
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 61 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.38.5",
+      "version": "1.3.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,18 +44,19 @@ jobs:
 
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
-      - uses: actions/setup-dotnet@v1.9.0
+      - uses: actions/setup-dotnet@v3.0.3
         with:
           dotnet-version: |
             2.1.818
             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') }}
@@ -65,21 +66,20 @@ jobs:
           script-path: recipe.cake
           target: CI
           verbosity: Diagnostic
-          cake-version: 0.38.5
-          cake-bootstrap: true
+          cake-version: 1.3.0
       # currently, Cake.Recipe does not upload artifacts when run on gh-actions
       - name: Upload Issues
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           if-no-files-found: warn
           name: ${{ matrix.os }} Issues
           path: |
             BuildArtifacts/report.html
             BuildArtifacts/**/coverlet/*.xml
       - name: Upload Packages
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: runner.os == 'Windows'
         with:
           if-no-files-found: warn
           name: package
-          path: BuildArtifacts/Packages/**/*
+          path: BuildArtifacts/Packages/**/*
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,29 +30,25 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: actions/setup-dotnet@v1.9.0
+    - uses: actions/setup-dotnet@v3.0.3
       with:
-        dotnet-version: |
-          2.1.818
-          3.1.x
-          5.0.x
-          6.0.x
+        dotnet-version: 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.
-        # 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
 
@@ -61,8 +57,7 @@ jobs:
       with:
         script-path: recipe.cake
         target: DotNetCore-Build
-        cake-version: 0.38.5
-        cake-bootstrap: true
+        cake-version: 1.3.0
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml
@@ -15,13 +15,13 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Fetch all tags and branches
       run: git fetch --prune --unshallow
 
     - 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: 1.3.0
diff --git a/build.ps1 b/build.ps1
@@ -15,8 +15,6 @@ function Run([string[]]$arguments) {
 
 Run tool, restore
 
-Run cake, recipe.cake, --bootstrap
-
 $arguments = @("cake"; "recipe.cake")
 $arguments += @($args)
 

diff --git a/build.sh b/build.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 dotnet tool restore
 
-dotnet cake recipe.cake --bootstrap
-
 dotnet cake recipe.cake "$@"
diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj
@@ -5,7 +5,7 @@
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Frosting" Version="2.0.0" />
+    <PackageReference Include="Cake.Frosting" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Cake.Gradle, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null">

diff --git a/recipe.cake b/recipe.cake
@@ -1,7 +1,4 @@
-#l nuget:?package=Cake.Recipe&version=2.2.1
-
-// Workaround for https://github.com/cake-contrib/Cake.Recipe/issues/854
-#tool nuget:?package=NuGet.CommandLine&version=5.8.1
+#l nuget:?package=Cake.Recipe&version=3.0.1
 
 Environment.SetVariableNames();
 
@@ -21,11 +18,6 @@ BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(
     context: Context,
-    dupFinderExcludePattern: new string[] {
-        MakeAbsolute(BuildParameters.SolutionDirectoryPath.CombineWithFilePath("LitJson/*.cs")).FullPath,
-        MakeAbsolute(BuildParameters.SolutionDirectoryPath.CombineWithFilePath("**/*.AssemblyInfo.cs")).FullPath,
-        MakeAbsolute(BuildParameters.SourceDirectoryPath.CombineWithFilePath("Cake.Gradle.Tests/**/*.cs")).FullPath
-    },
     testCoverageFilter: $"+[{BuildParameters.Title}*]* -[*.Tests]* -[{BuildParameters.Title}]LitJson.* -[{BuildParameters.Title}]Cake.Gradle.Abstractions.*");
 
 Build.RunDotNetCore();

diff --git a/src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj b/src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj
@@ -1,34 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
         <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
-        <PackageReference Include="Cake.Common" 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.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="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Moq" Version="4.16.1" />
-        <PackageReference Include="Verify.Xunit" Version="14.7.0" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.analyzers" Version="0.10.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Moq" Version="4.18.3" />
+        <PackageReference Include="Verify.Xunit" Version="19.3.0" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.analyzers" Version="1.1.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Shouldly" Version="4.0.3" />
+        <PackageReference Include="Shouldly" Version="4.1.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="../Cake.Gradle/Cake.Gradle.csproj" />

diff --git a/src/Cake.Gradle/Cake.Gradle.csproj b/src/Cake.Gradle/Cake.Gradle.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>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <CodeAnalysisRuleSet>$(SolutionDir)/Cake.Gradle.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
@@ -32,25 +32,21 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
-        <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
+        <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
+        <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
         <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
+        <PackageReference Include="CakeContrib.Guidelines" Version="1.4.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="IDisposableAnalyzers" Version="4.0.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+        <PackageReference Include="IDisposableAnalyzers" Version="4.0.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
         <PackageReference Include="stylecop.analyzers" Version="1.1.118">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>