fix for target that is only in .4xx

novotnyllc · Jul 16, 2018 · 045f19b · 045f19b
1 parent 42c5312
commit 045f19b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/Build/Core.targets b/Source/MSBuild.Sdk.Extras/Build/Core.targets
@@ -22,4 +22,18 @@
   <Import Project="$(MSBuildThisFileDirectory)..\DefaultItems\DefaultItems.targets"/>
   <Import Project="$(MSBuildThisFileDirectory)..\ProjectSystem\ProjectSystem.targets"/>
 
+  <!--
+    Detect the SDK version. For now, we have to check the NETCoreSdkVersion
+    else check BundledNETCoreAppTargetFrameworkVersion property for Sdk <= 2.1.300
+    else Give 1.0 version since that property doesn't exist in 1.x Sdks
+  -->
+  <PropertyGroup>
+    <_NETCoreSdkVersion>$(NETCoreSdkVersion)</_NETCoreSdkVersion>
+    <!--  Handle SemVer version like 2.1.300-preview, since MSBuild doesn't compare versions with alpha-numeric chars! -->
+    <_NETCoreSdkVersion Condition="$(_NETCoreSdkVersion.Contains('-'))">$(_NETCoreSdkVersion.Split('-')[0])</_NETCoreSdkVersion>
+    <_NETCoreSdkVersion Condition="'$(_NETCoreSdkVersion)' == ''">$(BundledNETCoreAppTargetFrameworkVersion)</_NETCoreSdkVersion>
+    <_NETCoreSdkVersion Condition="'$(_NETCoreSdkVersion)' == ''">1.0</_NETCoreSdkVersion>
+  </PropertyGroup>
+
+
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/RIDs.targets b/Source/MSBuild.Sdk.Extras/Build/RIDs.targets
@@ -139,8 +139,12 @@
           ItemName="_FrameworkAssemblyReferences" />
     </MSBuild>
 
+    <PropertyGroup>
+      <_SdkMinVersionWithDependencyTarget>2.1.400</_SdkMinVersionWithDependencyTarget>
+    </PropertyGroup>
+
     <MSBuild
-      Projects="$(MSBuildProjectFullPath)"
+      Projects="$(MSBuildProjectFullPath)" Condition="'$([System.Version]::Parse($(_NETCoreSdkVersion)))' >= '$([System.Version]::Parse($(_SdkMinVersionWithDependencyTarget)))' "
       Targets="_GetFrameworksWithSuppressedDependencies"
       Properties="TargetFramework=%(_TargetFrameworks.Identity);
                   BuildProjectReferences=false;">

diff --git a/Source/MSBuild.Sdk.Extras/Build/Workarounds.targets b/Source/MSBuild.Sdk.Extras/Build/Workarounds.targets
@@ -94,18 +94,6 @@
     </ItemGroup>
   </Target>
 
-  <!--
-    Detect the SDK version. For now, we have to check the NETCoreSdkVersion
-    else check BundledNETCoreAppTargetFrameworkVersion property for Sdk <= 2.1.300
-    else Give 1.0 version since that property doesn't exist in 1.x Sdks
-  -->
-  <PropertyGroup>
-    <_NETCoreSdkVersion>$(NETCoreSdkVersion)</_NETCoreSdkVersion>
-    <!--  Handle SemVer version like 2.1.300-preview, since MSBuild doesn't compare versions with alpha-numeric chars! -->
-    <_NETCoreSdkVersion Condition="$(_NETCoreSdkVersion.Contains('-'))">$(_NETCoreSdkVersion.Split('-')[0])</_NETCoreSdkVersion>
-    <_NETCoreSdkVersion Condition="'$(_NETCoreSdkVersion)' == ''">$(BundledNETCoreAppTargetFrameworkVersion)</_NETCoreSdkVersion>
-    <_NETCoreSdkVersion Condition="'$(_NETCoreSdkVersion)' == ''">1.0</_NETCoreSdkVersion>
-  </PropertyGroup>
 
   <!--
     Workaround for bug in Microsoft.NET.Sdk < v2.0 where satellites were deployed on top of each other in root.