diff --git a/Source/MSBuild.Sdk.Extras/Build/Core.props b/Source/MSBuild.Sdk.Extras/Build/Core.props
index 0c7b73b..ae50923 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Core.props
+++ b/Source/MSBuild.Sdk.Extras/Build/Core.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <Choose>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Core.targets b/Source/MSBuild.Sdk.Extras/Build/Core.targets
index 6d31b6c..07fa7d3 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Core.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Core.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Build\ExtrasShim.targets" Condition="'$(ExtrasDisableExtrasSdkLegacyCompat)' != 'true'"/>
diff --git a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETFramework.targets b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETFramework.targets
index 9cd4b0b..4702d72 100644
--- a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETFramework.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETFramework.targets
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.0.targets b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.0.targets
index d792d02..e3ee295 100644
--- a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.0.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.0.targets
@@ -311,7 +311,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.5.targets b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.5.targets
index 0a810ed..2b5980f 100644
--- a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.5.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.5.targets
@@ -45,7 +45,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.6.targets b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.6.targets
index a0b1aa0..e441f83 100644
--- a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.6.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v4.6.targets
@@ -70,7 +70,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v5.0.targets b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v5.0.targets
index 372521c..d98b024 100644
--- a/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v5.0.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/FrameworkResolvers/NETPortable.v5.0.targets
@@ -3,7 +3,7 @@
 
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Sdk.Extras/Build/Inference.targets b/Source/MSBuild.Sdk.Extras/Build/Inference.targets
index 65b1fba..595e390 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Inference.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Inference.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/CheckMissing.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/CheckMissing.targets
index 5452bea..62d599a 100644
--- a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/CheckMissing.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/CheckMissing.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <!-- Need to detect if the expected targets where actually imported and reset to common if not -->
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Portable.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Portable.targets
index 64ee713..a1575fd 100644
--- a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Portable.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Portable.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Silverlight.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Silverlight.targets
index 37a6ccb..c3bb4cf 100644
--- a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Silverlight.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Silverlight.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Windows.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Windows.targets
index bca7d28..7474c18 100644
--- a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Windows.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Windows.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/WindowsPhone.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/WindowsPhone.targets
index a48067d..75875d7 100644
--- a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/WindowsPhone.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/WindowsPhone.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets
index 154cc01..f0cb5a9 100644
--- a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms.targets
index 1575366..ef991c1 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/NETFramework.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/NETFramework.targets
index 361e28b..1b6c4bf 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/NETFramework.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/NETFramework.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <!-- If the target doesn't exist, don't use it, means we've been called from dotnet 
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Portable.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Portable.targets
index 7c79a08..ae1485e 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Portable.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Portable.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Silverlight.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Silverlight.targets
index bd5a2f4..eac1110 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Silverlight.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Silverlight.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Tizen.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Tizen.targets
index 84943eb..f9997ec 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Tizen.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Tizen.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Windows.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Windows.targets
index 2ffda80..89aa5f0 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Windows.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Windows.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/WindowsPhone.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/WindowsPhone.targets
index 27724ab..9c41bc8 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/WindowsPhone.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/WindowsPhone.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <!--
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin.targets
index 5eeaf63..df25e1b 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets
index 88e7b30..2f59fb6 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Android.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Mac.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Mac.targets
index 8785c49..e87e69b 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Mac.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.Mac.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.TVOS.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.TVOS.targets
index 5a67f76..a5b6066 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.TVOS.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.TVOS.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.WatchOS.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.WatchOS.targets
index a9ccfa1..bbb38f4 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.WatchOS.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.WatchOS.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.iOS.targets b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.iOS.targets
index 318d584..85363b7 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.iOS.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Platforms/Xamarin/Xamarin.iOS.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/RIDs.targets b/Source/MSBuild.Sdk.Extras/Build/RIDs.targets
index 44b4c42..cb6963d 100644
--- a/Source/MSBuild.Sdk.Extras/Build/RIDs.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/RIDs.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <Target Name="_SdkGetRidsPerTargetFramework" Returns="@(_SdkRuntimeId)">
diff --git a/Source/MSBuild.Sdk.Extras/Build/ReferenceAssembly.targets b/Source/MSBuild.Sdk.Extras/Build/ReferenceAssembly.targets
index e9d3b70..eb1b875 100644
--- a/Source/MSBuild.Sdk.Extras/Build/ReferenceAssembly.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/ReferenceAssembly.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Workarounds.props b/Source/MSBuild.Sdk.Extras/Build/Workarounds.props
index d6fb5ab..be78ece 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Workarounds.props
+++ b/Source/MSBuild.Sdk.Extras/Build/Workarounds.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Build/Workarounds.targets b/Source/MSBuild.Sdk.Extras/Build/Workarounds.targets
index d770a5a..4aec5f4 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Workarounds.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Workarounds.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <!-- By default we warn about using the msbuild core, if the projects require full MSBuild targets. -->
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.props b/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.props
index a5e86b0..03f966b 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.props
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)Platforms\Common.props"/>
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.targets
index f08f685..5e6d9dc 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.targets
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/DefaultItems.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(_IsXamarinPlatform)' == ''">
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets
index 7df76a8..091ec31 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <!--
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.props b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.props
index 0796ea5..e729fd6 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.props
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets
index 7541bd9..fafa611 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.props b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.props
index 8a81f76..a8c90de 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.props
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.targets
index b5122b3..0f259dd 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.targets
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.VisualBasic.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.props b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.props
index 4af9f4b..8ea14b4 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.props
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <!-- Desktop Support -->
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.targets
index 072103a..711e35a 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.targets
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Desktop.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <!-- Force disable other projects' setup, Since it does not play very well with each other. -->
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.props b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.props
index a836a95..e557fee 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.props
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <ItemDefinitionGroup Condition="'$(ExtrasUseWindowsDesktopApp)' != 'true'">
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.targets
index bd2e916..b35e76f 100644
--- a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.targets
+++ b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Xaml.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ApplicationDefinitionFile)' != '' and '$(ExtrasUseWindowsDesktopApp)' != 'true'">
diff --git a/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.props b/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.props
index 27448eb..063379f 100644
--- a/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.props
+++ b/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DefineCommonManagedCapabilities)' == 'true' AND '$(DisableAdditionalCapabilities)' != 'true'">
diff --git a/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.targets b/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.targets
index ae19534..18884ab 100644
--- a/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.targets
+++ b/Source/MSBuild.Sdk.Extras/ProjectSystem/ProjectSystem.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Source/MSBuild.Sdk.Extras/Sdk/Sdk.props b/Source/MSBuild.Sdk.Extras/Sdk/Sdk.props
index 66a94ae..c805eb2 100644
--- a/Source/MSBuild.Sdk.Extras/Sdk/Sdk.props
+++ b/Source/MSBuild.Sdk.Extras/Sdk/Sdk.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk"/>
diff --git a/Source/MSBuild.Sdk.Extras/Sdk/Sdk.targets b/Source/MSBuild.Sdk.Extras/Sdk/Sdk.targets
index 208f638..2b20fe8 100644
--- a/Source/MSBuild.Sdk.Extras/Sdk/Sdk.targets
+++ b/Source/MSBuild.Sdk.Extras/Sdk/Sdk.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <MSBuildAllProjects Condition=" '$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0' ">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <PropertyGroup>