From 5cb4986c2f71c04a545876f613d9a380959ea146 Mon Sep 17 00:00:00 2001 From: Tom Clarke Date: Sat, 15 Jul 2023 13:51:29 +0100 Subject: [PATCH] mend FAKE not working in dotnet 7 build problem also add documentation picture --- build.cmd | 4 ++-- build.fsx | 22 ++++++++++++++-------- build.fsx.lock | 5 +++++ docs/img/drawblock-files-july-2023.png | Bin 0 -> 35574 bytes issie.sln | 6 +++--- paket.lock | 2 +- simulator_tests/wasm/wasm.csproj | 4 +++- 7 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 build.fsx.lock create mode 100644 docs/img/drawblock-files-july-2023.png diff --git a/build.cmd b/build.cmd index 0927384da..b34146275 100644 --- a/build.cmd +++ b/build.cmd @@ -2,5 +2,5 @@ cls dotnet tool restore dotnet paket install -:: dotnet restore build.proj -dotnet fake build -t %* \ No newline at end of file +:: dotnet -v restore build.proj +dotnet fsi build.fsx %* \ No newline at end of file diff --git a/build.fsx b/build.fsx index 39a8117b8..d43f759ed 100644 --- a/build.fsx +++ b/build.fsx @@ -1,15 +1,21 @@ -#r "paket: groupref FakeBuild //" -#load ".fake/build.fsx/intellisense.fsx" - -#if !FAKE -#r "netstandard" -#r "Facades/netstandard" // https://github.com/ionide/ionide-vscode-fsharp/issues/839#issuecomment-396296095 -#endif +#!/usr/bin/env -S dotnet fsi +#r "nuget: Fake.Core.Target" +#r "nuget: Fake.JavaScript.Npm, 6.0.0" +// +// Boilerplate to run FAKE under fsi allowing it to work with Dotnet 7 +// this seems going forward to be the best way to run FAKE +// +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 +// end of boilerplate open System open Fake.Core open Fake.Core.TargetOperators -open Fake.DotNet open Fake.IO open Fake.IO.Globbing.Operators open Fake.IO.FileSystemOperators diff --git a/build.fsx.lock b/build.fsx.lock new file mode 100644 index 000000000..6c78f8e1a --- /dev/null +++ b/build.fsx.lock @@ -0,0 +1,5 @@ +STORAGE: NONE +RESTRICTION: || (== net6.0) (== netstandard2.0) +NUGET + remote: https://api.nuget.org/v3/index.json + FSharp.Core (7.0.300) diff --git a/docs/img/drawblock-files-july-2023.png b/docs/img/drawblock-files-july-2023.png new file mode 100644 index 0000000000000000000000000000000000000000..63a49bcac3e214cb572d878ae87cc4e327362f40 GIT binary patch literal 35574 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 literal 0 HcmV?d00001 diff --git a/issie.sln b/issie.sln index 1f0f859b7..b6984c592 100644 --- a/issie.sln +++ b/issie.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29009.5 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33205.214 MinimumVisualStudioVersion = 10.0.40219.1 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Main", "src\Main\Main.fsproj", "{AAC1D6D8-2EEB-4BA3-AEAA-CBE06F8D968A}" EndProject @@ -9,6 +9,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{A2545711-2C3E-4CBF-BB76-AEF8C3665C50}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore + build.cmd = build.cmd build.fsx = build.fsx dotnet-tools.json = dotnet-tools.json LICENSE = LICENSE @@ -18,7 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt README.md = README.md webpack.config.main.js = webpack.config.main.js webpack.config.renderer.js = webpack.config.renderer.js - global.json = global.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "static", "static", "{EB34148C-70A6-4D00-BA10-87BBDFD4ACBF}" diff --git a/paket.lock b/paket.lock index 3704d4e69..d5691904a 100644 --- a/paket.lock +++ b/paket.lock @@ -1,4 +1,4 @@ -RESTRICTION: || (== net6.0) (== netcoreapp3.1) +RESTRICTION: || (== net6.0) (== net7.0) (== netcoreapp3.1) GROUP Electron NUGET diff --git a/simulator_tests/wasm/wasm.csproj b/simulator_tests/wasm/wasm.csproj index 5f9cd950f..c9aa13c8f 100644 --- a/simulator_tests/wasm/wasm.csproj +++ b/simulator_tests/wasm/wasm.csproj @@ -1,3 +1,4 @@ + net7.0 @@ -12,4 +13,5 @@ - + + \ No newline at end of file