From 37e2d2ee13aff6bdeaa2f67cded781886bc24fa1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 21 Jul 2024 15:26:02 +0000 Subject: [PATCH] Fix benign typo in Scanner/Parser msbuild targets The output path referenced a non-existant msbuild metadata prop "RelativeOutputDir" (the actual prop is called "RelativeDir"). Also, the OutputFile path is relative to the project dir (the 'MSBuildProjectDir' prop), not the file being included. --- src/Directory.Build.targets | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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)