diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 6f55fbc4a..402cb6739 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -93,13 +93,13 @@
Name="GenerateScanners"
BeforeTargets="BeforeBuild"
Condition="'@(Scanner)'!=''"
- Outputs="%(Scanner.RelativeOutputDir)\%(Scanner.FileName).Scanner.g.cs">
+ Outputs="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ScannerOutputPath)\%(Scanner.RelativeDir)))\%(Scanner.FileName).Scanner.g.cs">
- $([MSBuild]::MakeRelative(%(Scanner.RootDir)%(Scanner.Directory), $(ScannerOutputPath)))\%(Scanner.FileName).Scanner.g.cs
+ $([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ScannerOutputPath)\%(Scanner.RelativeDir)))\%(Scanner.FileName).Scanner.g.cs
-
+
True
True
%(Scanner.Identity)
@@ -112,17 +112,16 @@
BeforeTargets="BeforeBuild"
AfterTargets="GenerateScanners"
Condition="'@(Parser)'!=''"
- Outputs="%(Parser.RelativeOutputDir)\%(Parser.FileName).Parser.g.cs">
+ Outputs="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ParserOutputPath)\%(Parser.RelativeDir)))\%(Parser.FileName).Parser.g.cs">
- $([MSBuild]::MakeRelative(%(Parser.RootDir)%(Parser.Directory),
- $(ParserOutputPath)))\%(Parser.FileName).Parser.g.cs
+ $([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ParserOutputPath)\%(Parser.RelativeDir)))\%(Parser.FileName).Parser.g.cs
/gplex /nolines
-
+
True
True
%(Parser.Identity)