diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.CSharp.targets b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.CSharp.targets
index 6692d20986..e987e0d1cd 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.CSharp.targets
@@ -26,9 +26,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
true
-
-
- true
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.CSharp.targets b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.CSharp.targets
index 85023d748b..936b3fbb3e 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.CSharp.targets
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.CSharp.targets
@@ -23,9 +23,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
v4.5
__UNIFIED__;__MACOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.FSharp.targets b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.FSharp.targets
index fc502fd804..cce7135caf 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.FSharp.targets
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.FSharp.targets
@@ -19,9 +19,6 @@
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
-
-
- true
-
-
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.props b/msbuild/Xamarin.Shared/Xamarin.Shared.props
index e9d19ca50e..4d16a45d8b 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.props
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.props
@@ -264,6 +264,11 @@ Copyright (C) 2020 Microsoft. All rights reserved.
$(IsMacEnabled)
+
+
+ true
+
+
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.CSharp.targets
index b8831ee869..cda1211027 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.CSharp.targets
@@ -33,9 +33,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__TVOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets
index 052e1469f7..6e903ad2b5 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets
@@ -21,9 +21,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
true
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.FSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.FSharp.targets
index a5c35171bb..d3cf738ff8 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.FSharp.targets
@@ -39,9 +39,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.CSharp.targets
index 862b0db9f0..54deb99bf7 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.CSharp.targets
@@ -29,9 +29,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__TVOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.FSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.FSharp.targets
index cf6ac8bcd5..3620bd67da 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.FSharp.targets
@@ -34,9 +34,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.CSharp.targets
index 280158469d..8de226ef6c 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.CSharp.targets
@@ -29,9 +29,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__WATCHOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.FSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.FSharp.targets
index 4630ef745f..d2fe05a888 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.FSharp.targets
@@ -34,9 +34,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.CSharp.targets
index 4e70f512f1..67d3e8e016 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.CSharp.targets
@@ -33,9 +33,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__WATCHOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
index 8523a94531..7a892be6a7 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
@@ -25,9 +25,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
true
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.FSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.FSharp.targets
index c73ebb4934..dbf2c3d603 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.FSharp.targets
@@ -39,9 +39,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.CSharp.targets
index 7a19e4137e..84439e7d8b 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.CSharp.targets
@@ -29,9 +29,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__WATCHOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.FSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.FSharp.targets
index 997bdb3791..ffd9a41808 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.FSharp.targets
@@ -34,9 +34,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.CSharp.targets
index 67ce590fbf..f7c7d815a9 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.CSharp.targets
@@ -46,9 +46,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__IOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.FSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.FSharp.targets
index 367f16ee79..43f0269f76 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.FSharp.targets
@@ -39,9 +39,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.CSharp.targets
index 80a5cfe840..c40e939275 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.CSharp.targets
@@ -29,9 +29,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__IOS__;$(DefineConstants)
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.FSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.FSharp.targets
index e93e5a7ab4..6b4fe8232f 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.FSharp.targets
@@ -35,9 +35,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb
-
-
- true
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.CSharp.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.CSharp.targets
index 54837d2063..a1a6073d1e 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.CSharp.targets
@@ -29,9 +29,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
__UNIFIED__;$(DefineConstants)
__MOBILE__;$(DefineConstants)
__IOS__;$(DefineConstants)
-
-
- true