Skip to content

Commit

Permalink
correct relative _WebCompilerTaskAssembly paths
Browse files Browse the repository at this point in the history
madskristensen#351: the _WebCompilerTaskAssembly paths defined in build/BuildWebCompiler.targets are intended to be relative to that file, but may not always be interpreted as such.  using $(MSBuildThisFileDirectory) ensures that they always are.
  • Loading branch information
motivity-chris authored Oct 1, 2019
1 parent 194200c commit 2e25c48
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/WebCompiler/MSBuild/BuildWebCompiler.targets
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">..\tools\netstandard2.0\WebCompiler.dll</_WebCompilerTaskAssembly>
<_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">..\tools\net46\WebCompiler.exe</_WebCompilerTaskAssembly>
<_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netstandard2.0\WebCompiler.dll</_WebCompilerTaskAssembly>
<_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net46\WebCompiler.exe</_WebCompilerTaskAssembly>
</PropertyGroup>

<UsingTask AssemblyFile="$(_WebCompilerTaskAssembly)" TaskName="WebCompiler.CompilerBuildTask"/>
Expand All @@ -14,4 +14,4 @@
<Target Name="WebCompileClean" AfterTargets="CoreClean" Condition="'$(RunWebCompiler)' != 'False'">
<WebCompiler.CompilerCleanTask FileName="$(MSBuildProjectDirectory)\compilerconfig.json" />
</Target>
</Project>
</Project>

0 comments on commit 2e25c48

Please sign in to comment.