Merge pull request #107 from nils-a/feature/GH-106

(#106) bumped Cake to 2.0.0

Author: nils-a

.appveyor.yml

@@ -13,7 +13,7 @@ install:
   - 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-rc.2.21505.57 -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
 

.github/workflows/build.yml

@@ -30,20 +30,12 @@ jobs:
 
       - uses: actions/setup-dotnet@v1.9.0
         with:
-          # codecov and unittests need 2.1
-          dotnet-version: '2.1.818'
-      - uses: actions/setup-dotnet@v1.9.0
-        with:
-          dotnet-version: '3.1.414'
-      - uses: actions/setup-dotnet@v1.9.0
-        with:
-          # gitversion needs 5.0
-          dotnet-version: '5.0.402'
-      - uses: actions/setup-dotnet@v1.9.0
-        with:
-          # need at least .NET 6 rc2 to build
-          dotnet-version: '6.0.100-rc.2.21505.57'
-          include-prerelease: true
+          # 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.1.7

.github/workflows/codeql-analysis.yml

@@ -26,20 +26,12 @@ jobs:
 
     - uses: actions/setup-dotnet@v1.9.0
       with:
-        # codecov and unittests need 2.1
-        dotnet-version: '2.1.818'
-    - uses: actions/setup-dotnet@v1.9.0
-      with:
-        dotnet-version: '3.1.414'
-    - uses: actions/setup-dotnet@v1.9.0
-      with:
-        # gitversion needs 5.0
-        dotnet-version: '5.0.402'
-    - uses: actions/setup-dotnet@v1.9.0
-      with:
-        # need at least .NET 6 rc2 to build
-        dotnet-version: '6.0.100-rc.2.21505.57'
-        include-prerelease: true
+        # 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.1.7

global.json

@@ -1,7 +1,7 @@
 {
     "sdk": {
         "allowPrerelease": true,
-        "version": "6.0.100-rc.2",
+        "version": "6.0.100",
         "rollForward": "latestFeature"
     }
 }

source/Cake.ExtendedNuGet.Tests/Cake.ExtendedNuGet.Tests.csproj

@@ -1,13 +1,13 @@
 <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="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>

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;
     }
 }

source/Cake.ExtendedNuGet/Cake.ExtendedNuGet.csproj

@@ -1,21 +1,13 @@
 <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>
 
@@ -39,9 +31,9 @@
       <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.2.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>