From dcfc592fcc215073e6908cbacf716893e1b6e864 Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <12659251+teo-tsirpanis@users.noreply.github.com>
Date: Mon, 12 Oct 2020 19:07:51 +0300
Subject: [PATCH 1/2] Fix #10245.

---
 FSharp.Profiles.props | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props
index 1abb6c8a95c..3ffabfd7ffe 100644
--- a/FSharp.Profiles.props
+++ b/FSharp.Profiles.props
@@ -2,24 +2,29 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project>
 
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
-    <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
-    <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
-    <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
-  </PropertyGroup>
+  <Choose>
+    <When Condition="$(TargetFramework.StartsWith('net4'))">
+      <PropertyGroup>
+        <DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
+        <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
+        <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 
 </Project>

From e0c5ea1bcc1281931dd3a9ba106af440dc7cace5 Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <12659251+teo-tsirpanis@users.noreply.github.com>
Date: Mon, 12 Oct 2020 23:30:28 +0300
Subject: [PATCH 2/2] Use TargetFrameworkIdentifier in FSharp.Profiles.props.

Co-authored-by: Saul Rennison <saul@users.noreply.github.com>
---
 FSharp.Profiles.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props
index 3ffabfd7ffe..993512bde43 100644
--- a/FSharp.Profiles.props
+++ b/FSharp.Profiles.props
@@ -3,7 +3,7 @@
 <Project>
 
   <Choose>
-    <When Condition="$(TargetFramework.StartsWith('net4'))">
+    <When Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
       <PropertyGroup>
         <DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
         <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>