Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mend FAKE not working in dotnet 7 build problem #312

Merged
merged 1 commit into from
Jul 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
cls
dotnet tool restore
dotnet paket install
:: dotnet restore build.proj
dotnet fake build -t %*
:: dotnet -v restore build.proj
dotnet fsi build.fsx %*
22 changes: 14 additions & 8 deletions build.fsx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions build.fsx.lock
Original file line number Diff line number Diff line change
@@ -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)
Binary file added docs/img/drawblock-files-july-2023.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions issie.sln
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion paket.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RESTRICTION: || (== net6.0) (== netcoreapp3.1)
RESTRICTION: || (== net6.0) (== net7.0) (== netcoreapp3.1)

GROUP Electron
NUGET
Expand Down
4 changes: 3 additions & 1 deletion simulator_tests/wasm/wasm.csproj
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
Expand All @@ -12,4 +13,5 @@
<ProjectReference Include="..\dotnet\dotnet.fsproj" />
<!-- <ProjectReference Include="..\..\src\Renderer\Renderer.fsproj" /> -->
</ItemGroup>
</Project>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>