Merge branch 'release/7.0.0'

cake-contrib · Dec 9, 2021 · 31691ae · 31691ae
2 parents b33faa9 + d6cfc34
commit 31691ae
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 25 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,13 +1,13 @@
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2019
+image: Ubuntu
 
 #---------------------------------#
 #  Build Script                   #
 #---------------------------------#
 build_script:
-  - ps: .\build.ps1 --target=CI
+  - sh: ./build.sh --target=CI
 
 #---------------------------------#
 # Tests

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,14 +2,21 @@ name: Build
 
 on:
   push:
+    branches:
+      - master
+      - develop
+      - "feature/**"
+      - "release/**"
+      - "hotfix/**"
+    tags:
+      - "*"
     paths-ignore:
       - "README.md"
   pull_request:
 
 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, ubuntu-18.04, macos-latest]
@@ -39,6 +46,15 @@ jobs:
 
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
+
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v1
+        with:          
+          # gitversion needs 5.0 and we need all SDKs the project is targeting
+          dotnet-version: |
+            3.1.415
+            5.0.403
+            6.0.100
 
       - name: Cache Tools
         uses: actions/cache@v2

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,6 +38,15 @@ jobs:
     # the head of the pull request instead of the merge commit.
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
+
+    - name: Install .NET SDK
+      uses: actions/setup-dotnet@v1
+      with:                       
+        # gitversion needs 5.0 and we need all SDKs the project is targeting
+        dotnet-version: |
+          3.1.415
+          5.0.403
+          6.0.100
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/dependabot-cake.yml b/.github/workflows/dependabot-cake.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-18.04 # linux, because this is a docker-action
     steps:
       - name: check/update cake dependencies
-        uses: nils-org/dependabot-cake-action@v1
+        uses: nils-org/dependabot-cake-action@v1.1.0
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -21,13 +21,13 @@ jobs:
           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].11
         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].11
       - 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/README.md b/README.md
@@ -18,5 +18,12 @@ Please visit the Cake Documentation for a list of available aliases:
 
 [http://cakebuild.net/dsl/json](http://cakebuild.net/dsl/json)
 
+## Discussion
+
+For questions and to discuss ideas & feature requests, use the [GitHub discussions on the Cake GitHub repository](https://github.com/cake-build/cake/discussions), under the [Extension Q&A](https://github.com/cake-build/cake/discussions/categories/extension-q-a) category.
+
+[![Join in the discussion on the Cake repository](https://img.shields.io/badge/GitHub-Discussions-green?logo=github)](https://github.com/cake-build/cake/discussions)
+
+
 ## Apache License 2.0
 Apache Cake.Json Copyright 2015. The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
diff --git a/recipe.cake b/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();
 

diff --git a/src/Cake.Json.Tests/Cake.Json.Tests.csproj b/src/Cake.Json.Tests/Cake.Json.Tests.csproj
@@ -1,23 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0" />
-    <PackageReference Include="Cake.Testing" Version="1.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Cake.Core" Version="2.0.0" />
+    <PackageReference Include="Cake.Testing" Version="2.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="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cake.Json.Tests/FakeCakeArguments.cs b/src/Cake.Json.Tests/FakeCakeArguments.cs
@@ -1,5 +1,5 @@
-using System;
 using Cake.Core;
+using System;
 using System.Collections.Generic;
 
 namespace Cake.Json.Tests
@@ -62,6 +62,11 @@ public ICollection<string> GetArguments(string name)
             ICollection<string> collection = value;
             return collection ?? Array.Empty<string>();
         }
+
+        public IDictionary<string, ICollection<string>> GetArguments()
+        {
+            return _arguments as IDictionary<string, ICollection<string>>;
+        }
     }
 }
 
diff --git a/src/Cake.Json/Cake.Json.csproj b/src/Cake.Json/Cake.Json.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -12,7 +12,7 @@
     <Title>Cake.Json</Title>
     <Summary>JSON Serialization and manipulation addon for cake build.</Summary>
     <Description>Cake Build addon for JSON Serialization and manipulation.</Description>
-    <PackageTags>cake;script;build;cake-addin</PackageTags>
+    <PackageTags>cake;script;build;cake-addin;addin;cake-build</PackageTags>
     <Authors>Redth</Authors>
     <Owners>Redth, cake-contrib</Owners>
     <RepositoryUrl>https://github.com/cake-contrib/Cake.Json.git</RepositoryUrl>
@@ -23,18 +23,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.1">
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <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="0.5.0">
+    <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cake.Json/icon.png b/src/Cake.Json/icon.png