From d2451126b69ec38a7e801e8ce08deb5445fefe0d Mon Sep 17 00:00:00 2001 From: Catalin Hritcu Date: Wed, 18 Apr 2018 19:24:02 +0200 Subject: [PATCH] Revert most of "reverting .fsproj file changes from PR #1404" This reverts commit a7cf115a9ea8e0458d178e90643562669f6bd4e4. --- src/basic/basic.fsproj | 6 +++--- src/extraction/extraction.fsproj | 12 ++++++------ src/format/format.fsproj | 4 ++-- src/fsdoc/fsdoc.fsproj | 4 ++-- src/fstar/fstar.fsproj | 12 ++++++------ src/parser/parser.fsproj | 4 ++-- src/prettyprint/prettyprint.fsproj | 5 ++--- src/reflection/reflection.fsproj | 7 +++---- src/smtencoding/smtencoding.fsproj | 11 +++++------ src/syntax/syntax.fsproj | 4 ++-- src/tactics/tactics.fsproj | 11 +++++------ src/tests/tests.fsproj | 4 ++-- src/tosyntax/tosyntax.fsproj | 4 ++-- src/typechecker/typechecker.fsproj | 8 ++++---- 14 files changed, 46 insertions(+), 50 deletions(-) diff --git a/src/basic/basic.fsproj b/src/basic/basic.fsproj index 0d1e6d819ee..db70cef1b4a 100644 --- a/src/basic/basic.fsproj +++ b/src/basic/basic.fsproj @@ -1,4 +1,4 @@ - + Debug @@ -109,8 +109,8 @@ ..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/extraction/extraction.fsproj b/src/extraction/extraction.fsproj index 7e04f5d8955..ff7a2eb0ae1 100644 --- a/src/extraction/extraction.fsproj +++ b/src/extraction/extraction.fsproj @@ -1,4 +1,4 @@ - + @@ -88,6 +88,10 @@ ..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll True + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll + True + ..\VS\packages\PPrintForFSharp.0.0.2\lib\net40\FSharp.PPrint.dll True @@ -97,10 +101,6 @@ True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll - True - @@ -137,4 +137,4 @@ --> - \ No newline at end of file + diff --git a/src/format/format.fsproj b/src/format/format.fsproj index 54af9f62e12..34ec9a7ae12 100644 --- a/src/format/format.fsproj +++ b/src/format/format.fsproj @@ -74,8 +74,8 @@ - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/fsdoc/fsdoc.fsproj b/src/fsdoc/fsdoc.fsproj index a360670e5c2..74e3d9568b7 100644 --- a/src/fsdoc/fsdoc.fsproj +++ b/src/fsdoc/fsdoc.fsproj @@ -77,8 +77,8 @@ True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/fstar/fstar.fsproj b/src/fstar/fstar.fsproj index 3098a40db4e..4a9367286c2 100644 --- a/src/fstar/fstar.fsproj +++ b/src/fstar/fstar.fsproj @@ -1,4 +1,4 @@ - + @@ -131,6 +131,10 @@ ..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll True + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll + True + ..\VS\packages\PPrintForFSharp.0.0.2\lib\net40\FSharp.PPrint.dll True @@ -143,10 +147,6 @@ - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll - True - basic {e8957dbd-58e7-4cf8-9192-e0a9cfb3867e} @@ -175,4 +175,4 @@ --> - \ No newline at end of file + diff --git a/src/parser/parser.fsproj b/src/parser/parser.fsproj index dfbe74f44b4..8674427f7dc 100644 --- a/src/parser/parser.fsproj +++ b/src/parser/parser.fsproj @@ -113,8 +113,8 @@ - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/prettyprint/prettyprint.fsproj b/src/prettyprint/prettyprint.fsproj index 80c7216977f..dca09d3be54 100644 --- a/src/prettyprint/prettyprint.fsproj +++ b/src/prettyprint/prettyprint.fsproj @@ -11,7 +11,6 @@ prettyprint v4.5 4.4.3.0 - true prettyprint @@ -72,8 +71,8 @@ True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/reflection/reflection.fsproj b/src/reflection/reflection.fsproj index b6a1de07af4..e13d4a4cd8c 100644 --- a/src/reflection/reflection.fsproj +++ b/src/reflection/reflection.fsproj @@ -11,7 +11,6 @@ reflection v4.5 4.4.3.0 - true reflection @@ -34,13 +33,13 @@ ..\..\bin\ TRACE 3 - bin\Release\prettyprint.XML + bin\Release\reflection.XML --mlcompatibility - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/smtencoding/smtencoding.fsproj b/src/smtencoding/smtencoding.fsproj index 3487dbcd5e6..8c5b7e93498 100644 --- a/src/smtencoding/smtencoding.fsproj +++ b/src/smtencoding/smtencoding.fsproj @@ -1,4 +1,4 @@ - + @@ -11,7 +11,6 @@ smtencoding v4.5 4.4.3.0 - true smtencoding @@ -84,8 +83,8 @@ True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True @@ -123,7 +122,7 @@ reflection - {8869FA4E-96AF-4E01-99BC-B52C88610E3D} + {8869fa4e-96af-4e01-99bc-b52c88610e3d} True @@ -134,4 +133,4 @@ --> - \ No newline at end of file + diff --git a/src/syntax/syntax.fsproj b/src/syntax/syntax.fsproj index 9b24962e625..5b487f248ba 100644 --- a/src/syntax/syntax.fsproj +++ b/src/syntax/syntax.fsproj @@ -89,8 +89,8 @@ True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/tactics/tactics.fsproj b/src/tactics/tactics.fsproj index 0dcd393afe0..d6b24bda2a9 100644 --- a/src/tactics/tactics.fsproj +++ b/src/tactics/tactics.fsproj @@ -11,7 +11,6 @@ tactics v4.5 4.4.3.0 - true tactics @@ -20,7 +19,7 @@ full false false - bin\Debug\ + ..\..\bin\ DEBUG;TRACE 3 bin\Debug\tactics.XML @@ -31,7 +30,7 @@ portable true true - bin\Release\ + ..\..\bin\ TRACE 3 bin\Release\tactics.XML @@ -39,12 +38,12 @@ 40 - + ..\VS\packages\FSharp.Compatibility.OCaml.0.1.10\lib\net40\FSharp.Compatibility.OCaml.dll - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/tests/tests.fsproj b/src/tests/tests.fsproj index ed1b86e4316..16d88bc5e7f 100644 --- a/src/tests/tests.fsproj +++ b/src/tests/tests.fsproj @@ -78,8 +78,8 @@ True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/tosyntax/tosyntax.fsproj b/src/tosyntax/tosyntax.fsproj index 4370f3e9111..924be8fae1f 100644 --- a/src/tosyntax/tosyntax.fsproj +++ b/src/tosyntax/tosyntax.fsproj @@ -109,8 +109,8 @@ - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True diff --git a/src/typechecker/typechecker.fsproj b/src/typechecker/typechecker.fsproj index 5604e020ae5..2cd7c426715 100644 --- a/src/typechecker/typechecker.fsproj +++ b/src/typechecker/typechecker.fsproj @@ -1,4 +1,4 @@ - + @@ -92,8 +92,8 @@ True - - $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\VS\packages\FSharp.Core.4.2.3/lib/net45/FSharp.Core.dll True @@ -132,4 +132,4 @@ --> - \ No newline at end of file +