diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5262437..6294a42 100644 --- 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/setup-dotnet@v1.8.2 - with: - # codecov and unittests need 2.1 - dotnet-version: '2.1.818' - - uses: actions/setup-dotnet@v1.8.2 - with: - dotnet-version: '3.1.414' - - uses: actions/setup-dotnet@v1.8.2 - with: - # gitversion needs 5.0 - dotnet-version: '5.0.402' - - uses: actions/setup-dotnet@v1.8.2 - 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/setup-dotnet@v1.9.0 + 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 index 03f23d6..e165e8d 100644 --- 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 index 0037d90..db6b2cb 100644 --- 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 index e0e1cf7..1622146 100644 --- a/src/Cake.SPCAF.Tests/Cake.SPCAF.Tests.csproj +++ b/src/Cake.SPCAF.Tests/Cake.SPCAF.Tests.csproj @@ -1,21 +1,19 @@ - netcoreapp3.1 - $(TargetFrameworks);net461 + netcoreapp3.1;net5.0;net6.0 $(NoWarn);CS1591;SA1600 - false - + - + diff --git a/src/Cake.SPCAF/Cake.SPCAF.csproj b/src/Cake.SPCAF/Cake.SPCAF.csproj index e97cf8a..b5d4712 100644 --- a/src/Cake.SPCAF/Cake.SPCAF.csproj +++ b/src/Cake.SPCAF/Cake.SPCAF.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netcoreapp3.1;net5.0;net6.0 true true snupkg @@ -18,7 +18,7 @@ Alias to assist with running SPCAF from Cake build scripts MIT https://github.com/juro-org/Cake.SPCAF - cake;addin;build;cake-build;cake-addin;spcaf;sharepoint + cake;addin;build;cake-build;cake-addin;spcaf;sharepoint;script https://github.com/juro-org/Cake.SPCAF.git README.md https://github.com/juro-org/Cake.SPCAF/releases/tag/$(Version) @@ -36,8 +36,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive