When items are copied to output directory, add to package from the target path

Instead of adding them to the package from the original source path. This makes
it possible for targets that tweak the outputs during build to include those
modified outputs in the package.

Concrete use case in our own NuGet.Build.Packaging.Version.props which is modified
during build to reflect the actual nugetizer version being built.

Author: kzu

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Inference.targets

@@ -88,24 +88,52 @@ Copyright (c) .NET Foundation. All rights reserved.
 			</_InferredPackageFile>
 
 			<!-- NOTE: Content is opt-out (must have Pack=false to exclude if IncludeContentInPackage=true) -->
-			<_InferredPackageFile Include="@(ContentWithTargetPath->'%(FullPath)')"
+			<!-- Stuff that is copied to output should be included from that output location -->
+			<_InferredPackageFile Include="@(ContentWithTargetPath->'$(OutputPath)%(TargetPath)')"
 							   Condition="
-									'%(ContentWithTargetPath.Pack)' == 'true' or 
-									'%(ContentWithTargetPath.Kind)' != '' or 
-									('$(IncludeContentInPackage)' == 'true' and '%(ContentWithTargetPath.Pack)' != 'false')">
+									'%(ContentWithTargetPath.CopyToOutputDirectory)' != '' and
+									(
+										'%(ContentWithTargetPath.Pack)' == 'true' or 
+										'%(ContentWithTargetPath.Kind)' != '' or 
+										('$(IncludeContentInPackage)' == 'true' and '%(ContentWithTargetPath.Pack)' != 'false')
+									)">
 				<Kind Condition="'%(ContentWithTargetPath.Kind)' == '' and '%(ContentWithTargetPath.CopyToOutputDirectory)' != ''">$(PrimaryOutputKind)</Kind>
-				<Kind Condition="'%(ContentWithTargetPath.Kind)' == '' and '%(ContentWithTargetPath.CopyToOutputDirectory)' == ''">Content</Kind>
+			</_InferredPackageFile>
+			<!-- Otherwise, include from source location -->
+			<_InferredPackageFile Include="@(ContentWithTargetPath->'%(FullPath)')"
+							   Condition="
+									'%(ContentWithTargetPath.CopyToOutputDirectory)' == '' and
+									(
+										'%(ContentWithTargetPath.Pack)' == 'true' or 
+										'%(ContentWithTargetPath.Kind)' != '' or 
+										('$(IncludeContentInPackage)' == 'true' and '%(ContentWithTargetPath.Pack)' != 'false')
+									)">
+				<Kind Condition="'%(ContentWithTargetPath.Kind)' == ''">Content</Kind>
 			</_InferredPackageFile>
 
 			<!-- NOTE: None is also opt-out (must have Pack=false to exclude if IncludeNoneInPackage=true, but this property defaults to false) -->
-			<_InferredPackageFile Include="@(_NoneWithTargetPath->'%(FullPath)')"
+			<!-- Likewise, include from target path if it's copied, from source path otherwise -->
+			<_InferredPackageFile Include="@(_NoneWithTargetPath->'$(OutputPath)%(TargetPath)')"
 							   Condition="
-									'%(_NoneWithTargetPath.Pack)' == 'true' or 
-									'%(_NoneWithTargetPath.Kind)' != '' or 
-									('$(IncludeNoneInPackage)' == 'true' and '%(_NoneWithTargetPath.Pack)' != 'false')">
+									'%(_NoneWithTargetPath.CopyToOutputDirectory)' != '' and
+									(
+										'%(_NoneWithTargetPath.Pack)' == 'true' or 
+										'%(_NoneWithTargetPath.Kind)' != '' or 
+										('$(IncludeNoneInPackage)' == 'true' and '%(_NoneWithTargetPath.Pack)' != 'false')
+									)">
 				<Kind Condition="'%(_NoneWithTargetPath.Kind)' == '' and '%(_NoneWithTargetPath.CopyToOutputDirectory)' != ''">$(PrimaryOutputKind)</Kind>
-				<Kind Condition="'%(_NoneWithTargetPath.Kind)' == '' and '%(_NoneWithTargetPath.CopyToOutputDirectory)' == ''">None</Kind>
 			</_InferredPackageFile>
+			<_InferredPackageFile Include="@(_NoneWithTargetPath->'%(FullPath)')"
+							   Condition="
+									'%(_NoneWithTargetPath.CopyToOutputDirectory)' == '' and
+									(
+										'%(_NoneWithTargetPath.Pack)' == 'true' or 
+										'%(_NoneWithTargetPath.Kind)' != '' or 
+										('$(IncludeNoneInPackage)' == 'true' and '%(_NoneWithTargetPath.Pack)' != 'false')
+									)">
+				<Kind Condition="'%(_NoneWithTargetPath.Kind)' == ''">None</Kind>
+			</_InferredPackageFile>
+
 
 			<_InferredPackageFile Include="@(PackageReference)" Condition="'%(Identity)' != 'NuGet.Build.Packaging'">
 				<Kind>Dependency</Kind>