Merge pull request #34 from juro-org/release/2.0.0

Release/2.0.0
juro-org · Dec 8, 2021 · 872d436 · 872d436
2 parents ff5f10a + 1400c1f
commit 872d436
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,23 +26,16 @@ jobs:
 
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
-
-      - uses: actions/[email protected]
-        with:
-          # codecov and unittests need 2.1
-          dotnet-version: '2.1.818'
-      - uses: actions/[email protected]
-        with:
-          dotnet-version: '3.1.414'
-      - uses: actions/[email protected]
-        with:
-          # gitversion needs 5.0
-          dotnet-version: '5.0.402'
-      - uses: actions/[email protected]
-        with:
-          # need at least .NET 6 rc2 to build
-          dotnet-version: '6.0.100-rc.2.21505.57'
-          include-prerelease: true
+
+      - name: Install .NET SDK
+        uses: actions/[email protected]
+        with:          
+          # all SDKs the project is targeting + codecov and unittests need 2.1
+          dotnet-version: |
+            2.1.818
+            3.1.x
+            5.0.x
+            6.0.x
 
       - name: Cache Tools
         uses: actions/cache@v2

diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![standard-readme compliant][]][standard-readme]
 [![NuGet package][nugetimage]][nuget]
+[![Cake][cakeimage]][cake]
 
 Alias to assist with running SPCAF from Cake build scripts
 
@@ -66,3 +67,5 @@ Small note: If editing the Readme, please conform to the [standard-readme][] spe
 [license]: LICENSE.txt
 [standard-readme]: https://github.com/RichardLitt/standard-readme
 [standard-readme compliant]: https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square
+[cakeimage]: https://img.shields.io/static/v1?label=cake&message=v2.0.0&color=8E7D3E&style=flat-square
+[cake]: https://cakebuild.net/blog/2021/11/cake-v2.0.0-released
diff --git a/sample/script/.config/dotnet-tools.json b/sample/script/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
       "cake.tool": {
-        "version": "1.3.0",
+        "version": "2.0.0",
         "commands": [
           "dotnet-cake"
         ]

diff --git a/src/Cake.SPCAF.Tests/Cake.SPCAF.Tests.csproj b/src/Cake.SPCAF.Tests/Cake.SPCAF.Tests.csproj
@@ -1,21 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
-        <TargetFrameworks Condition="'$(OS)'!='Unix'">$(TargetFrameworks);net461</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
-
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
 
 
     <ItemGroup>
-        <PackageReference Include="Cake.Testing" Version="1.3.0" />
+        <PackageReference Include="Cake.Testing" Version="2.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="nunit" Version="3.13.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
         <PackageReference Include="Shouldly" Version="4.0.3" />
     </ItemGroup>
     <ItemGroup>

diff --git a/src/Cake.SPCAF/Cake.SPCAF.csproj b/src/Cake.SPCAF/Cake.SPCAF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -18,7 +18,7 @@
         <Description>Alias to assist with running SPCAF from Cake build scripts</Description>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/juro-org/Cake.SPCAF</PackageProjectUrl>
-        <PackageTags>cake;addin;build;cake-build;cake-addin;spcaf;sharepoint</PackageTags>
+        <PackageTags>cake;addin;build;cake-build;cake-addin;spcaf;sharepoint;script</PackageTags>
         <RepositoryUrl>https://github.com/juro-org/Cake.SPCAF.git</RepositoryUrl>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageReleaseNotes>https://github.com/juro-org/Cake.SPCAF/releases/tag/$(Version)</PackageReleaseNotes>
@@ -36,8 +36,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.1.2">
+        <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>