diff --git a/src/Tasks/Microsoft.CSharp.targets b/src/Tasks/Microsoft.CSharp.targets
index 80361f7c441..55e2a28888d 100644
--- a/src/Tasks/Microsoft.CSharp.targets
+++ b/src/Tasks/Microsoft.CSharp.targets
@@ -17,29 +17,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-
-
-
-
- $(MSBuildFrameworkToolsPath)\Microsoft.CSharp.targets
-
- $(MsBuildFrameworkToolsPath)
-
-
$(MSBuildToolsPath)\Microsoft.CSharp.CrossTargeting.targets
@@ -52,144 +30,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-
-
-
- $(ImportByWildcardBeforeMicrosoftCommonTargets)
- true
-
- $(ImportByWildcardAfterMicrosoftCommonTargets)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftCommonTargets)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftCommonTargets)
- true
-
- false
- false
- false
- false
-
- $(MSBuildExtensionsPath)\v4.0\Custom.Before.Microsoft.Common.targets
- $(MSBuildExtensionsPath)\v4.0\Custom.After.Microsoft.Common.targets
-
-
- $(ImportByWildcardBeforeMicrosoftCSharpTargets)
- true
-
- $(ImportByWildcardAfterMicrosoftCSharpTargets)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftCSharpTargets)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftCSharpTargets)
- true
-
- false
- false
- false
- false
-
- $(MSBuildExtensionsPath)\v4.0\Custom.Before.Microsoft.CSharp.targets
- $(MSBuildExtensionsPath)\v4.0\Custom.After.Microsoft.CSharp.targets
-
-
-
-
- $(ImportByWildcardBeforeMicrosoftNetFrameworkProps)
- true
-
- $(ImportByWildcardAfterMicrosoftNetFrameworkProps)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftNetFrameworkProps)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftNetFrameworkProps)
- true
-
- false
- false
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildFrameworkToolsPath)
-
-
diff --git a/src/Tasks/Microsoft.Common.props b/src/Tasks/Microsoft.Common.props
index b08b6558352..4b20447abdf 100644
--- a/src/Tasks/Microsoft.Common.props
+++ b/src/Tasks/Microsoft.Common.props
@@ -63,72 +63,21 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-
-
-
-
-
-
-
-
-
- 11.0
- 10.0
-
-
-
-
- $(MSBuildExtensionsPath)\v4.0\Custom.Before.$(MSBuildThisFile)
- $(MSBuildExtensionsPath)\v4.0\Custom.After.$(MSBuildThisFile)
-
-
-
-
+
+
$(MSBuildExtensionsPath)\v$(MSBuildToolsVersion)\Custom.Before.$(MSBuildThisFile)
$(MSBuildExtensionsPath)\v$(MSBuildToolsVersion)\Custom.After.$(MSBuildThisFile)
-
-
+
-
+
-
-
-
-
-
+
+
-
-
-
-
- $(MSBuildFrameworkToolsPath)\Microsoft.Common.targets
-
-
-
-
- $(MSBuildToolsPath)\Microsoft.Common.CurrentVersion.targets
-
-
-
-
-
-
- $(ImportByWildcardBeforeMicrosoftCommonTargets)
- true
-
- $(ImportByWildcardAfterMicrosoftCommonTargets)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftCommonTargets)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftCommonTargets)
- true
-
- false
- false
- false
- false
-
- $(MSBuildExtensionsPath)\v4.0\Custom.Before.Microsoft.Common.targets
- $(MSBuildExtensionsPath)\v4.0\Custom.After.Microsoft.Common.targets
-
-
-
-
- $(ImportByWildcardBeforeMicrosoftNetFrameworkProps)
- true
-
- $(ImportByWildcardAfterMicrosoftNetFrameworkProps)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftNetFrameworkProps)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftNetFrameworkProps)
- true
-
- false
- false
- false
- false
+
+ $(MSBuildToolsPath)\Microsoft.Common.CurrentVersion.targets
-
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildFrameworkToolsPath)
-
-
diff --git a/src/Tasks/Microsoft.Common.tasks b/src/Tasks/Microsoft.Common.tasks
index f909cc1afe2..ec7d33ea7cf 100644
--- a/src/Tasks/Microsoft.Common.tasks
+++ b/src/Tasks/Microsoft.Common.tasks
@@ -7,182 +7,102 @@
is encountered, it will cause the task to be rediscovered next time the task is used. -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/src/Tasks/Microsoft.NETFramework.props b/src/Tasks/Microsoft.NETFramework.props
index ed2109fb069..0bcdb236dbe 100644
--- a/src/Tasks/Microsoft.NETFramework.props
+++ b/src/Tasks/Microsoft.NETFramework.props
@@ -15,33 +15,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-
-
-
-
-
- $(MSBuildFrameworkToolsPath)\Microsoft.NETFramework.props
-
-
-
-
- $(MSBuildToolsPath)\Microsoft.NETFramework.CurrentVersion.props
-
-
-
-
-
+
+ $(MSBuildToolsPath)\Microsoft.NETFramework.CurrentVersion.props
+
+
diff --git a/src/Tasks/Microsoft.NETFramework.targets b/src/Tasks/Microsoft.NETFramework.targets
index 47f919f678d..ef06d37bd22 100644
--- a/src/Tasks/Microsoft.NETFramework.targets
+++ b/src/Tasks/Microsoft.NETFramework.targets
@@ -15,66 +15,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-
-
-
-
-
- $(MSBuildFrameworkToolsPath)\Microsoft.NETFramework.targets
-
-
-
-
- $(MSBuildToolsPath)\Microsoft.NETFramework.CurrentVersion.targets
-
-
-
-
-
-
- $(ImportByWildcardBeforeMicrosoftNetFrameworkTargets)
- true
-
- $(ImportByWildcardAfterMicrosoftNetFrameworkTargets)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftNetFrameworkTargets)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftNetFrameworkTargets)
- true
-
- false
- false
- false
- false
-
-
-
-
-
-
-
+
+ $(MSBuildToolsPath)\Microsoft.NETFramework.CurrentVersion.targets
+
-
-
-
-
-
diff --git a/src/Tasks/Microsoft.VisualBasic.targets b/src/Tasks/Microsoft.VisualBasic.targets
index 9e3824ca1b2..666a807bede 100644
--- a/src/Tasks/Microsoft.VisualBasic.targets
+++ b/src/Tasks/Microsoft.VisualBasic.targets
@@ -18,29 +18,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-
-
-
-
- $(MSBuildFrameworkToolsPath)\Microsoft.VisualBasic.targets
-
- $(MsBuildFrameworkToolsPath)
-
-
$(MSBuildToolsPath)\Microsoft.VisualBasic.CrossTargeting.targets
@@ -53,143 +31,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-
-
- $(ImportByWildcardBeforeMicrosoftCommonTargets)
- true
-
- $(ImportByWildcardAfterMicrosoftCommonTargets)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftCommonTargets)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftCommonTargets)
- true
-
- false
- false
- false
- false
-
- $(MSBuildExtensionsPath)\v4.0\Custom.Before.Microsoft.Common.targets
- $(MSBuildExtensionsPath)\v4.0\Custom.After.Microsoft.Common.targets
-
-
- $(ImportByWildcardBeforeMicrosoftVisualBasicTargets)
- true
-
- $(ImportByWildcardAfterMicrosoftVisualBasicTargets)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftVisualBasicTargets)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftVisualBasicTargets)
- true
-
- false
- false
- false
- false
-
- $(MSBuildExtensionsPath)\v4.0\Custom.Before.Microsoft.VisualBasic.targets
- $(MSBuildExtensionsPath)\v4.0\Custom.After.Microsoft.VisualBasic.targets
-
-
-
-
- $(ImportByWildcardBeforeMicrosoftNetFrameworkProps)
- true
-
- $(ImportByWildcardAfterMicrosoftNetFrameworkProps)
- true
-
- $(ImportUserLocationsByWildcardBeforeMicrosoftNetFrameworkProps)
- true
-
- $(ImportUserLocationsByWildcardAfterMicrosoftNetFrameworkProps)
- true
-
- false
- false
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildFrameworkToolsPath)
-
-