Ensure the WindowsDesktopSdk RepoLocation overrides all others.

[rladuca]

Fixes #2363

Ensure the WindowsDesktopSdk RepoLocation overrides all others. This is key to packaging PresentationBuildTasks and associated files.

[rladuca]

@vatsan-madhavan I was thinking of adding something here to specifically check for overriding internal or external, but I felt that was overkill and we always want the SDK to package properly.

[ghost]

Hello @rladuca!

Because this pull request has the auto_merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

[rladuca]

Looks like the bot just up and merged this. @vatsan-madhavan if there are any comments you have on this I'll update with a new PR, for now I think this should just solve the immediate problem.

[vatsan-madhavan]

Why was targets being picked up but not props - what makes props different?

wpf/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj

Lines 42 to 49 in d53c1b9

	<!--
	Incorporate Microsoft.WinFx.targets in nuget packages under
	content\targets\
	-->
	<ItemGroup>
	<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.props" SubFolder="root\targets" />
	<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.targets" SubFolder="root\targets" />
	</ItemGroup>

[rladuca]

Why was targets being picked up but not props - what makes props different?

wpf/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj

Lines 42 to 49 in d53c1b9

	<!--
	Incorporate Microsoft.WinFx.targets in nuget packages under
	content\targets\
	-->
	<ItemGroup>
	<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.props" SubFolder="root\targets" />
	<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.targets" SubFolder="root\targets" />
	</ItemGroup>

Nothing in PBT was packaged properly. If you look at the WindowsDesktop SDK package, you'll see everything PBT (including WinFX) was missing. They were landing in our private transport package.

[vatsan-madhavan]

I just changed your code back and packaged it locally - windowsdesktop.nupkg built correctly for me.