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

Release/3.0.0
cake-contrib · Nov 17, 2022 · c4e2cfc · c4e2cfc
2 parents 8b07877 + 873f382
commit c4e2cfc
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 90 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/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# file scoped namespaces
+73dca7a5910495754d0ca0afa90d1d4420967f7b
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,18 +66,17 @@ jobs:
           script-path: recipe.cake
           target: CI
           verbosity: Diagnostic
-          cake-version: 0.38.5
-          cake-bootstrap: true
+          cake-version: 1.3.0
       - 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

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -31,30 +31,26 @@ 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
 
@@ -63,20 +59,19 @@ jobs:
       with:
         script-path: recipe.cake
         target: DotNetCore-Build
-        cake-version: 0.38.5
-        cake-bootstrap: true
+        cake-version: 1.3.0
       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
         name: CoreDump
-        path: BuildArtifacts/coredump.dmp
+        path: BuildArtifacts/coredump.dmp
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/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "sarif-viewer.connectToGithubCodeScanning": "on"
+}
diff --git a/build.ps1 b/build.ps1
@@ -9,8 +9,5 @@ $env:DOTNET_NOLOGO = '1'
 dotnet tool restore
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
-dotnet cake recipe.cake --bootstrap
-if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
 dotnet cake recipe.cake @args
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
diff --git a/build.sh b/build.sh
@@ -9,5 +9,4 @@ export DOTNET_NOLOGO=1
 
 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
@@ -8,7 +8,7 @@
     <Reference Include="Cake.7zip, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\..\..\src\Cake.7zip\bin\Release\net6.0\Cake.7zip.dll</HintPath>
     </Reference>
-    <PackageReference Include="Cake.Frosting" Version="2.0.0" />
+    <PackageReference Include="Cake.Frosting" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="output\**" />

diff --git a/docs/settings.yml b/docs/settings.yml
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "6.0.100",
+      "version": "7.0.100",
       "rollForward": "latestFeature"
     }
-  }
+  }
diff --git a/recipe.cake b/recipe.cake
@@ -1,7 +1,4 @@
-#load 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
+#load nuget:?package=Cake.Recipe&version=3.0.1
 
 Environment.SetVariableNames();
 
@@ -14,42 +11,11 @@ BuildParameters.SetParameters(
   repositoryOwner: "cake-contrib",
   shouldRunDotNetCorePack: true,
   shouldUseDeterministicBuilds: true,
-  shouldRunDupFinder: false, // dupFinder is missing in 2021.3.0-eap
-  shouldRunInspectCode: false, // we're shipping a custom version of it below
   preferredBuildProviderType: BuildProviderType.GitHubActions,
   preferredBuildAgentOperatingSystem: PlatformFamily.Linux);
 
 BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(context: Context);
-ToolSettings.SetToolPreprocessorDirectives(
-    reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.3.0-eap10&prerelease");
 
 Build.RunDotNetCore();
-
-// additional workaround for https://github.com/cake-contrib/Cake.Recipe/issues/862
-// to suppress the --build/--no-build warning that is generated in the default
-BuildParameters.Tasks.InspectCodeTask = Task("InspectCode2021")
-    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping due to not running on Windows")
-    .Does<BuildData>(data => RequireTool(ToolSettings.ReSharperTools, () => {
-        var inspectCodeLogFilePath = BuildParameters.Paths.Directories.InspectCodeTestResults.CombineWithFilePath("inspectcode.xml");
-
-        var settings = new InspectCodeSettings() {
-            SolutionWideAnalysis = true,
-            OutputFile = inspectCodeLogFilePath,
-            ArgumentCustomization = x => x.Append("--no-build")
-        };
-
-        if (FileExists(BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName)))
-        {
-            settings.Profile = BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName);
-        }
-
-        InspectCode(BuildParameters.SolutionFilePath, settings);
-
-        // Pass path to InspectCode log file to Cake.Issues.Recipe
-        IssuesParameters.InputFiles.InspectCodeLogFilePath = inspectCodeLogFilePath;
-    })
-);
-BuildParameters.Tasks.AnalyzeTask.IsDependentOn("InspectCode2021");
-IssuesBuildTasks.ReadIssuesTask.IsDependentOn("InspectCode2021");
diff --git a/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj b/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj
@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+        <!--
+            Fool Cake.Incubator into thinking we're building agains netcoreapp3.1.
+            This is done to make Cake.Recipe avoid using OpenCover.                                                                                                                                                                                         Remove this hack if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0
+        -->
+        <TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
         <CodeAnalysisRuleSet>..\cake.7zip.ruleset</CodeAnalysisRuleSet>
 
         <IsPackable>false</IsPackable>
@@ -10,25 +15,21 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Testing" Version="2.0.0" />
-        <PackageReference Include="coverlet.msbuild" Version="3.1.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.CodeAnalysis.NetAnalyzers" Version="6.0.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </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="Shouldly" Version="4.0.3" />
-        <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.2" />
+        <PackageReference Include="Shouldly" Version="4.1.0" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.analyzers" Version="1.0.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/Cake.7zip/Cake.7zip.csproj b/src/Cake.7zip/Cake.7zip.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>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -39,16 +39,12 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0" PrivateAssets="All" />
-        <PackageReference Include="IDisposableAnalyzers" Version="4.0.0">
+        <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+        <PackageReference Include="CakeContrib.Guidelines" Version="1.4.0" PrivateAssets="All" />
+        <PackageReference Include="IDisposableAnalyzers" Version="4.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="stylecop.analyzers" Version="1.1.118">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>