Merge pull request #108 from nils-a/release/5.0.0

Release/5.0.0
cake-contrib · Dec 6, 2021 · 22fde71 · 22fde71
2 parents d1b0f88 + 89b72b1
commit 22fde71
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 27 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -3,6 +3,20 @@
 #---------------------------------#
 image: Visual Studio 2019
 
+#---------------------------------#
+#  Install .NET                   #
+#---------------------------------#
+install:
+  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+  - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+  - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 2.1.818 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 3.1.414 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.402 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+  - ps: dotnet --info
+
 #---------------------------------#
 #  Build Script                   #
 #---------------------------------#

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,19 +23,28 @@ jobs:
 
     steps:
       - name: Checkout the repository 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.4.0
 
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
 
+      - uses: actions/[email protected]
+        with:
+          # codecov and unittests need 2.1, gitversion needs 5.0 and need .NET 6 to build
+          dotnet-version: |
+            2.1.818
+            3.1.414
+            5.0.402
+            6.0.100
+
       - name: Cache Tools
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.7
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
 
       - name: Build project
-        uses: cake-build/cake-action@v1
+        uses: cake-build/cake-action@v1.4.0
         with:
           script-path: recipe.cake
           target: CI

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,12 +20,21 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.4.0
       with:
         fetch-depth: 0
 
+    - uses: actions/[email protected]
+      with:
+        # codecov and unittests need 2.1, gitversion needs 5.0 and need .NET 6 to build
+        dotnet-version: |
+          2.1.818
+          3.1.414
+          5.0.402
+          6.0.100
+
     - name: Cache Tools
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.7
       with:
         path: tools
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
@@ -36,7 +45,7 @@ jobs:
         languages: ${{ matrix.language }}
 
     - name: Build project
-      uses: cake-build/cake-action@v1
+      uses: cake-build/cake-action@v1.4.0
       with:
         script-path: recipe.cake
         target: DotNetCore-Build

diff --git a/.github/workflows/dependabot-cake.yml b/.github/workflows/dependabot-cake.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest # 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/README.md b/README.md
@@ -14,6 +14,13 @@ Please visit the Cake Documentation for a list of available aliases:
 
 http://cakebuild.net/dsl/nuget
 
+## 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.ExtendedNuGet Copyright 2015. The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+    "sdk": {
+        "allowPrerelease": true,
+        "version": "6.0.100",
+        "rollForward": "latestFeature"
+    }
+}
diff --git a/source/Cake.ExtendedNuGet.Tests/Cake.ExtendedNuGet.Tests.csproj b/source/Cake.ExtendedNuGet.Tests/Cake.ExtendedNuGet.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Common" Version="1.0.0" />
-    <PackageReference Include="Cake.Core" Version="1.0.0" />
-    <PackageReference Include="Cake.Testing" Version="1.0.0" />
-    <PackageReference Include="coverlet.msbuild" Version="3.0.3">
+    <PackageReference Include="Cake.Common" Version="2.0.0" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" />
+    <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="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>
@@ -23,7 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit.runner.console" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/source/Cake.ExtendedNuGet.Tests/Fakes/FakeCakeArguments.cs b/source/Cake.ExtendedNuGet.Tests/Fakes/FakeCakeArguments.cs
@@ -32,5 +32,7 @@ public ICollection<string> GetArguments(string name)
         {
             return _arguments.TryGetValue(name, out var val) ? val : new List<string>();
         }
+
+        public IDictionary<string, ICollection<string>> GetArguments() => _arguments;
     }
 }
diff --git a/source/Cake.ExtendedNuGet/Cake.ExtendedNuGet.csproj b/source/Cake.ExtendedNuGet/Cake.ExtendedNuGet.csproj
@@ -1,21 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- 
-      The target of this addin is NuGet.Packaging/NuGet.Core.
-      Since "they" double-target netstandard2.0 and net471
-      the guideline to target cake addins to net461 
-      (see https://cake-contrib.github.io/CakeContrib.Guidelines/rules/ccg0007)
-      can be ignored.
-     -->
-    <CakeContribGuidelinesOmitTargetFramework Include="net461" />
+    <None Include="../../README.md" Link="README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -30,20 +23,21 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/cake-contrib/Cake.ExtendedNuGet.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Cake.Common" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="CakeContrib.Guidelines" Version="1.1.1">
+    <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="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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,5 +32,7 @@ public ICollection<string> GetArguments(string name) @@
             {
                 return _arguments.TryGetValue(name, out var val) ? val : new List<string>();
             }
+            public IDictionary<string, ICollection<string>> GetArguments() => _arguments;
         }
     }