Skip to content
Open
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
20 changes: 20 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "9.0.2",
"commands": [
"paket"
],
"rollForward": false
},
"fake-cli": {
"version": "6.1.3",
"commands": [
"fake"
],
"rollForward": false
}
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
.idea/

# User-specific files
*.suo
Expand Down
565 changes: 565 additions & 0 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

Binary file removed .paket/paket.bootstrapper.exe
Binary file not shown.
38 changes: 0 additions & 38 deletions .paket/paket.targets

This file was deleted.

33 changes: 12 additions & 21 deletions FsReveal.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{C067DEF0-89EB-42B8-A893-02389EF50566}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsReveal", "src\FsReveal\FsReveal.fsproj", "{7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
Expand All @@ -34,10 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
docs\content\index.md = docs\content\index.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsReveal.Tests", "tests\FsReveal.Tests\FsReveal.Tests.fsproj", "{E789C72A-5CFD-436B-8EF1-61AA2852A89F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "slides", "slides", "{F77011BE-03C0-4CF1-8398-B730548F7700}"
ProjectSection(SolutionItems) = preProject
docs\slides\named-slides.md = docs\slides\named-slides.md
Expand All @@ -48,28 +36,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "slides", "slides", "{F77011
docs\slides\vertical-slides.md = docs\slides\vertical-slides.md
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsReveal", "src\FsReveal\FsReveal.fsproj", "{ECC094DD-4C78-4760-B06C-0BB75971B155}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsReveal.Tests", "src\FsReveal.Tests\FsReveal.Tests.fsproj", "{83F29F8D-2E60-4459-9C34-AFFC8087F5C9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Release|Any CPU.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|Any CPU.Build.0 = Release|Any CPU
{ECC094DD-4C78-4760-B06C-0BB75971B155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ECC094DD-4C78-4760-B06C-0BB75971B155}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECC094DD-4C78-4760-B06C-0BB75971B155}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECC094DD-4C78-4760-B06C-0BB75971B155}.Release|Any CPU.Build.0 = Release|Any CPU
{83F29F8D-2E60-4459-9C34-AFFC8087F5C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83F29F8D-2E60-4459-9C34-AFFC8087F5C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83F29F8D-2E60-4459-9C34-AFFC8087F5C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83F29F8D-2E60-4459-9C34-AFFC8087F5C9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{E789C72A-5CFD-436B-8EF1-61AA2852A89F} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{F77011BE-03C0-4CF1-8398-B730548F7700} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
EndGlobalSection
EndGlobal
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 2.0.0 - 23.10.2025
* Use .NET 8


### 1.3.1 - 17.06.2016
* BUGFIX: Position tooltips properly on all screens

Expand Down
15 changes: 5 additions & 10 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
@echo off
cls

.paket\paket.bootstrapper.exe
if errorlevel 1 (
exit /b %errorlevel%
)
rem dotnet paket restore
rem if errorlevel 1 (
rem exit /b %errorlevel%
rem )

.paket\paket.exe restore
if errorlevel 1 (
exit /b %errorlevel%
)

packages\build\FAKE\tools\FAKE.exe build.fsx %*
dotnet fake run build.fsx %*
60 changes: 30 additions & 30 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@
// FAKE build script
// --------------------------------------------------------------------------------------

#r @"packages/build/FAKE/tools/FakeLib.dll"

open Fake
open Fake.Git
open Fake.AssemblyInfoFile
open Fake.ReleaseNotesHelper
// #r "paket: groupref Build //"
#r "paket: nuget Fake.DotNet.Cli //"
open Fake.DotNet

//open Fake
//open Fake.Git
//open Fake.AssemblyInfoFile
//open Fake.ReleaseNotesHelper
open System
open System.IO
#if MONO
#else
#load "packages/build/SourceLink.Fake/Tools/Fake.fsx"
open SourceLink
#endif
// #load "packages/build/SourceLink.Fake/tools/Fake.fsx"
//open SourceLink

// --------------------------------------------------------------------------------------
// START TODO: Provide project-specific details below
Expand Down Expand Up @@ -117,13 +116,13 @@ Target "CleanDocs" (fun _ ->

Target "Build" (fun _ ->
!! solutionFile
|> MSBuildRelease "" "Rebuild"
|> DoNet.exec dotnetSimple "build"
|> ignore
)

// --------------------------------------------------------------------------------------
// Run the unit tests using test runner

(*
Target "RunTests" (fun _ ->
!! testAssemblies
|> NUnit (fun p ->
Expand All @@ -133,8 +132,6 @@ Target "RunTests" (fun _ ->
OutputFile = "TestResults.xml" })
)

#if MONO
#else
// --------------------------------------------------------------------------------------
// SourceLink allows Source Indexing on the PDB generated by the compiler, this allows
// the ability to step through the source code of external libraries https://github.com/ctaggart/SourceLink
Expand All @@ -153,11 +150,11 @@ Target "SourceLink" (fun _ ->
Pdbstr.exec proj.OutputFilePdb proj.OutputFilePdbSrcSrv
)
)
#endif
*)

// --------------------------------------------------------------------------------------
// Build a NuGet package

(*
Target "NuGet" (fun _ ->
Paket.Pack (fun p ->
{ p with
Expand All @@ -168,10 +165,10 @@ Target "NuGet" (fun _ ->
Target "PublishNuGet" (fun _ ->
Paket.Push id
)

*)
// --------------------------------------------------------------------------------------
// Generate the documentation

(*
Target "GenerateReferenceDocs" (fun _ ->
if not <| executeFSIWithArgs "docs/tools" "generate.fsx" ["--define:RELEASE"; "--define:REFERENCE"] [] then
failwith "generating reference documentation failed"
Expand Down Expand Up @@ -221,12 +218,12 @@ Target "KeepRunning" (fun _ ->
watcher.EnableRaisingEvents <- false
watcher.Dispose()
)

*)
Target "GenerateDocs" DoNothing

// --------------------------------------------------------------------------------------
// Release Scripts

(*
Target "ReleaseDocs" (fun _ ->
let tempDocsDir = "temp/gh-pages"
CleanDir tempDocsDir
Expand All @@ -238,7 +235,8 @@ Target "ReleaseDocs" (fun _ ->
Git.Commit.Commit tempDocsDir (sprintf "Update generated documentation for version %s" release.NugetVersion)
Branches.push tempDocsDir
)

*)
(*
#load "paket-files/build/fsharp/FAKE/modules/Octokit/Octokit.fsx"
open Octokit

Expand All @@ -256,28 +254,29 @@ Target "Release" (fun _ ->
|> releaseDraft
|> Async.RunSynchronously
)

*)
Target "BuildPackage" DoNothing

// --------------------------------------------------------------------------------------
// Run all targets by default. Invoke 'build <Target>' to override

Target "All" DoNothing

"Clean"
==> "AssemblyInfo"

(*
"Clean"
==> "AssemblyInfo"
==> "Build"
==> "RunTests"
=?> ("GenerateReferenceDocs",isLocalBuild && not isMono)
=?> ("GenerateDocs",isLocalBuild && not isMono)
=?> ("GenerateReferenceDocs",isLocalBuild)
=?> ("GenerateDocs",isLocalBuild)
==> "All"
=?> ("ReleaseDocs",isLocalBuild && not isMono)
=?> ("ReleaseDocs",isLocalBuild)

"All"
//#if MONO
//#else
// =?> ("SourceLink", Pdbstr.tryFind().IsSome )
//#endif
==> "NuGet"
==> "BuildPackage"

Expand All @@ -296,5 +295,6 @@ Target "All" DoNothing
"BuildPackage"
==> "PublishNuGet"
==> "Release"

*)
RunTargetOrDefault "All"

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: || (== net8.0) (== netstandard2.0)
NUGET
remote: https://api.nuget.org/v3/index.json
FSharp.Core (8.0.403)
42 changes: 12 additions & 30 deletions build.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,33 +1,15 @@
#!/bin/bash
if test "$OS" = "Windows_NT"
then
# use .Net

.paket/paket.bootstrapper.exe
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi

.paket/paket.exe restore
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
dotnet tool restore
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi

packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else
# use mono
mono .paket/paket.bootstrapper.exe
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
#dotnet paket restore --target-framework "net8.0"
#exit_code=$?
#if [ $exit_code -ne 0 ]; then
# exit $exit_code
#fi

mono .paket/paket.exe restore
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
mono packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
fi
dotnet fake run build.fsx
dotnet build
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "8.0.0",
"rollForward": "latestMajor",
"allowPrerelease": false
}
}
Binary file removed lib/FSharp.Compiler.Interactive.Settings.dll
Binary file not shown.
Loading