Use McMaster.Extensions.CommandLineUtils

Packaging.Targets/Packaging.Targets.csproj

@@ -60,20 +60,12 @@
     </Content>
     
     <!-- SharpZipLib -->
-    <Content Include="$(NuGetPackageRoot)\sharpziplib.netstandard\0.86.0.1\lib\netstandard1.3\SharpZipLib.NETStandard.dll" Link="SharpZipLib.NETStandard.dll">
-      <Pack>true</Pack>
-      <PackagePath>tools\netstandard1.5\</PackagePath>
-    </Content>
     <Content Include="$(NuGetPackageRoot)\sharpziplib.netstandard\0.86.0.1\lib\netstandard1.3\SharpZipLib.NETStandard.dll" Link="SharpZipLib.NETStandard.dll">
       <Pack>true</Pack>
       <PackagePath>tools\netstandard2.0\</PackagePath>
     </Content>
 
     <!-- Bouncy Castle-->
-    <Content Include="$(NuGetPackageRoot)\portable.bouncycastle\1.8.1.3\lib\netstandard1.3\BouncyCastle.Crypto.dll" Link="BouncyCastle.Crypto.dll">
-      <Pack>true</Pack>
-      <PackagePath>tools\netstandard1.5\</PackagePath>
-    </Content>
     <Content Include="$(NuGetPackageRoot)\portable.bouncycastle\1.8.1.3\lib\netstandard2.0\BouncyCastle.Crypto.dll" Link="BouncyCastle.Crypto.dll">
       <Pack>true</Pack>
       <PackagePath>tools\netstandard2.0\</PackagePath>

dotnet-deb/dotnet-deb.csproj

@@ -20,14 +20,14 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.3.4" />
     <PackageReference Include="NerdBank.GitVersioning" Version="2.3.38">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(NuGetPackageRoot)\microsoft.extensions.commandlineutils\1.1.1\lib\netstandard1.3\Microsoft.Extensions.CommandLineUtils.dll" Link="Microsoft.Extensions.CommandLineUtils.dll">
+    <Content Include="$(NuGetPackageRoot)\mcmaster.extensions.commandlineutils\2.3.4\lib\netstandard2.0\McMaster.Extensions.CommandLineUtils.dll" Link="McMaster.Extensions.CommandLineUtils.dll">
       <Pack>true</Pack>
       <PackagePath>lib\$(TargetFramework)\</PackagePath>
     </Content>

dotnet-msi/Program.cs

@@ -0,0 +1,11 @@
+namespace Dotnet.Packaging
+{
+    class Program
+    {
+        static int Main(string[] args)
+        {
+            PackagingRunner runner = new PackagingRunner("Windows Installer package", "CreateMsi");
+            return runner.Run(args);
+        }
+    }
+}

dotnet-msi/dotnet-msi.csproj

@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
+    <VersionPrefix>0.1.1</VersionPrefix>
+    <Authors>Frederik Carlier</Authors>
+    <Company>Quamotion</Company>
+    <Copyright>Copyright (c) Frederik Carlier and Contributors</Copyright>
+    <PackageLicenseUrl>https://github.com/qmfrederik/dotnet-packaging/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/qmfrederik/dotnet-packaging/</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/qmfrederik/dotnet-packaging/</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>dotnet cli packaging deb debian ubuntu mint installer</PackageTags>
+    <Description>Create Debian and Ubuntu installers (.deb files ) of your .NET Core projects straight from the command line.
+
+Once you've installed this package as a .NET CLI tool, run dotnet deb to generate a .deb file which contains the publish output of your .NET Project.
+
+See https://github.com/qmfrederik/dotnet-packaging/ for more information on how to use dotnet deb.</Description>
+    <Product>Packaging Tools for .NET CLI</Product>
+    <NugetPackageFolder Condition="$(NugetPackageFolder) == ''">$(USERPROFILE)\.nuget\packages</NugetPackageFolder>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(NugetPackageFolder)\microsoft.extensions.commandlineutils\1.1.1\lib\netstandard1.3\Microsoft.Extensions.CommandLineUtils.dll" Link="Microsoft.Extensions.CommandLineUtils.dll">
+      <Pack>true</Pack>
+      <PackagePath>lib\$(TargetFramework)\</PackagePath>
+    </Content>
+
+    <!-- Required in the package root to run the cli tool always with bundled runtime -->
+    <Content Include="../prefercliruntime">
+      <PackagePath>prefercliruntime</PackagePath>
+      <Pack>true</Pack>
+    </Content>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Include="..\dotnet-rpm\PackagingRunner.cs" Link="PackagingRunner.cs" />
+  </ItemGroup>
+</Project>

dotnet-rpm/PackagingRunner.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using System;
 using System.Diagnostics;
 using System.Text;

dotnet-rpm/Program.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using System;
 using System.Diagnostics;
 using System.Text;

dotnet-rpm/dotnet-rpm.csproj

@@ -20,14 +20,14 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.3.4" />
     <PackageReference Include="NerdBank.GitVersioning" Version="2.3.38">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(NuGetPackageRoot)\microsoft.extensions.commandlineutils\1.1.1\lib\netstandard1.3\Microsoft.Extensions.CommandLineUtils.dll" Link="Microsoft.Extensions.CommandLineUtils.dll">
+    <Content Include="$(NuGetPackageRoot)\mcmaster.extensions.commandlineutils\2.3.4\lib\netstandard2.0\McMaster.Extensions.CommandLineUtils.dll" Link="McMaster.Extensions.CommandLineUtils.dll">
       <Pack>true</Pack>
       <PackagePath>lib\$(TargetFramework)\</PackagePath>
     </Content>

dotnet-tarball/dotnet-tarball.csproj

@@ -20,14 +20,14 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.3.4" />
     <PackageReference Include="NerdBank.GitVersioning" Version="2.3.38">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(NuGetPackageRoot)\microsoft.extensions.commandlineutils\1.1.1\lib\netstandard1.3\Microsoft.Extensions.CommandLineUtils.dll" Link="Microsoft.Extensions.CommandLineUtils.dll">
+    <Content Include="$(NuGetPackageRoot)\mcmaster.extensions.commandlineutils\2.3.4\lib\netstandard2.0\McMaster.Extensions.CommandLineUtils.dll" Link="McMaster.Extensions.CommandLineUtils.dll">
       <Pack>true</Pack>
       <PackagePath>lib\$(TargetFramework)\</PackagePath>
     </Content>

dotnet-zip/dotnet-zip.csproj

@@ -20,14 +20,14 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.3.4" />
     <PackageReference Include="NerdBank.GitVersioning" Version="2.3.38">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(NuGetPackageRoot)\microsoft.extensions.commandlineutils\1.1.1\lib\netstandard1.3\Microsoft.Extensions.CommandLineUtils.dll" Link="Microsoft.Extensions.CommandLineUtils.dll">
+    <Content Include="$(NuGetPackageRoot)\mcmaster.extensions.commandlineutils\2.3.4\lib\netstandard2.0\McMaster.Extensions.CommandLineUtils.dll" Link="McMaster.Extensions.CommandLineUtils.dll">
       <Pack>true</Pack>
       <PackagePath>lib\$(TargetFramework)\</PackagePath>
     </Content>