diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json deleted file mode 100644 index db6b2cb..0000000 --- a/.config/dotnet-tools.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": { - "cake.tool": { - "version": "2.0.0", - "commands": [ - "dotnet-cake" - ] - } - } - } \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3bf352d..eb71175 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: - name: Restore dotnet tools run: dotnet tool restore - name: Run CAKE - run: dotnet cake + run: dotnet run --project ./build/Build.csproj - name: Package artifacts uses: actions/upload-artifact@main with: @@ -71,10 +71,8 @@ jobs: with: name: SDL-ubuntu-20.04 path: artifacts-linux-x64 - - name: Restore dotnet tools - run: dotnet tool restore - name: Run CAKE - run: dotnet cake --target Package + run: dotnet run --project ./build/Build.csproj -- "--target=Package" - name: Push packages run: dotnet nuget push bin/Release/*.nupkg --source https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json --api-key ${GITHUB_TOKEN} env: diff --git a/build/PackageTask.cs b/build/PackageTask.cs index 3e18e6e..6172055 100644 --- a/build/PackageTask.cs +++ b/build/PackageTask.cs @@ -4,8 +4,6 @@ namespace BuildScripts; [TaskName("Package")] public sealed class PackageTask : FrostingTask { - public override bool ShouldRun(BuildContext context) => context.IsRunningOnLinux(); - public override void Run(BuildContext context) { var sdlMajor = context.FindRegexMatchGroupInFile("sdl/include/SDL_version.h", @"#define SDL_MAJOR_VERSION +(?\d+)", 1, System.Text.RegularExpressions.RegexOptions.Singleline);