Skip to content

Commit

Permalink
Directly use IntermediateOutputPath.
Browse files Browse the repository at this point in the history
Some environments like BenchmarkDotNet set it to an absolute path. Instead of appending it to the project directory, we just use it and hope MSBuild takes care of the rest.
  • Loading branch information
teo-tsirpanis committed Dec 4, 2024
1 parent 99f97a6 commit f7916f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/Sigourney.Build/build/Sigourney.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ https://opensource.org/licenses/MIT
TreatAsLocalProperty="_SigourneyEnable">
<Import Project="$(MSBuildThisFileDirectory)Sigourney.PublishMode.targets" />
<PropertyGroup>
<IntermediateDirectory>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDirectory>
<ProcessedBySigourney>$(IntermediateDirectory)ProcessedBySigourney</ProcessedBySigourney>
<ProcessedBySigourney>$(IntermediateOutputPath)ProcessedBySigourney</ProcessedBySigourney>
<_SigourneyEnable Condition="$(SigourneyEnable) == false OR $(DesigntimeBuild) == true">false</_SigourneyEnable>
</PropertyGroup>

Expand All @@ -21,7 +20,7 @@ https://opensource.org/licenses/MIT
<ItemGroup>
<SigourneyConfiguration Include="Sigourney default configuration">
<SignAssembly>$(SignAssembly)</SignAssembly>
<IntermediateDirectory>$(IntermediateDirectory)</IntermediateDirectory>
<IntermediateDirectory>$(IntermediateOutputPath)</IntermediateDirectory>
<KeyOriginatorFile>$(KeyOriginatorFile)</KeyOriginatorFile>
<AssemblyOriginatorKeyFile>$(AssemblyOriginatorKeyFile)</AssemblyOriginatorKeyFile>
<References>@(ReferencePath)</References>
Expand Down
4 changes: 2 additions & 2 deletions src/Sigourney/WeaverConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public class WeaverConfig
/// <summary>
/// The "obj/" directory used in the build.
/// </summary>
/// <remarks>It is derieved from the MSBuild
/// "IntermediateDirectory" property.</remarks>
/// <remarks>It is derieved from the MSBuild "IntermediateOutputPath" property.</remarks>
// TODO: Deprecate in the next minor release and replace with IntermediateOutputPath.
public string? IntermediateDirectory { get; set; }

/// <summary>
Expand Down

0 comments on commit f7916f8

Please sign in to comment.