Merge branch 'release/5.0.0'

cake-contrib · Dec 8, 2021 · 78168ae · 78168ae
2 parents 6d73172 + eac2316
commit 78168ae
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 45 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,7 +1,7 @@
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 #---------------------------------#
 #  Build Script                   #

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,18 +1,20 @@
 version: 2
 updates:
-  - package-ecosystem: "nuget"
-    directory: "/"
+  - package-ecosystem: nuget
+    directory: /
     schedule:
-      interval: "daily"
+      interval: daily
     commit-message:
-      prefix: "(maint)"
-    target-branch: "develop"
+      prefix: (maint)
+    target-branch: develop
     ignore:
-      - dependency-name: "Cake.Core"
-  - package-ecosystem: "github-actions"
-    directory: "/"
+      - dependency-name: Cake.Common
+      - dependency-name: Cake.Core
+      - dependency-name: Cake.Testing
+  - package-ecosystem: github-actions
+    directory: /
     schedule:
-      interval: "daily"
+      interval: daily
     commit-message:
-      prefix: "(maint)"
-    target-branch: "develop"
+      prefix: (maint)
+    target-branch: develop
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,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/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/setup@v0.9.9
+        uses: gittools/actions/gitversion/setup@v0.9.11
         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.9
+        uses: gittools/actions/gitversion/execute@v0.9.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/src/Cake.FileHelpers.Tests/Cake.FileHelpers.Tests.csproj b/src/Cake.FileHelpers.Tests/Cake.FileHelpers.Tests.csproj
@@ -1,26 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net50;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0" />
-    <PackageReference Include="Cake.Testing" Version="1.0.0" />
-    <PackageReference Include="coverlet.msbuild" Version="3.0.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+  <ItemGroup >
+    <PackageReference Include="Cake.Testing" Version="2.0.0" />
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
       <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.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cake.FileHelpers\Cake.FileHelpers.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 </Project>
diff --git a/src/Cake.FileHelpers.Tests/Fakes/FakeCakeArguments.cs b/src/Cake.FileHelpers.Tests/Fakes/FakeCakeArguments.cs
@@ -1,7 +1,7 @@
-using System;
+using Cake.Core;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Cake.Core;
 
 namespace Cake.Xamarin.Tests.Fakes
 {
@@ -52,12 +52,26 @@ public bool HasArgument(string name)
             return _arguments.ContainsKey(name);
         }
 
+        /// <summary>
+        /// Gets all values for an argument.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
         public ICollection<string> GetArguments(string name)
         {
             _arguments.TryGetValue(name, out var arguments);
             return arguments ?? (ICollection<string>)Array.Empty<string>();
         }
 
+        /// <summary>
+        ///  Gets all command line arguments.
+        /// </summary>
+        /// <returns></returns>
+        public IDictionary<string, ICollection<string>> GetArguments()
+        {
+            return _arguments as IDictionary<string, ICollection<string>>;
+        }
+
         /// <summary>
         /// Gets an argument.
         /// </summary>

diff --git a/src/Cake.FileHelpers/Cake.FileHelpers.csproj b/src/Cake.FileHelpers/Cake.FileHelpers.csproj
@@ -1,7 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net50;netstandard2.0;net46</TargetFrameworks>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
@@ -13,32 +12,29 @@
     <Title>Cake.FileHelpers</Title>
     <Summary>Cake build aliases for Reading, Writing, and Replacing Text in files.</Summary>
     <Description>Cake Build addon to provide Aliases for common File operations (Reading, Writing, Replacing Text).</Description>
-    <PackageTags>cake;script;build;cake-addin</PackageTags>
+    <PackageTags>cake;script;build;cake-addin;cake-build;addin</PackageTags>
     <Authors>Redth</Authors>
     <Owners>Redth; cake-contrib</Owners>
     <Copyright>Copyright 2017-$([System.DateTime]::Now.Year) - Cake Contributions</Copyright>
     <PackageProjectUrl>https://github.com/cake-contrib/Cake.FileHelpers</PackageProjectUrl>
-    <PackageIcon>icon.png</PackageIcon>
-    <PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</PackageIconUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/cake-contrib/Cake.FileHelpers.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
-  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="CakeContrib.Guidelines" Version="0.5.0">
+    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" 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.1">
+    <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

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