Move to props

novotnyllc · Jul 29, 2018 · cd7f59c · cd7f59c
1 parent 9f802b1
commit cd7f59c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/Build/Core.props b/Source/MSBuild.Sdk.Extras/Build/Core.props
@@ -33,6 +33,19 @@
     <SupportedCultures Condition="'$(SupportedCultures)' == ''">$(DefaultLanguage)</SupportedCultures>
   </PropertyGroup>
 
+  <!--
+    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>
+
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == '' OR '$(VisualStudioVersion)' &lt; '14.0'">15.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/Source/MSBuild.Sdk.Extras/Build/Core.targets b/Source/MSBuild.Sdk.Extras/Build/Core.targets
@@ -22,18 +22,4 @@
   <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>