Merge pull request #176 from nils-a/features/GH-173

(#173) bumped Cake to 2.0.0
cake-contrib · Dec 2, 2021 · e52264f · e52264f
2 parents eda712b + 7cca09f
commit e52264f
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,6 +47,13 @@ jobs:
         uses: actions/checkout@v2
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: |
+            2.1.818
+            3.1.x
+            5.0.x
+            6.0.x
       - name: Cache Tools
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,6 +34,13 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+    - uses: actions/[email protected]
+      with:
+        dotnet-version: |
+          2.1.818
+          3.1.x
+          5.0.x
+          6.0.x
 
     - name: Cache Tools
       uses: actions/cache@v2

diff --git a/demo/cake/.config/dotnet-tools.json b/demo/cake/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "2.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}
diff --git a/demo/cake/build.cake b/demo/cake/build.cake
@@ -1,5 +1,5 @@
 #tool "nuget:?package=7-Zip.CommandLine&version=18.1.0"
-#r "..\..\src\Cake.7zip\bin\Debug\netstandard2.0\Cake.7zip.dll"
+#r "..\..\src\Cake.7zip\bin\Release\net6.0\Cake.7zip.dll"
 
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS

diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj
@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)..</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Frosting" Version="1.3.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Cake.7zip, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\src\Cake.7zip\bin\Release\netstandard2.0\Cake.7zip.dll</HintPath>
+    <Reference Include="Cake.7zip, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\..\..\src\Cake.7zip\bin\Release\net6.0\Cake.7zip.dll</HintPath>
     </Reference>
+    <PackageReference Include="Cake.Frosting" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="output\**" />

diff --git a/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj b/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;</TargetFrameworks>
-        <TargetFrameworks Condition="'$(OS)'!='Unix'">$(TargetFrameworks);net461</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <CodeAnalysisRuleSet>..\cake.7zip.ruleset</CodeAnalysisRuleSet>
 
         <IsPackable>false</IsPackable>
@@ -11,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Testing" Version="1.3.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>

diff --git a/src/Cake.7zip/Cake.7zip.csproj b/src/Cake.7zip/Cake.7zip.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net461;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -39,8 +39,8 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.2.0" PrivateAssets="All" />
+        <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
+        <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0" PrivateAssets="All" />
         <PackageReference Include="IDisposableAnalyzers" Version="4.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>