Allow packing from the IDE, and cleanup package contents

When running Pack from the IDE, the output tasks assembly will be locked, so it requires killing MSBuild.exe afterwards, but it can be a convenient way to peek at the output.

Alternatively, you can set MSBUILDDISABLENODEREUSE=1 via envvar (i.e. before launching VS) and that would allow a more iterative approach.

.github/workflows/build.yml

@@ -22,4 +22,4 @@ jobs:
       - run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
       - run: msbuild -r
       - run: msbuild -t:test
-      - run: msbuild -t:pack -p:version=42.42.42-$(git name-rev --name-only --refs=refs/heads/* HEAD).$(git rev-list --count a12adfe..HEAD)
+      - run: msbuild -t:pack -p:packonbuild=true -p:version=42.42.42-$(git name-rev --name-only --refs=refs/heads/* HEAD).$(git rev-list --count a12adfe..HEAD)

azure-pipelines.yml

@@ -35,5 +35,5 @@ steps:
 - publish: $(System.DefaultWorkingDirectory)/logs
   artifact: logs
   condition: always()
-- script: msbuild -t:pack
+- script: msbuild -t:Pack -p:PackOnBuild=true
   displayName: msbuild -t:pack

src/Directory.Build.props

@@ -28,7 +28,13 @@
     <CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
   </PropertyGroup>
 
-  <Target Name="Pack" />
+  <Target Name="Pack" Condition="$(IsPackable)" Returns="@(PackOutput)">
+    <!-- Typically called in the IDE when we run Pack context menu. -->
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="PackOnBuild=true" Targets="Pack">
+      <Output TaskParameter="TargetOutputs" ItemName="PackOutput"/>
+    </MSBuild>
+  </Target>
+
   <Target Name="Test" />
 
   <Import Project="NuGetizer.Tasks\NuGetizer.props" Condition="'$(PackOnBuild)' == 'true'" />

src/Directory.Build.targets

@@ -3,6 +3,7 @@
   <PropertyGroup Label="Pack">
     <IsPackable Condition="'$(IsPackable)' == '' and '$(PackageId)' != ''">true</IsPackable>
     <IsPackable Condition="'$(IsPackable)' == '' and '$(PackageId)' == ''">false</IsPackable>
+    <ImportNuGetBuildTasksPackTargetsFromSdk Condition="'$(PackOnBuild)' != 'true'">false</ImportNuGetBuildTasksPackTargetsFromSdk>
   </PropertyGroup>
 
   <Import Project="NuGetizer.Tasks\$(OutputPath)NuGetizer.targets" Condition="$(IsPackable) and '$(PackOnBuild)' == 'true'" />

src/NuGetizer.Tasks/NuGetizer.Tasks.csproj

@@ -17,11 +17,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="@(None)" Exclude="NuGetizer.Tasks.targets" CopyToOutputDirectory="PreserveNewest" />
+    <ProjectCapability Include="Pack" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="@(None)" CopyToOutputDirectory="PreserveNewest" Pack="true" />
     <Content Update="NuGetizer.MultiTargeting.targets" PackagePath="buildMultiTargeting\NuGetizer.targets" />
     <None Include="NuGetizer.props;NuGetizer.Common.targets;NuGetizer.PackageMetadata.targets" 
-          PackagePath="buildMultiTargeting\%(Filename)%(Extension)" />
-    <Content Include="..\..\img\nugetizer-256.png" Link="icon-236.png" CopyToOutputDirectory="PreserveNewest" PackagePath="icon.png" />
+          PackagePath="buildMultiTargeting\%(Filename)%(Extension)"
+          Pack="true" />
+    <None Include="..\..\img\nugetizer-256.png" Link="icon.png" CopyToOutputDirectory="PreserveNewest" PackagePath="icon.png" />
   </ItemGroup>
 
   <ItemGroup>