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

fstar.exe is no longer buildable in F# as a .NET executable #2512

Merged
merged 20 commits into from
Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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 CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ https://github.com/FStarLang/FStar/wiki/Style-guide

## Snapshots

The F\* compiler is written in F\*/F#, then extracted to OCaml. We keep a copy
The F\* compiler is written in F\*, then extracted to OCaml. We keep a copy
of the OCaml extracted compiler under version control. We **do not** expect external
pull requests to refresh the snapshot. However, reviewers should take it upon
themselves to update the snapshot before merging to master when this is needed
Expand Down Expand Up @@ -162,7 +162,7 @@ Guido Martinez

## Tutorial

Catalin Hritcu
Nik Swamy

## Examples

Expand Down
10 changes: 0 additions & 10 deletions bin/fstar-any.sh

This file was deleted.

32 changes: 16 additions & 16 deletions examples/algorithms/BinarySearch.fst.hints

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions examples/algorithms/BinarySearch/BinarySearch.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@
<!-- Custom FStar flags used in this project . -->
<FSTAR_FLAGS>--use_hints --record_hints</FSTAR_FLAGS>
</PropertyGroup>
<Import Project="$(FSTAR_HOME)\fsharp.extraction.targets" />
<Import Project="$(FSTAR_HOME)\examples\fsharp.extraction.targets" />
<ItemGroup>
<Compile Include="..\BinarySearch.fst" Link="BinarySearch.fst" />
<None Include="BinarySearch.fsx" />
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>$(FSTAR_HOME)\ulib\fs\VS\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<!-- <Reference Include="System.ValueTuple"> -->
<!-- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath> -->
<!-- <Private>True</Private> -->
<!-- </Reference> -->
<Reference Include="FSharp.Compatibility.OCaml">
<HintPath>..\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll</HintPath>
<HintPath>$(FSTAR_HOME)\ulib\fs\VS\packages\FSharp.Compatibility.OCaml.0.1.14\lib\net45\FSharp.Compatibility.OCaml.dll</HintPath>
</Reference>
<Reference Include="ulibfs">
<HintPath>$(FSTAR_HOME)\bin\ulibfs.dll</HintPath>
Expand Down
7 changes: 3 additions & 4 deletions examples/algorithms/BinarySearch/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FSharp.Core" version="4.5.2" targetFramework="net45" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
<package id="FSharp.Compatibility.OCaml" version="0.1.10" targetFramework="net45" />
</packages>
<package id="FSharp.Core" version="4.3.4" targetFramework="net45" />
<package id="FSharp.Compatibility.OCaml" version="0.1.14" targetFramework="net45" />
</packages>
Loading