Merge branch 'release/2.0.0'

cake-contrib · May 10, 2023 · bc0da46 · bc0da46
2 parents 24d5bb1 + 64b4089
commit bc0da46
Show file tree

Hide file tree

Showing 12 changed files with 149 additions and 35 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,8 +3,10 @@
     "isRoot": true,
     "tools": {
         "cake.tool": {
-            "version": "0.38.5",
-            "commands": ["dotnet-cake"]
+            "version": "1.3.0",
+            "commands": [
+                "dotnet-cake"
+            ]
         }
     }
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019, ubuntu-18.04, macos-10.15]
+        os: [windows-2022, ubuntu-22.04, macos-12]
     env:
       AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
       AZURE_SOURCE: ${{ secrets.AZURE_SOURCE }}
@@ -41,11 +41,20 @@ jobs:
       - uses: actions/[email protected]
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            2.1.x
+            3.1.x
+            5.0.x
+            6.0.x
+            7.0.x
       - name: Install Transifex Client
-        if: ${{ matrix.os == 'ubuntu-18.04' }} # We do not need it for anything else
+        if: ${{ matrix.os == 'ubuntu-22.04' }} # We do not need it for anything else
         run: sudo apt-get install transifex-client -y
       - name: Cache Tools
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.0.10
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
@@ -58,10 +67,9 @@ jobs:
           script-path: recipe.cake
           target: CI
           verbosity: Diagnostic
-          cake-version: 0.38.5
-          cake-bootstrap: true
+          cake-version: tool-manifest
       - name: Upload artifacts
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: ${{ matrix.os }}-artifacts
           path: |

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,64 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [develop]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [develop]
+  schedule:
+    - cron: '0 15 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['csharp']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+
+    # 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' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      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.
+        # 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: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/dependabot-cake.yml b/.github/workflows/dependabot-cake.yml
@@ -0,0 +1,13 @@
+name: Run dependabot for cake
+on:
+  workflow_dispatch:
+  schedule:
+    # run everyday at 6
+    - cron:  '0 6 * * *'
+
+jobs:
+  dependabot-cake:
+    runs-on: ubuntu-22.04 # linux, because this is a docker-action
+    steps:
+      - name: check/update cake dependencies
+        uses: nils-org/[email protected]
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -8,15 +8,15 @@ on:
 jobs:
   super_linter:
     name: List with Super Linter
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/[email protected]
         with:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter@v3.15.5
+        uses: github/super-linter@v4.9.7
         env:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: develop

diff --git a/.github/workflows/pre-release-notes.yml b/.github/workflows/pre-release-notes.yml
@@ -7,27 +7,36 @@ jobs:
   draft-pre-release:
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout the requested branch
         uses: actions/[email protected]
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            3.0.x
+            3.1.x
+            5.0.x
+            6.0.x
+            7.0.x
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
       - name: Cache Tools
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.0.10
         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/[email protected].9
+        uses: gittools/actions/gitversion/[email protected].13
         with:
           versionSpec: "5.x"
       - name: Run git version
         if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
         id: gitversion
-        uses: gittools/actions/gitversion/[email protected].9
+        uses: gittools/actions/gitversion/[email protected].13
       - name: Create release branch ${{ github.event.inputs.version }}
         if: ${{ steps.gitversion.outputs.majorMinorPatch }}
         run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}

diff --git a/.github/workflows/publishdocs.yml b/.github/workflows/publishdocs.yml
@@ -10,16 +10,24 @@ jobs:
       WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
       WYAM_DEPLOY_REMOTE: "${{ github.event.repository.html_url }}"
       WYAM_DEPLOY_BRANCH: "gh-pages"
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout the requested branch
         uses: actions/[email protected]
         with:
           fetch-depth: 0
           ref: ${{ github.event.ref }}
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            2.1.x
+            5.0.x
+            6.0.x
+            7.0.x
       - name: Cache Tools
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.0.10
         with:
           path: tools
           key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
@@ -29,5 +37,4 @@ jobs:
           script-path: recipe.cake
           target: Force-Publish-Documentation
           verbosity: Diagnostic
-          cake-version: 0.38.5
-          cake-bootstrap: true
+          cake-version: tool-manifest
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -7,27 +7,36 @@ jobs:
   draft-stable:
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout the requested branch
         uses: actions/[email protected]
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            3.0.x
+            3.1.x
+            5.0.x
+            6.0.x
+            7.0.x
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
       - name: Cache Tools
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.0.10
         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/[email protected].9
+        uses: gittools/actions/gitversion/[email protected].13
         with:
           versionSpec: "5.x"
       - name: Run git version
         if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
         id: gitversion
-        uses: gittools/actions/gitversion/[email protected].9
+        uses: gittools/actions/gitversion/[email protected].13
       - name: Create release branch ${{ github.event.inputs.version }}
         if: ${{ steps.gitversion.outputs.majorMinorPatch }}
         run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}
@@ -43,5 +52,4 @@ jobs:
           script-path: recipe.cake
           target: releasenotes
           verbosity: Diagnostic
-          cake-version: 0.38.5
-          cake-bootstrap: true
+          cake-version: tool-manifest
diff --git a/.github/workflows/toc.yml b/.github/workflows/toc.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   toc:
     name: TOC Generator
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: technote-space/toc-generator@v4

diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.2.1
+#load nuget:?package=Cake.Recipe&version=3.0.1
 #load "./.build/*.cake"
 
 Environment.SetVariableNames();

diff --git a/src/Cake.Transifex.Tests/Cake.Transifex.Tests.csproj b/src/Cake.Transifex.Tests/Cake.Transifex.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="Cake.Testing" Version="1.1.0" />
+    <PackageReference Include="Cake.Testing" Version="2.2.0" />
     <PackageReference Include="coverlet.msbuild" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Cake.Transifex/Cake.Transifex.csproj b/src/Cake.Transifex/Cake.Transifex.csproj
@@ -5,7 +5,7 @@
     <CodeAnalysisRuleSet>Cake.Transifex.ruleset</CodeAnalysisRuleSet>
     <Company>Cake Contributors</Company>
     <Copyright>Copyright 2017-$([System.DateTime]::Now.Year) - Kim J. Nordmo</Copyright>
-    <CakeVersion>1.0.0</CakeVersion>
+    <CakeVersion>2.0.0</CakeVersion>
     <Description>
 Cake.Transifex is a addin for the Cake Build script adding support for working with the localization service Transifex.
 This addin requires that the transifex client is already installed and is available as `tx`.
@@ -15,7 +15,7 @@ Supports Cake $(CakeVersion)+
     </Description>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Transifex.xml</DocumentationFile>
     <NeutralLanguage>en-GB</NeutralLanguage>
-    <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>7</LangVersion>
     <CodeAnalysisRuleSet>..\Cake.Transifex.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -43,13 +43,16 @@ Supports Cake $(CakeVersion)+
 
   <!-- Package References only for this project -->
   <ItemGroup>
-    <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
+    <PackageReference Include="Cake.Core" Version="$(CakeVersion)" PrivateAssets="All" />
+    <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
       <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Cake.Core" Version="$(CakeVersion)" PrivateAssets="All" />
-    <PackageReference Include="CakeContrib.Guidelines" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Roslynator.Analyzers" Version="3.1.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>