Merge pull request #30 from zplan/feature/UpdateToCake2

akordowski · Apr 29, 2022 · 8fa8d17 · 8fa8d17
2 parents 16d16e2 + 0b18f9a
commit 8fa8d17
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 15 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -0,0 +1,25 @@
+name: .NET
+
+on:
+  push:
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+        matrix:
+            os: [windows-latest, ubuntu-latest, macos-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore ./src/Cake.Compression.sln
+    - name: Build
+      run: dotnet build ./src/Cake.Compression.sln --no-restore
+    - name: Test
+      run: dotnet test ./src/Cake.Compression.sln --no-build --verbosity normal
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,3 +1,11 @@
+### 0.3.0
+Update to Cake 2.0.0
+Add framework support for `netcoreapp3.1`, `net6.0`
+Drop framework support for `net461`, `netstandard2.0`
+Update contrib icon
+Update dependencies
+Add GitHub Action
+
 ### 0.2.6
 Add framework support for `net461`, `netstandard2.0`, `net5.0`
 

diff --git a/assets/cake-contrib-medium.png b/assets/cake-contrib-medium.png
diff --git a/src/Cake.Compression.Tests/Cake.Compression.Tests.csproj b/src/Cake.Compression.Tests/Cake.Compression.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Testing" Version="1.0.0" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="Cake.Testing" Version="2.0.0" />
+    <PackageReference Include="NSubstitute" Version="4.3.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cake.Compression.sln b/src/Cake.Compression.sln
@@ -1,16 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Compression", "Cake.Compression\Cake.Compression.csproj", "{DFCE574D-731A-4C89-9B74-9FF2A93ED966}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Compression", "Cake.Compression\Cake.Compression.csproj", "{DFCE574D-731A-4C89-9B74-9FF2A93ED966}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{5CF45611-BAAE-42E7-BD9C-3910A7DEB68C}"
 	ProjectSection(SolutionItems) = preProject
 		..\build.bat = ..\build.bat
 		..\build.cake = ..\build.cake
 		..\build.ps1 = ..\build.ps1
 		..\build.sh = ..\build.sh
+		..\.github\workflows\dotnet.yml = ..\.github\workflows\dotnet.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{8CF42A9F-2A6F-4E2B-9495-A90E3A0A3032}"
@@ -21,7 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{8CF4
 		..\RELEASENOTES.md = ..\RELEASENOTES.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Compression.Tests", "Cake.Compression.Tests\Cake.Compression.Tests.csproj", "{3BBE9E87-073D-4191-9A4B-13ED553FA7DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Compression.Tests", "Cake.Compression.Tests\Cake.Compression.Tests.csproj", "{3BBE9E87-073D-4191-9A4B-13ED553FA7DA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Cake.Compression/Cake.Compression.csproj b/src/Cake.Compression/Cake.Compression.csproj
@@ -1,21 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
-    <Version>0.2.6</Version>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>0.3.0</Version>
     <Copyright>Copyright (c) $([System.DateTime]::Now.Year) Artur Kordowski</Copyright>
     <Description>A Cake AddIn which provides compression functionality for BZip2, GZip and Zip. </Description>
     <Authors>Artur Kordowski</Authors>
     <PackageProjectUrl>https://github.com/akordowski/Cake.Compression</PackageProjectUrl>
     <RepositoryUrl>https://github.com/akordowski/Cake.Compression</RepositoryUrl>
-    <PackageTags>cake build compression bzip2 gzip tar zip</PackageTags>
+    <PackageTags>cake-addin cake build compression bzip2 gzip tar zip</PackageTags>
     <PackageIcon>cake-contrib-medium.png</PackageIcon>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\Cake.Compression.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Cake.Compression.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Common" version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" version="2.0.0" PrivateAssets="All" />
     <PackageReference Include="SharpZipLib" version="1.3.1" />
   </ItemGroup>
   <ItemGroup>