From e2f61e6853e7e97201818dc533d2ce41f725261a Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 3 Nov 2016 18:12:22 +0000 Subject: [PATCH 1/5] use propoer TargetProfile setting --- src/FSharpSource.targets | 7 +++++-- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 1 - .../FSharp.Compiler.Interactive.Settings.fsproj | 1 - src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj | 1 - src/fsharp/FSharp.Core/FSharp.Core.fsproj | 7 +++++++ src/fsharp/Fsc/Fsc.fsproj | 1 - src/fsharp/fsi/Fsi.fsproj | 1 - 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index 74cc14916f..f829970b3c 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -182,6 +182,7 @@ $(DefineConstants);NO_LOADER_OPTIMIZATION $(DefineConstants);SILVERLIGHT_COMPILER_FSHARP_CORE $(OtherFlags) --simpleresolution + netcore v5.0 false @@ -275,8 +276,8 @@ $(DefineConstants);FX_NO_MISSINGMETHODEXCEPTION $(DefineConstants);FX_RESHAPED_REFLECTION $(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS - $(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE - true + $(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE + netcore Profile7 v4.5 @@ -314,6 +315,7 @@ $(DefineConstants);FX_NO_MISSINGMETHODEXCEPTION $(DefineConstants);FX_NO_CONCURRENT_DICTIONARY $(DefineConstants);FX_ATLEAST_LINQ + netcore Profile78 v4.5 @@ -351,6 +353,7 @@ $(DefineConstants);FX_NO_MISSINGMETHODEXCEPTION $(DefineConstants);FX_NO_CONCURRENT_DICTIONARY $(DefineConstants);FX_ATLEAST_LINQ + netcore Profile259 v4.5 diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 4a7892308d..24b8e54be7 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -12,7 +12,6 @@ FSharp.Build true {702A7979-BCF9-4C41-853E-3ADFC9897890} - $(OtherFlags) --targetprofile:netcore true diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index b34a3d459a..5f31ed0788 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -13,7 +13,6 @@ EXTENSIONTYPING;$(DefineConstants) FSharp.Compiler.Interactive.Settings 512 - $(OtherFlags) --targetprofile:netcore diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj index f69f0497d9..f7eca19797 100644 --- a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj +++ b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj @@ -20,7 +20,6 @@ true 0x06800000 $(OtherFlags) /warnon:1182 - $(OtherFlags) --targetprofile:netcore diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index 653358df64..f250cc5769 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -23,6 +23,13 @@ $(OtherFlags) --targetprofile:netcore $(OtherFlags) --targetprofile:netcore $(OtherFlags) --targetprofile:netcore + $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 + $(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" + $(OtherFlags) --compiling-fslib-40 + $(OtherFlags) --compiling-fslib-40 + $(OtherFlags) --compiling-fslib-40 + $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint + $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj index 9484806f85..cc70d114ec 100644 --- a/src/fsharp/Fsc/Fsc.fsproj +++ b/src/fsharp/Fsc/Fsc.fsproj @@ -22,7 +22,6 @@ true v2.0 $(OtherFlags) --warnon:1182 - $(OtherFlags) --targetprofile:netcore diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj index 147cc5eb39..80496f2141 100644 --- a/src/fsharp/fsi/Fsi.fsproj +++ b/src/fsharp/fsi/Fsi.fsproj @@ -24,7 +24,6 @@ $(OtherFlags) --warnon:1182 fsi.res v4.6 - $(OtherFlags) --targetprofile:netcore From 4803238ddf9b869ab7c0575564eec22929c93f17 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 3 Nov 2016 18:22:09 +0000 Subject: [PATCH 2/5] remove duplicate lines --- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index e4189d2177..3aa1335122 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -16,14 +16,6 @@ true true true - $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 - $(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" - $(OtherFlags) --compiling-fslib-40 - $(OtherFlags) --targetprofile:netcore - $(OtherFlags) --targetprofile:netcore - $(OtherFlags) --targetprofile:netcore - $(OtherFlags) --targetprofile:netcore - $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 $(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" $(OtherFlags) --compiling-fslib-40 $(OtherFlags) --compiling-fslib-40 @@ -31,12 +23,6 @@ $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 - $(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" - $(OtherFlags) --compiling-fslib-40 - $(OtherFlags) --compiling-fslib-40 --targetprofile:netcore - $(OtherFlags) --compiling-fslib-40 --targetprofile:netcore - $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint --targetprofile:netcore - $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint --targetprofile:netcore From 74dff2edfe47f915b3c84c2c6ed42710c238c9e9 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 3 Nov 2016 18:23:24 +0000 Subject: [PATCH 3/5] use propoer TargetProfile setting --- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index 3aa1335122..6a7b501ad1 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -16,13 +16,14 @@ true true true + netcore + $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 $(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" $(OtherFlags) --compiling-fslib-40 $(OtherFlags) --compiling-fslib-40 $(OtherFlags) --compiling-fslib-40 $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint - $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 From af51b9055593916b26ced8921c206078d24a0876 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 3 Nov 2016 19:06:42 +0000 Subject: [PATCH 4/5] Update FSharp.Core.fsproj --- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index 6a7b501ad1..ad157bec13 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -15,9 +15,7 @@ 0x05000000 true true - true - netcore - $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 + true $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 $(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" $(OtherFlags) --compiling-fslib-40 $(OtherFlags) --compiling-fslib-40 From 7dd133f0cf5c6fe504f574d1c7f89ed3aebaaaa9 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 3 Nov 2016 19:07:08 +0000 Subject: [PATCH 5/5] Update FSharp.Core.fsproj --- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index ad157bec13..4953d5cfc5 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -15,7 +15,8 @@ 0x05000000 true true - true $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 + true + $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 $(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" $(OtherFlags) --compiling-fslib-40 $(OtherFlags) --compiling-fslib-40