Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Commit 71d5894

Browse files
committed
Rearrange project file imports
This changes fixes an issue where the PackOnBuild property is not respected, because the BuildDependsOn property is set too soon, and is then overwritten with the default values in MSBuild. This only affects projects build as part of this solution.
1 parent 909f43d commit 71d5894

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/Directory.Build.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,6 @@ AssemblyVersion=$(AssemblyVersion)" />
6969
<Copy SourceFiles="$(PackageTargetPath)" DestinationFolder="$(TEMP)\packages" />
7070
</Target>
7171

72+
<Import Project="$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets" Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets')" />
73+
7274
</Project>

src/NuGet.Build.Packaging.Shared.targets

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<ThisAssemblyProjectProperty Include="PackageVersion" />
88
</ItemGroup>
99

10-
<Import Project="$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets" Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets')" />
11-
1210
<PropertyGroup>
1311
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
1412
<NuGetPackagingTargetsImported>true</NuGetPackagingTargetsImported>

0 commit comments

Comments
 (0)