Merge pull request #1459 from ermshiperete/master

Fix detection of multi targeting

Author: dazinator

src/GitVersionTask/NugetAssets/build/GitVersionTask.targets

@@ -1,18 +1,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <ItemGroup>
-    <PathSeparators Include="/"/>
-    <PathSeparators Include="\"/>
-  </ItemGroup>
-
   <PropertyGroup>
     <GitVersionTaskBuildTools_IsMultiTargeting>false</GitVersionTaskBuildTools_IsMultiTargeting>
-    <GitVersionTaskBuildTools_IsMultiTargeting Condition="$(MSBuildThisFileDirectory.Substring($(MSBuildThisFileDirectory.LastIndexOfAny(@(PathSeparators)))).Substring(1).Contains('buildMultiTargeting'))">true</GitVersionTaskBuildTools_IsMultiTargeting>
+    <GitVersionTaskBuildTools_IsMultiTargeting Condition="$(MSBuildThisFileDirectory.TrimEnd('\').TrimEnd('/').EndsWith('buildMultiTargeting'))">true</GitVersionTaskBuildTools_IsMultiTargeting>
   </PropertyGroup>
 
   <!-- Import infrastructure props for util pack. -->
   <ImportGroup>
     <Import Project="$(MSBuildThisFileDirectory)..\build\Infrastructure.props"/>
   </ImportGroup>
 
-</Project>
+</Project>

src/GitVersionTask/NugetAssets/build/Infrastructure.props

@@ -4,8 +4,8 @@
   <!-- Properties containing paths to functionality files and directories. -->
   <PropertyGroup>
     <GitVersionTaskBuildTools_FunctionalityDir>$(MSBuildThisFileDirectory)functionality/</GitVersionTaskBuildTools_FunctionalityDir>
-    <GitVersionTaskBuildTools_FunctionalityFile Condition="'$(GitVersion_IsMultiTargeting)'!= 'true'">$(GitVersionTaskBuildTools_FunctionalityDir)GitVersionBuild.targets</GitVersionTaskBuildTools_FunctionalityFile>
-    <GitVersionTaskBuildTools_FunctionalityFile Condition="'$(GitVersion_IsMultiTargeting)'== 'true'">$(GitVersionTaskBuildTools_FunctionalityDir)GitVersionMultiTargetBuild.targets</GitVersionTaskBuildTools_FunctionalityFile>
+    <GitVersionTaskBuildTools_FunctionalityFile Condition="'$(GitVersionTaskBuildTools_IsMultiTargeting)'!= 'true'">$(GitVersionTaskBuildTools_FunctionalityDir)GitVersionBuild.targets</GitVersionTaskBuildTools_FunctionalityFile>
+    <GitVersionTaskBuildTools_FunctionalityFile Condition="'$(GitVersionTaskBuildTools_IsMultiTargeting)'== 'true'">$(GitVersionTaskBuildTools_FunctionalityDir)GitVersionMultiTargetBuild.targets</GitVersionTaskBuildTools_FunctionalityFile>
     <GitVersionTaskBuildTools_FunctionalityObjFolder>$(GitVersionTaskBuildTools_FunctionalityDir)obj/</GitVersionTaskBuildTools_FunctionalityObjFolder>
   </PropertyGroup>
 
@@ -39,4 +39,4 @@
     <Import Condition=" '$(GitVersionTaskBuildTools_CanCallDirectly)' == 'true' " Project="$(GitVersionTaskBuildTools_FunctionalityFile)"/>
   </ImportGroup>  
 
-</Project>
+</Project>