From 549e56803cd30d648f0a7883c81d0de07880f3b4 Mon Sep 17 00:00:00 2001 From: XperiAndri Date: Fri, 26 May 2023 14:01:00 +0400 Subject: [PATCH] Switched from `dotnet fake` to `dotnet fsi` --- .config/dotnet-tools.json | 2 +- .github/workflows/dotnetcore.yml | 2 +- build.cmd | 2 +- build.fsx | 29 +++++++++++++---------------- build.sh | 4 ++-- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 07d86468..4e879886 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,4 +27,4 @@ ] } } -} \ No newline at end of file +} diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 300fee62..95243396 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -33,4 +33,4 @@ jobs: - name: Paket Restore run: dotnet paket restore - name: Build and Test - run: dotnet fake run build.fsx + run: dotnet fsi build.fsx diff --git a/build.cmd b/build.cmd index 068103ab..609bd288 100644 --- a/build.cmd +++ b/build.cmd @@ -1,4 +1,4 @@ @echo off dotnet tool restore dotnet paket restore -dotnet fake run build.fsx %* +dotnet fsi build.fsx %* diff --git a/build.fsx b/build.fsx index ef8d9b90..3d63ade1 100644 --- a/build.fsx +++ b/build.fsx @@ -1,19 +1,16 @@ -#r @"paket: -source https://nuget.org/api/v2 -framework net6.0 -nuget FSharp.Core 6.0.0.0 -nuget Fake.Core.Target -nuget Fake.Core.Process -nuget Fake.Core.ReleaseNotes -nuget Fake.IO.FileSystem -nuget Fake.DotNet.Cli -nuget Fake.DotNet.MSBuild -nuget Fake.DotNet.AssemblyInfoFile -nuget Fake.DotNet.Paket -nuget Fake.DotNet.FSFormatting -nuget Fake.Tools.Git -nuget Fake.Api.GitHub //" -#load "./.fake/build.fsx/intellisense.fsx" +#load ".fake/build.fsx/intellisense.fsx" + +// Boilerplate +System.Environment.GetCommandLineArgs() +|> Array.skip 2 // skip fsi.exe; build.fsx +|> Array.toList +|> Fake.Core.Context.FakeExecutionContext.Create false __SOURCE_FILE__ +|> Fake.Core.Context.RuntimeContext.Fake +|> Fake.Core.Context.setExecutionContext + +#r "nuget: Fake.DotNet.Cli" +#r "nuget: Fake.IO.FileSystem" +#r "nuget: Fake.Core.Target" open Fake open Fake.Core.TargetOperators diff --git a/build.sh b/build.sh index 2fc81634..89f23555 100755 --- a/build.sh +++ b/build.sh @@ -5,5 +5,5 @@ then else dotnet tool restore dotnet paket restore - dotnet fake run build.fsx $@ -fi \ No newline at end of file + dotnet fsi build.fsx $@ +fi