From 3a8915e624bb3d19052d5ad3d8aef070967ad4ef Mon Sep 17 00:00:00 2001 From: "C. Augusto Proiete" Date: Sun, 12 Dec 2021 10:18:55 -0400 Subject: [PATCH] Update ExcelDna-Unpack build process to use Cake v2.0.0 --- .config/dotnet-tools.json | 2 +- .github/workflows/ci.yml | 15 +++++---------- build.cake | 7 +++---- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1bee19e..7ade7dd 100644 --- a/.config/dotnet-tools.json +++ b/.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/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3366e96..be28b9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,26 +26,21 @@ jobs: fail-fast: false matrix: job: - - os: ubuntu-18.04 - build: ./build.sh - - os: ubuntu-20.04 - build: ./build.sh - os: windows-2019 build: ./build.cmd push: true - os: windows-2022 build: ./build.cmd - - os: macos-10.15 - build: ./build.sh - - os: macos-11 - build: ./build.sh name: ${{ matrix.job.os }} runs-on: ${{ matrix.job.os }} steps: - - name: Setup net5.0 + - name: Install .NET SDKs uses: actions/setup-dotnet@v1.9.0 with: - dotnet-version: "5.0.401" + dotnet-version: | + 3.1.415 + 5.0.403 + 6.0.100 - name: Run dotnet --info run: dotnet --info - uses: actions/checkout@v2.4.0 diff --git a/build.cake b/build.cake index 6fae4aa..b4e279a 100644 --- a/build.cake +++ b/build.cake @@ -1,9 +1,9 @@ #tool "nuget:?package=NuGet.CommandLine&version=6.0.0" #tool "nuget:?package=7-Zip.CommandLine&version=18.1.0" -#addin "nuget:?package=Cake.MinVer&version=1.0.1" -#addin "nuget:?package=Cake.Args&version=1.0.1" -#addin "nuget:?package=Cake.7zip&version=1.0.4" +#addin "nuget:?package=Cake.MinVer&version=2.0.0" +#addin "nuget:?package=Cake.Args&version=2.0.0" +#addin "nuget:?package=Cake.7zip&version=2.0.0" var target = ArgumentOrDefault("target") ?? "publish"; var buildVersion = MinVer(s => s.WithTagPrefix("v").WithDefaultPreReleasePhase("preview")); @@ -38,7 +38,6 @@ Task("build") { MSBuild("./exceldna-unpack.sln", settings => settings .SetConfiguration(configuration) - .UseToolVersion(MSBuildToolVersion.VS2019) .WithTarget("Rebuild") .SetVersion(buildVersion.Version) .SetFileVersion(buildVersion.FileVersion)