Cleanup target processing

Author: Turnerj

src/TurnerSoftware.BuildVersioning.Tool/TurnerSoftware.BuildVersioning.Tool.csproj

@@ -10,9 +10,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <BuildVersioningToolPath>bin/$(Configuration)/$(TargetFramework)/TurnerSoftware.BuildVersioning.Tool.dll</BuildVersioningToolPath>
+    <BuildVersioningToolPath>$(MSBuildThisFileDirectory)bin/$(Configuration)/$(TargetFramework)/TurnerSoftware.BuildVersioning.Tool.dll</BuildVersioningToolPath>
     <SelfHostedBuildVersioning Condition="$(DesignTimeBuild) != 'true' AND $(SkipBuildVersioning) != 'true'">true</SelfHostedBuildVersioning>
-    <BuildVersioningToolPath>../../TurnerSoftware.BuildVersioning.Tool/$(BuildVersioningToolPath)</BuildVersioningToolPath>
   </PropertyGroup>
 
   <ItemGroup>

src/TurnerSoftware.BuildVersioning/TurnerSoftware.BuildVersioning.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <BuildVersioningToolPath>../../TurnerSoftware.BuildVersioning.Tool/bin/$(Configuration)/$(TargetFramework)/TurnerSoftware.BuildVersioning.Tool.dll</BuildVersioningToolPath>
+    <BuildVersioningToolPath>$(MSBuildThisFileDirectory)../TurnerSoftware.BuildVersioning.Tool/bin/$(Configuration)/$(TargetFramework)/TurnerSoftware.BuildVersioning.Tool.dll</BuildVersioningToolPath>
   </PropertyGroup>
 
   <Import Project="build/TurnerSoftware.BuildVersioning.targets" />

src/TurnerSoftware.BuildVersioning/build/TurnerSoftware.BuildVersioning.targets

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <BuildVersioningToolPath Condition="$(BuildVersioningToolPath) == ''">../Tools/TurnerSoftware.BuildVersioning.Tool.dll</BuildVersioningToolPath>
+    <BuildVersioningToolPath Condition="$(BuildVersioningToolPath) == ''">$(MSBuildThisFileDirectory)../Tools/TurnerSoftware.BuildVersioning.Tool.dll</BuildVersioningToolPath>
     <BuildFullVersionFormat Condition="$(BuildFullVersionFormat) == ''">{Major}.{Minor}.{Patch}{PreRelease}{BuildMetadata}</BuildFullVersionFormat>
     <BuildFileVersionFormat Condition="$(BuildFileVersionFormat) == ''">{Major}.{Minor}.{Patch}.0</BuildFileVersionFormat>
     <BuildAssemblyVersionFormat Condition="$(BuildAssemblyVersionFormat) == ''">{Major}.0.0.0</BuildAssemblyVersionFormat>
@@ -21,11 +21,11 @@
   <Import Project="TurnerSoftware.BuildVersioning.Integrations.targets" />
 
   <Target Name="BuildVersioning" 
-          BeforeTargets="BeforeCompile;CoreCompile;GenerateNuspec" 
-          DependsOnTargets="PrepareForBuild;CoreGenerateAssemblyInfo" 
-          Condition="'$(DesignTimeBuild)' != 'true' AND '$(SkipBuildVersioning)' != 'true'">
+          BeforeTargets="BeforeCompile;GenerateNuspec" 
+          Condition="$(DesignTimeBuild) != 'true' AND $(SkipBuildVersioning) != 'true'">
     <Error Condition="'$(UsingMicrosoftNETSdk)' != 'true'" Code="BLDVER0001" Text="Build Versioning only works in SDK-style projects." />
     <Message Importance="$(BuildVersioningLogLevel)" Text="BuildVersioning: Project=$(MSBuildProjectFile)" />
+    <Message Importance="$(BuildVersioningLogLevel)" Text="BuildVersioning: BuildVersioningToolPath=$(BuildVersioningToolPath)" />
     <Message Importance="$(BuildVersioningLogLevel)" Text="BuildVersioning: FullVersionFormat=$(BuildFullVersionFormat)" />
     <Message Importance="$(BuildVersioningLogLevel)" Text="BuildVersioning: FileVersionFormat=$(BuildFileVersionFormat)" />
     <Message Importance="$(BuildVersioningLogLevel)" Text="BuildVersioning: AssemblyVersionFormat=$(BuildAssemblyVersionFormat)" />
@@ -38,7 +38,7 @@
       <BuildVersioningInputs Condition="$(BuildPreReleaseFormat) != ''" Include="--prerelease-format &quot;$(BuildPreReleaseFormat)&quot;" />
       <BuildVersioningInputs Condition="$(BuildMetadataFormat) != ''" Include="--build-metadata-format &quot;$(BuildMetadataFormat)&quot;" />
     </ItemGroup>
-    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)$(BuildVersioningToolPath)&quot; @(BuildVersioningInputs->'%(Identity)', ' ')" ConsoleToMSBuild="true" StandardOutputImportance="Low" ContinueOnError="true">
+    <Exec Command="dotnet &quot;$(BuildVersioningToolPath)&quot; @(BuildVersioningInputs->'%(Identity)', ' ')" ConsoleToMSBuild="true" StandardOutputImportance="Low" ContinueOnError="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="BuildVersioningOutput" />
       <Output TaskParameter="ExitCode" PropertyName="BuildVersioningErrorCode"/>
     </Exec>