Merge pull request #127 from kzu/dev

Packaging None/Content files improvements

Author: adalon

build.proj

@@ -135,9 +135,7 @@
     <GitInfoTargets>$(PackagesPath)\GitInfo\build\GitInfo.targets</GitInfoTargets>
     <XunitConsole>$(PackagesPath)\xunit.runner.console\tools\xunit.console.x86.exe</XunitConsole>
     <XunitBuildDir>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', '.nuget', 'packages', 'xunit.runner.msbuild', 'build'))</XunitBuildDir>
-    <XunitPlatformDir Condition=" Exists('$(XunitBuildDir)') ">$([System.IO.Directory]::GetDirectories($(XunitBuildDir))[0])</XunitPlatformDir>
-    <!-- This file is used to detect whether the restore has been performed or not -->
-    <XunitProps>$([System.IO.Path]::Combine($(XunitPlatformDir), 'xunit.runner.msbuild.props'))</XunitProps>
+    <XunitProps>$([System.IO.Path]::Combine($(XunitBuildDir), 'xunit.runner.msbuild.props'))</XunitProps>
     <PendingRestore Condition=" !Exists('$(GitInfoTargets)') Or !Exists('$(XunitConsole)') Or !Exists('$(XunitProps)') ">true</PendingRestore>
   </PropertyGroup>
   <Import Project="$(XunitProps)" Condition="Exists('$(XunitProps)')"/>

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Authoring.props

@@ -22,5 +22,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
 		<!-- Packaging project doesn't need resolved nuget package dependencies -->
 		<ResolveNuGetPackages>false</ResolveNuGetPackages>
+
+		<PrimaryOutputFrameworkSpecific>false</PrimaryOutputFrameworkSpecific>
 	</PropertyGroup>
 </Project>

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj

@@ -18,8 +18,8 @@
   <ItemGroup>
     <PackageReference Include="Costura.Fody" Version="1.3.3" PrivateAssets="all" />
     <PackageReference Include="Fody" Version="1.29.4" PrivateAssets="all" />
-    <PackageReference Include="GitInfo" Version="1.*" PrivateAssets="all" />
-    <PackageReference Include="netfx-System.StringResources" Version="*" PrivateAssets="all" />
+    <PackageReference Include="GitInfo" Version="1.1.61" PrivateAssets="all" />
+    <PackageReference Include="netfx-System.StringResources" Version="3.0.14" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build" Version="14.3.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3.0" PrivateAssets="all" />
     <PackageReference Include="MSBuilder.ThisAssembly.Project" Version="0.3.3" PrivateAssets="all" />
@@ -32,6 +32,7 @@
     <Content Include="FodyWeavers.xml" />
     <Content Include="NuGet.Build.Packaging.props">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
     <Content Include="NuGet.Build.Packaging.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

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

@@ -30,9 +30,9 @@ Copyright (c) .NET Foundation. All rights reserved.
 
 		<!-- Infer PackageRererence elements from packages.config/project.json files in the project -->
 		<InferLegacyPackageReferences Condition="'$(InferLegacyPackageReferences)' == ''">true</InferLegacyPackageReferences>
-		<!-- Whether to include @(Content) items with CopyToOutputDirectory != 'None' in the package -->
+		<!-- Whether to include @(Content) items with CopyToOutputDirectory != '' in the package -->
 		<IncludeContentInPackage Condition="'$(IncludeContentInPackage)' == ''">true</IncludeContentInPackage>
-		<!-- Whether to include @(None) items with CopyToOutputDirectory != 'None' in the package -->
+		<!-- Whether to include @(None) items with CopyToOutputDirectory != '' in the package -->
 		<IncludeNoneInPackage Condition="'$(IncludeNoneInPackage)' == ''">true</IncludeNoneInPackage>
 		<!-- Whether to include @(BuiltProjectOutputGroupOutput), @(DocumentationProjectOutputGroupOutput) and @(SatelliteDllsProjectOutputGroupOutput) items in the package -->
 		<IncludeOutputsInPackage Condition="'$(IncludeOutputsInPackage)' == ''">true</IncludeOutputsInPackage>
@@ -289,16 +289,24 @@ Copyright (c) .NET Foundation. All rights reserved.
 			<!-- NOTE: Content is opt-out (must have IncludeInPackage=false to exclude if IncludeContentInPackage=true) -->
 			<!-- @ContentFilesProjectOutputGroupOutput = @(ContentWithTargetPath -> '%(FullPath)') -->
 			<PackageFile Include="@(ContentWithTargetPath->'%(FullPath)')"
-							   Condition="'%(ContentWithTargetPath.IncludeInPackage)' == 'true' or ('$(IncludeContentInPackage)' == 'true' and '%(ContentWithTargetPath.IncludeInPackage)' != 'false')">
-				<Kind>Content</Kind>
+							   Condition="
+									'%(ContentWithTargetPath.IncludeInPackage)' == 'true' or 
+									'%(ContentWithTargetPath.Kind)' != '' or 
+									('$(IncludeContentInPackage)' == 'true' and '%(ContentWithTargetPath.IncludeInPackage)' != 'false')">
+				<Kind Condition="'%(ContentWithTargetPath.Kind)' == '' and '%(ContentWithTargetPath.CopyToOutputDirectory)' != ''">$(PrimaryOutputPackageFileKind)</Kind>
+				<Kind Condition="'%(ContentWithTargetPath.Kind)' == '' and '%(ContentWithTargetPath.CopyToOutputDirectory)' == ''">Content</Kind>
 			</PackageFile>
 
-			<!-- NOTE: None is also opt-out (must have IncludeInPackage=false to exclude if IncludeNoneInPackage=true) -->
+			<!-- NOTE: None is also opt-out (must have IncludeInPackage=false to exclude if IncludeNoneInPackage=true, but only for those with CopyToOutput) -->
 			<PackageFile Include="@(_NoneWithTargetPath->'%(FullPath)')"
-							   Condition="'%(_NoneWithTargetPath.IncludeInPackage)' == 'true' or ('$(IncludeNoneInPackage)' == 'true' and '%(_NoneWithTargetPath.IncludeInPackage)' != 'false')">
-				<Kind>None</Kind>
+							   Condition="
+									'%(_NoneWithTargetPath.IncludeInPackage)' == 'true' or 
+									'%(_NoneWithTargetPath.Kind)' != '' or 
+									('$(IncludeNoneInPackage)' == 'true' and '%(_NoneWithTargetPath.CopyToOutputDirectory)' != '' and '%(_NoneWithTargetPath.IncludeInPackage)' != 'false')">
+				<Kind Condition="'%(_NoneWithTargetPath.Kind)' == '' and '%(_NoneWithTargetPath.CopyToOutputDirectory)' != ''">$(PrimaryOutputPackageFileKind)</Kind>
 			</PackageFile>
 
+
 			<PackageFile Include="@(PackageReference)" Condition="'%(Identity)' != 'NuGet.Build.Packaging'">
 				<Kind>Dependency</Kind>
 			</PackageFile>

src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.csproj

@@ -15,7 +15,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitInfo" Version="1.*" />
+    <PackageReference Include="GitInfo" Version="1.1.61" />
     <PackageReference Include="Microsoft.Build" Version="14.3.0" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
@@ -31,6 +31,21 @@
   <ItemGroup>
     <None Include="NuGet.Build.Packaging.Tests.targets" />
     <Content Include="Scenarios\given_a_custom_build_project\Readme.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\content-copy.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\content-copy-with-include-false.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\content-copy-with-include-true.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\content-copy-with-kind.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\content-with-kind.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\content.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\none-copy.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\none-copy-with-include-false.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\none-copy-with-include-true.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\none-copy-with-kind.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\none-with-kind.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\relative\content-copy-with-kind.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\relative\content-copy.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\relative\none-copy-with-kind.txt" />
+    <Content Include="Scenarios\given_a_library_with_content\relative\none-copy.txt" />
     <Content Include="Scenarios\given_duplicate_package_files\a.csproj" />
     <Content Include="Scenarios\given_duplicate_package_files\b.csproj" />
     <Content Include="Scenarios\given_duplicate_package_files\content\content.txt" />

src/Build/NuGet.Build.Packaging.Tests/Scenarios/Scenario.targets

@@ -14,25 +14,15 @@
     <Compile Include="$(MSBuildThisFileDirectory)_._" />
   </ItemGroup>
 
-  <Target Name="Dump" DependsOnTargets="GetPackageContents">
-    <Message Importance="high" Text="%(_PackageContent.Filename)%(_PackageContent.Extension)
-	FullPath=%(_PackageContent.FullPath)
+  <Target Name="Report" DependsOnTargets="GetPackageContents">
+    <Message Importance="high" Text="%(_PackageContent.RelativeDir)%(_PackageContent.Filename)%(_PackageContent.Extension)
 	Kind=%(_PackageContent.Kind)
-	PackageId=%(_PackageContent.PackageId)
 	PackagePath=%(_PackageContent.PackagePath)
-	TargetPath=%(_PackageContent.TargetPath)
-	OriginalTargetFramework=%(_PackageContent.OriginalTargetFramework)
-	OriginalTargetFrameworkMoniker=%(_PackageContent.OriginalTargetFrameworkMoniker)
-	TargetFramework=%(_PackageContent.TargetFramework)
-	TargetFrameworkMoniker=%(_PackageContent.TargetFrameworkMoniker)"/>
+	TargetPath=%(_PackageContent.TargetPath)"/>
+  </Target>
 
+  <Target Name="Dump" DependsOnTargets="GetPackageContents">
     <DumpItems Items="@(_PackageContent)" ItemName="_PackageContent" />
-
-    <!--
-	OriginalTargetFramework=%(_PackageContent.OriginalTargetFramework)
-	OriginalTargetFrameworkMoniker=%(_PackageContent.OriginalTargetFrameworkMoniker)
-	-->
-    <!--<DumpItems Items="@(_ReferencedProjectDocumentationDependency)" ItemName="_ReferencedProjectDocumentationDependency" Condition="'%(Extension)' == '.xml'" />-->
   </Target>
 
   <PropertyGroup>