Don't use nuget to pack on Linux (#1364)

* Don't use mono to pack on Linux

* Add missing properties

Build.proj

@@ -32,14 +32,14 @@
       Configuration=$(Configuration);
       BinDir=$(BinDir);
       StageDir=$(StageDir);
+      PackageDir=$(PackageDir);
+      PackageVersion=$(PackageVersion);
       BuildSysDir=$(BuildSysDir);
-      Mono=$(Mono);
     </BuildProperties>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <NuGet>$(UtilDir)\NuGet\nuget.exe</NuGet>
-    <NuGet Condition=" '$(Mono)' != '' ">mono $(NuGet)</NuGet>
   </PropertyGroup>
 
   <ItemGroup>
@@ -52,23 +52,23 @@
   </Target>
 
   <Target Name="Build" DependsOnTargets="RestoreReferences">
-    <MSBuild 
-      Projects="$(Solution)" 
+    <MSBuild
+      Projects="$(Solution)"
       Targets="Build"
       Properties="$(BuildProperties);Configuration=$(Configuration)" />
   </Target>
 
   <Target Name="Rebuild" DependsOnTargets="RestoreReferences">
-    <MSBuild 
-      Projects="$(Solution)" 
-      Targets="Rebuild" 
+    <MSBuild
+      Projects="$(Solution)"
+      Targets="Rebuild"
       Properties="$(BuildProperties);Configuration=$(Configuration)" />
   </Target>
 
   <Target Name="Clean">
-    <MSBuild 
-      Projects="$(Solution)" 
-      Targets="Clean" 
+    <MSBuild
+      Projects="$(Solution)"
+      Targets="Clean"
       Properties="$(BuildProperties);Configuration=$(Configuration)" />
   </Target>
 
@@ -77,9 +77,9 @@
   </Target>
 
   <Target Name="_PlatformStage" DependsOnTargets="RestoreReferences;_MakeStageDir">
-    <MSBuild 
-      Projects="$(Solution)" 
-      Targets="Build" 
+    <MSBuild
+      Projects="$(Solution)"
+      Targets="Build"
       Properties="$(BuildProperties);Configuration=$(Configuration);Staging=true" />
   </Target>
 

Package/nuget/NuGet.Packaging.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.Build.NoTargets/3.3.0">
+
+  <PropertyGroup>
+    <TargetFramework>net46</TargetFramework>
+    <NuspecBasePath>$(StageDir)</NuspecBasePath>
+    <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageOutputPath>$(PackageDir)</PackageOutputPath>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <NoWarn>$(NoWarn);NU5104;NU5110;NU5111</NoWarn>
+  </PropertyGroup>
+
+</Project>

Package/nuget/NuGet.Packaging.targets

@@ -3,11 +3,11 @@
   <ItemGroup>
     <Package Include="IronPython">
       <NuSpecDir>$(RootDir)Package\nuget</NuSpecDir>
-      <NuSpecArguments>-Symbols -SymbolPackageFormat snupkg</NuSpecArguments>
+      <NuspecProperties></NuspecProperties>
     </Package>
     <Package Include="IronPython.StdLib">
       <NuSpecDir>$(RootDir)Package\nuget</NuSpecDir>
-      <NuSpecArguments></NuSpecArguments>
+      <NuspecProperties>IncludeSymbols=false</NuspecProperties>
     </Package>
   </ItemGroup>
 
@@ -16,9 +16,7 @@
     <NuPkgOutputs>@(Package->'$(PackageDir)/%(Identity).$(PackageVersion).nupkg')</NuPkgOutputs>
   </PropertyGroup>
 
-  <Target Name="NuGetPackage" DependsOnTargets="Stage" AfterTargets="Package"
-          Inputs="$(NuSpecInputs)"
-          Outputs="$(NuPkgOutputs)">
+  <Target Name="NuGetPackage" DependsOnTargets="Stage" AfterTargets="Package" Inputs="$(NuSpecInputs)" Outputs="$(NuPkgOutputs)">
     <ItemGroup>
       <DLLsFiles Include="**\DLLs\IronPython.*.dll" />
       <DLLsFiles Include="**\DLLs\IronPython.*.pdb" />
@@ -29,7 +27,8 @@
     <Copy SourceFiles="@(DLLsFiles)" CopiedFiles="@(CopiedFiles)" DestinationFolder="$([System.IO.Path]::GetFullPath('%(DLLsFiles.RecursiveDir)\..'))">
       <Output TaskParameter="CopiedFiles" ItemName="TempCopied" />
     </Copy>
-    <Exec Command="$(NuGet) pack &quot;%(NuSpecDir)/%(Package.Identity).nuspec&quot; -BasePath &quot;$(StageDir)&quot; -OutputDirectory &quot;$(PackageDir)&quot; -Version $(PackageVersion) %(NuSpecArguments)" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\NuGet.Packaging.csproj" Targets="Restore" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\NuGet.Packaging.csproj" Targets="Pack" Properties="$(BuildProperties);%(NuspecProperties);NuspecFile=%(Package.Identity).nuspec" />
     <!-- Delete the copied files -->
     <Delete Files="@(TempCopied)" />
   </Target>