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.

Sign up for GitHub

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

Fix failing F# build and #1403 #1404

Merged
merged 10 commits into from
Mar 17, 2018
Merged

Fix failing F# build and #1403 #1404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
884205c
fix 1403, plus some other bugs
A-Manning Mar 13, 2018
5022d9a
nits
A-Manning Mar 13, 2018
812932e
fix build issues with F# 4.1
A-Manning Mar 13, 2018
4013bdb
Merge branch 'master' into amanning-fix1403
mtzguido Mar 14, 2018
fb65817
merging from upstream
A-Manning Mar 15, 2018
6b65f3a
fix so that projection works in F# and F*
A-Manning Mar 15, 2018
25b4a30
ocaml and F* builds passing now
A-Manning Mar 15, 2018
0405435
Merge branch 'master' into amanning-fix1403
A-Manning Mar 15, 2018
7e28608
merge upstream
A-Manning Mar 15, 2018
6c1fabb
Merge branch 'master' into amanning-fix1403
A-Manning Mar 16, 2018
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
5 changes: 2 additions & 3 deletions src/basic/basic.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RootNamespace>basic</RootNamespace>
<AssemblyName>basic</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>basic</Name>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\VS\</SolutionDir>
Expand Down Expand Up @@ -108,8 +107,8 @@
<HintPath>..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@A-Manning @mtzguido:

With @aseemr, we're looking at this change. It breaks the F# build for us on VS 2015.

Can you explain the rationale behind this change?

Thanks!
-Nik

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tahina-pro had looked a long while ago into making F* build with VS2017 and VS2015 at the same time ... I seem to remember he got familiar with these assemblies details

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I remember, changes I made on *.fsproj files in commit 4cc0e8b work in both VS2015 and VS2017.

Not sure what has changed since.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When trying to build with F# 4.1 using msbuild (also reproduced with rider 2017.3) I was getting errors resulting from FSharp.Core being resolved to 4.4.0.0, as in #1358.

I don't have VS, so I'm not able to test this in order to make it work with VS2015, VS2017, and F# 4.1. Perhaps these changes should be reverted.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch, sorry to have merged this without checking the F# build... I'm trying to get my F# setup working again so I can test this. There's some more info in #1395.

<Private>True</Private>
</Reference>
<Reference Include="FSharp.PPrint">
Expand Down
3 changes: 2 additions & 1 deletion src/basic/boot/FStar.Util.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ val set_intersect: set<'a> -> set<'a> -> set<'a>
val set_is_subset_of: set<'a> -> set<'a> -> bool
val set_count: set<'a> -> int
val set_difference: set<'a> -> set<'a> -> set<'a>
val set_symmetric_difference: set<'a> -> set<'a> -> set<'a>
val set_eq: set<'a> -> set<'a> -> bool

(* A fifo_set is a set preserving the insertion order *)
//type fifo_set<'a>
Expand Down Expand Up @@ -285,7 +287,6 @@ val right: either<'a,'b> -> 'b
val find_dup: ('a -> 'a -> bool) -> list<'a> -> option<'a>
val nodups: ('a -> 'a -> bool) -> list<'a> -> bool
val sort_with: ('a -> 'a -> int) -> list<'a> -> list<'a>
val set_eq: ('a -> 'a -> int) -> list<'a> -> list<'a> -> bool
val remove_dups: ('a -> 'a -> bool) -> list<'a> -> list<'a>
val add_unique: ('a -> 'a -> bool) -> 'a -> list<'a> -> list<'a>
val try_find: ('a -> bool) -> list<'a> -> option<'a>
Expand Down
13 changes: 5 additions & 8 deletions src/basic/boot/NotFStar.Util.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ let set_intersect ((s1, eq):set<'a>) ((s2, _):set<'a>) = List.filter (fun y -> L
let set_is_subset_of ((s1, eq): set<'a>) ((s2, _):set<'a>) = List.for_all (fun y -> List.exists (eq y) s2) s1
let set_count ((s1, _):set<'a>) = s1.Length
let set_difference ((s1, eq):set<'a>) ((s2, _):set<'a>) : set<'a> = List.filter (fun y -> not (List.exists (eq y) s2)) s1, eq
let set_symmetric_difference ((s1, eq):set<'a>) ((s2, _):set<'a>) : set<'a> =
set_union (set_difference (s1, eq) (s2, eq))
(set_difference (s2, eq) (s1, eq))
let set_eq ((s1, eq):set<'a>) ((s2, _):set<'a>) : bool =
set_is_empty (set_symmetric_difference (s1, eq) (s2, eq))


(* fifo_set is implemented with the same underlying representation as sets *)
Expand Down Expand Up @@ -522,14 +527,6 @@ let try_find_index f l = List.tryFindIndex f l

let sort_with f l = List.sortWith f l

let set_eq f l1 l2 =
let eq x y = f x y = 0 in
let l1 = sort_with f l1 |> remove_dups eq in
let l2 = sort_with f l2 |> remove_dups eq in
if List.length l1 <> List.length l2
then false
else List.forall2 eq l1 l2

let bind_opt opt f =
match opt with
| None -> None
Expand Down
11 changes: 6 additions & 5 deletions src/basic/ml/FStar_Util.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ let set_is_subset_of ((s1, eq):'a set) ((s2, _):'a set) =
let set_count ((s1, _):'a set) = Z.of_int (BatList.length s1)
let set_difference ((s1, eq):'a set) ((s2, _):'a set) : 'a set =
(BatList.filter (fun y -> not (BatList.exists (eq y) s2)) s1, eq)
let set_symmetric_difference ((s1, eq):'a set) ((s2, _):'a set) : 'a set =
set_union (set_difference (s1, eq) (s2, eq))
(set_difference (s2, eq) (s1, eq))
let set_eq ((s1, eq):'a set) ((s2, _):'a set) : bool =
set_is_empty (set_symmetric_difference (s1, eq) (s2, eq))


type 'value smap = (string, 'value) BatHashtbl.t
let smap_create (i:Z.t) : 'value smap = BatHashtbl.create (Z.to_int i)
Expand Down Expand Up @@ -496,11 +502,6 @@ let find_opt f l =
(* JP: why so many duplicates? :'( *)
let sort_with = FStar_List.sortWith

let set_eq (f: 'a -> 'a -> Z.t) (l1: 'a list) (l2: 'a list) =
let l1 = sort_with f l1 in
let l2 = sort_with f l2 in
BatList.for_all2 (fun l1 l2 -> f l1 l2 = Z.zero) l1 l2

let bind_opt opt f =
match opt with
| None -> None
Expand Down
9 changes: 4 additions & 5 deletions src/extraction/extraction.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RootNamespace>extraction</RootNamespace>
<AssemblyName>extraction</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>extraction</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -88,6 +87,10 @@
<HintPath>..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Core">
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.PPrint">
<HintPath>..\VS\packages\PPrintForFSharp.0.0.2\lib\net40\FSharp.PPrint.dll</HintPath>
<Private>True</Private>
Expand All @@ -97,10 +100,6 @@
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
Expand Down
5 changes: 2 additions & 3 deletions src/format/format.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RootNamespace>format</RootNamespace>
<AssemblyName>format</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>format</Name>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -74,8 +73,8 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions src/fsdoc/fsdoc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RootNamespace>fsdoc</RootNamespace>
<AssemblyName>fsdoc</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>fsdoc</Name>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -77,8 +76,8 @@
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/fstar/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
9 changes: 4 additions & 5 deletions src/fstar/fstar.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RootNamespace>FStar</RootNamespace>
<AssemblyName>fstar</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>FStar</Name>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\VS\</SolutionDir>
<RestorePackages>true</RestorePackages>
Expand Down Expand Up @@ -131,6 +130,10 @@
<HintPath>..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.PPrint">
<HintPath>..\VS\packages\PPrintForFSharp.0.0.2\lib\net40\FSharp.PPrint.dll</HintPath>
<Private>True</Private>
Expand All @@ -143,10 +146,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<ProjectReference Include="..\basic\basic.fsproj">
<Name>basic</Name>
<Project>{e8957dbd-58e7-4cf8-9192-e0a9cfb3867e}</Project>
Expand Down
5 changes: 2 additions & 3 deletions src/parser/parser.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RootNamespace>parser</RootNamespace>
<AssemblyName>parser</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>parser</Name>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\VS\</SolutionDir>
Expand Down Expand Up @@ -113,8 +112,8 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<ProjectReference Include="..\basic\basic.fsproj">
Expand Down
6 changes: 2 additions & 4 deletions src/prettyprint/prettyprint.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
<RootNamespace>prettyprint</RootNamespace>
<AssemblyName>prettyprint</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>prettyprint</Name>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -72,8 +70,8 @@
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
8 changes: 3 additions & 5 deletions src/reflection/reflection.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
<RootNamespace>reflection</RootNamespace>
<AssemblyName>reflection</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>reflection</Name>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -34,13 +32,13 @@
<OutputPath>..\..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\prettyprint.XML</DocumentationFile>
<DocumentationFile>bin\Release\reflection.XML</DocumentationFile>
<OtherFlags>--mlcompatibility</OtherFlags>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Compatibility.OCaml">
Expand Down
10 changes: 4 additions & 6 deletions src/smtencoding/smtencoding.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -10,8 +10,6 @@
<RootNamespace>smtencoding</RootNamespace>
<AssemblyName>smtencoding</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>smtencoding</Name>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -82,8 +80,8 @@
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -121,7 +119,7 @@
</ProjectReference>
<ProjectReference Include="..\reflection\reflection.fsproj">
<Name>reflection</Name>
<Project>{21685793-ac84-4ec1-9eab-39f9c0252f3f}</Project>
<Project>{8869fa4e-96af-4e01-99bc-b52c88610e3d}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions src/syntax/syntax.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RootNamespace>syntax</RootNamespace>
<AssemblyName>syntax</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>syntax</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -89,8 +88,8 @@
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
16 changes: 7 additions & 9 deletions src/tactics/tactics.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -10,8 +10,6 @@
<RootNamespace>tactics</RootNamespace>
<AssemblyName>tactics</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>tactics</Name>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -20,7 +18,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\Debug\</OutputPath>
<OutputPath>..\..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\tactics.XML</DocumentationFile>
Expand All @@ -31,20 +29,20 @@
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\tactics.XML</DocumentationFile>
<OtherFlags>--mlcompatibility</OtherFlags>
<NoWarn>40</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Compatibility.OCaml, Version=0.1.10.0, Culture=neutral, PublicKeyToken=null">
<Reference Include="FSharp.Compatibility.OCaml">
<HintPath>..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -131,4 +129,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
5 changes: 2 additions & 3 deletions src/tests/tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<AssemblyName>tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>tests</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -78,8 +77,8 @@
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
<Reference Include="FSharp.Core" >
<HintPath>..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
Loading