From ed66c70106a1cc0a85cc673147c6aa09d82cbed5 Mon Sep 17 00:00:00 2001
From: PiotrP <piotrp@microsoft.com>
Date: Thu, 25 Aug 2016 15:53:15 -0700
Subject: [PATCH] wIp

---
 build/Microsoft.DotNet.Cli.Package.targets    |  23 +++-
 ...> Microsoft.DotNet.Cli.Installer.DEB.proj} | 100 ++++--------------
 .../Microsoft.DotNet.Cli.Installer.DEB.props  |  97 +++++++++++++++--
 .../dotnet-cli-build/DotNetDebTool.cs         |   3 +
 4 files changed, 134 insertions(+), 89 deletions(-)
 rename build/package/{Microsoft.DotNet.Cli.Installer.DEB.targets => Microsoft.DotNet.Cli.Installer.DEB.proj} (65%)

diff --git a/build/Microsoft.DotNet.Cli.Package.targets b/build/Microsoft.DotNet.Cli.Package.targets
index 0ca7a1758..8af7c7d03 100644
--- a/build/Microsoft.DotNet.Cli.Package.targets
+++ b/build/Microsoft.DotNet.Cli.Package.targets
@@ -3,13 +3,34 @@
   <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Layout.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Archive.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Nupkg.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.DEB.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.MSI.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.PKG.targets" />
 
   <Target Name="GenerateInstallers" 
           DependsOnTargets="Init;Layout;GeneratePkgs;GenerateDebs;GenerateMsis" />
 
+  <Target Name="GenerateDebs"
+          DependsOnTargets="Init;"
+          Condition=" '$(OSName)' == 'ubuntu' ">
+    <MSBuild
+      BuildInParallel="False"
+      Projects="$(RepoRoot)/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj"
+      Properties="CliSdkRoot=$(Stage2Directory)/sdk;
+                  RepoRoot=$(RepoRoot);
+                  PackagesDirectory=$(PackagesDirectory);
+                  IntermediateDirectory=$(IntermediateDirectory);
+                  HostFxrVersion=$(HostFxrVersion);
+                  SdkVersion=$(SdkVersion);
+                  SharedFrameworkName=$(SharedFrameworkName);
+                  SharedFrameworkVersion=$(SharedFrameworkVersion);
+                  SharedFrameworkBrandName=$(SharedFrameworkBrandName);
+                  SdkBrandName=$(SdkBrandName);"
+      ToolsVersion="4.0"
+      UnloadProjectsOnCompletion="False"
+      UseResultsCache="True">
+    </MSBuild>
+  </Target>
+
   <Target Name="Package"
           DependsOnTargets="BuildDotnetCliBuildFramework;
                             Init;
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
similarity index 65%
rename from build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
rename to build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
index 524715fff..55da3fef3 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
@@ -1,86 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
+         DefaultTarget="GenerateDebs">
+
   <Import Project="Microsoft.DotNet.Cli.Installer.DEB.props" />
 
   <Target Name="GenerateDebs"
-          DependsOnTargets="Init;
-                            GenerateSdkDeb;
+          DependsOnTargets="GenerateSdkDeb;
                             TestSdkDeb;"
-      Condition=" '$(OSName)' == 'ubuntu' " />
-
-  <Target Name="SetupGenerateDebInputsOutputs">
-      <Exec Command="/usr/bin/env debuild -h" ContinueOnError="true">
-          <Output TaskParameter="ExitCode" PropertyName="DebuildExitCode" />
-      </Exec>
-
-      <!-- Workaround for Ubuntu16 Jenkins https://github.com/dotnet/core-setup/issues/167 -->
-      <Message Condition=" '$(DebuildPresent)'  != 'true' "
-               Text="Debuild Not found, Debian packages will not be built."
-               Importance="High" />
-
-      <PropertyGroup>
-        <DebuildPresent>false</DebuildPresent>
-        <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>
-
-        <DotnetDebToolDir></DotnetDebToolDir>
-        <DotnetDebToolVersion></DotnetDebToolVersion>
-        <DotnetDebToolPackageSource></DotnetDebToolPackageSource>
-
-        <DebianPackagingScript>$(RepoRoot)/scripts/package/package-debian.sh</DebianPackagingScript>
-        <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
-
-        <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
-        <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
-
-        <SdkDebianPackageName>dotnet-dev-$(SdkVersion)</SdkDebianPackageName>
-        <SharedFrameworkDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkVersion)</SharedFrameworkDebianPackageName>
-        <SharedFrameworkDebianPackageName>$(SharedFrameworkDebianPackageName.ToLower())</SharedFrameworkDebianPackageName>
-        <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageName>
-        <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
-        <SharedHostDebianPackageName>dotnet-host</SharedHostDebianPackageName>
-
-        <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
-
-        <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
-        <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
-        <EndToEndTestDirectory>$(RepoRoot)/test/EndToEnd</EndToEndTestDirectory>
-
-        <DotnetDebToolConfigJsonFilePath>$(SdkDebianLayoutOutputDirectory)/$(DotnetDebToolConfigJsonFileName)</DotnetDebToolConfigJsonFilePath>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" />
-
-        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME">
-          <ReplacementString>$(SharedFrameworkDebianPackageName)</ReplacementString>
-        </SdkDebianPackageTemplateReplacement>
-        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_NUGET_NAME">
-          <ReplacementString>$(SharedFrameworkName)</ReplacementString>
-        </SdkDebianPackageTemplateReplacement>
-        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_NUGET_VERSION">
-          <ReplacementString>$(SharedFrameworkVersion)</ReplacementString>
-        </SdkDebianPackageTemplateReplacement>
-        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_BRAND_NAME">
-          <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
-        </SdkDebianPackageTemplateReplacement>
-        <SdkDebianPackageTemplateReplacement Include="SDK_NUGET_VERSION">
-          <ReplacementString>$(SdkVersion)</ReplacementString>
-        </SdkDebianPackageTemplateReplacement>
-        <SdkDebianPackageTemplateReplacement Include="CLI_SDK_BRAND_NAME">
-          <ReplacementString>$(SdkBrandName)</ReplacementString>
-        </SdkDebianPackageTemplateReplacement>
-
-        <!-- Consumed By Publish -->
-        <GeneratedInstallers Include="$(SdkInstallerFile)" />
-
-        <SdkDebInputFiles Include="$(SdkLayoutOutputDirectory)/**/*" />
-        <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
-      </ItemGroup>
-  </Target>
+          Condition=" '$(OSName)' == 'ubuntu' " />
 
   <Target Name="GenerateSdkDeb"
       Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)'  == 'true' "
-      DependsOnTargets="SetupGenerateDebInputsOutputs;
+      DependsOnTargets="EnsureDebuild;
                         PrepareDotnetDebDirectories;
                         PrepareDotnetDebTool;"
       Inputs="@(SdkDebInputFiles)"
@@ -93,7 +24,7 @@
 
       <!-- Create layout -->
       <Copy
-        DestinationFiles="@(SourceFile->'$(DebLayoutPackageRootDirName)/%(RecursiveDir)%(Filename)%(Extension)')"
+        DestinationFiles="@(SourceFile->'$(DebLayoutPackageRootDir)/%(RecursiveDir)%(Filename)%(Extension)')"
         OverwriteReadOnlyFiles="True"
         SkipUnchangedFiles="False"
         SourceFiles="@(SdkLayoutOutputDirectory)"
@@ -159,7 +90,7 @@
 
   <Target Name="PrepareDotnetDebDirectories">
     <PropertyGroup>
-      <DebLayoutPackageRootDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutPackageRootDirName)</DebLayoutPackageRootDirName>
+      <DebLayoutPackageRootDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutPackageRootDirName)</DebLayoutPackageRootDir>
       <DebLayoutAbsolutePlacementDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutAbsolutePlacementDirName)</DebLayoutAbsolutePlacementDir>
       <DebLayoutSamplesDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutSamplesDirName)</DebLayoutSamplesDir>
       <DebLayoutDocsDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutDocsDirName)</DebLayoutDocsDir>
@@ -210,7 +141,22 @@
       DestinationFile="$(DotnetDebToolConfigJsonFilePath)"
       ReplacementPatterns="@(SdkDebianPackageTemplateReplacement -> '%(Identity)')"
       ReplacementStrings="@(SdkDebianPackageTemplateReplacement -> '%(ReplacementString)')" />
+  </Target>
 
+  <Target Name="EnsureDebuild">
+      <Exec Command="/usr/bin/env debuild -h" ContinueOnError="true">
+          <Output TaskParameter="ExitCode" PropertyName="DebuildExitCode" />
+      </Exec>  
 
+      <!-- Debuild -->
+      <PropertyGroup>
+        <DebuildPresent>false</DebuildPresent>
+        <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>
+      </PropertyGroup>
+
+      <!-- Workaround for Ubuntu16 Jenkins https://github.com/dotnet/core-setup/issues/167 -->
+      <Message Condition=" '$(DebuildPresent)'  != 'true' "
+               Text="Debuild Not found, Debian packages will not be built."
+               Importance="High" />
   </Target>
 </Project>
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.props b/build/package/Microsoft.DotNet.Cli.Installer.DEB.props
index 2431676c6..cfd4da179 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.props
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.props
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- dotnet deb-tool -->
   <PropertyGroup>
-    <DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>
-    <DotnetDebToolVersion>1.0.0-*</DotnetDebToolVersion>
+    <DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>  
+    <DotnetDebToolVersion Condition=" '$(DotnetDebToolVersion)' == '' ">1.0.0-*</DotnetDebToolVersion>
     <DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer</DotnetDebToolConsumerProjectName>
-    <DotnetDebToolConfigJsonFileName>debian_config.json</DotnetDebToolConfigJsonFileName>
-
-    <DebLayoutPackageRootDirName>package_root</DebLayoutPackageRoot>
-    <DebLayoutAbsolutePlacementDirName>$</DebLayoutAbsolutePlacement>
-    <DebLayoutSamplesDirName>samples</DebLayoutSamplesDirName>
-    <DebLayoutDocsDirName>docs</DebLayoutDocsDirName>
-    <DebLayoutDebianFilesDirName>debian</DebLayoutDebianFilesDirName>
-  </PropertyGroup>
+    <DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
+    <DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
+  </PropertyGroup>  
 
   <ItemGroup>
-    <DotnetDebToolProjectJsonLines Remove="*" />
     <DotnetDebToolProjectJsonLines Include="{" />
     <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;version&quot;: &quot;1.0.0-*&quot;," />
     <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;name&quot;: &quot;$(DotnetDebToolConsumerProjectName)&quot;," />
@@ -22,4 +17,84 @@
     <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;tools&quot;: {&quot;$(DotnetDebToolPackageId)&quot;: &quot;$(DotnetDebToolVersion)&quot; }" />
     <DotnetDebToolProjectJsonLines Include="}" />
   </ItemGroup>
+
+  <!-- constants -->
+  <PropertyGroup>
+    <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
+
+    <DebLayoutPackageRootDirName>package_root</DebLayoutPackageRootDirName>
+    <DebLayoutAbsolutePlacementDirName>$</DebLayoutAbsolutePlacementDirName>
+    <DebLayoutSamplesDirName>samples</DebLayoutSamplesDirName>
+    <DebLayoutDocsDirName>docs</DebLayoutDocsDirName>
+    <DebLayoutDebianFilesDirName>debian</DebLayoutDebianFilesDirName>
+  </PropertyGroup>
+
+  <!-- Package Identities -->
+  <PropertyGroup>
+    <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
+    <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
+    <SharedFrameworkDebianPackageVersion>$(SharedFrameworkVersion)</SharedFrameworkDebianPackageVersion>
+    <SharedFrameworkDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkDebianPackageVersion)</SharedFrameworkDebianPackageName>
+    <SharedFrameworkDebianPackageName>$(SharedFrameworkDebianPackageName.ToLower())</SharedFrameworkDebianPackageName>
+    <HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
+    <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
+    <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
+    <SharedHostDebianPackageName>dotnet-host</SharedHostDebianPackageName>
+  </PropertyGroup>
+
+  <!-- Inputs -->
+  <PropertyGroup>
+    <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
+    <EndToEndTestDirectory>$(RepoRoot)/test/EndToEnd</EndToEndTestDirectory>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <SdkDebInputFiles Include="$(SdkLayoutOutputDirectory)/**/*" />
+    <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
+  </ItemGroup>
+
+  <!-- Output Directories -->
+  <PropertyGroup>
+    <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
+    <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+
+    <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
+    <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
+  </PropertyGroup>
+
+  <!-- debian_config.json -->
+  <PropertyGroup>
+    <DebianConfigTemplateFileName>dotnet-debian_config.json</DebianConfigTemplateFileName>
+    <DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/$(DebianConfigTemplateFileName)</DebianConfigTemplateFile>
+    <DebianConfigJsonFileName>debian_config.json</DebianConfigJsonFileName>
+    <DebianConfigJsonFile>$(SdkDebianLayoutOutputDirectory)/$(DebianConfigJsonFileName)</DebianConfigJsonFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME">
+      <ReplacementString>$(SharedFrameworkDebianPackageName)</ReplacementString>
+    </SdkDebianPackageTemplateReplacement>
+    <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_NUGET_NAME">
+      <ReplacementString>$(SharedFrameworkName)</ReplacementString>
+    </SdkDebianPackageTemplateReplacement>
+    <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_NUGET_VERSION">
+      <ReplacementString>$(SharedFrameworkVersion)</ReplacementString>
+    </SdkDebianPackageTemplateReplacement>
+    <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_BRAND_NAME">
+      <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
+    </SdkDebianPackageTemplateReplacement>
+    <SdkDebianPackageTemplateReplacement Include="SDK_NUGET_VERSION">
+      <ReplacementString>$(SdkVersion)</ReplacementString>
+    </SdkDebianPackageTemplateReplacement>
+    <SdkDebianPackageTemplateReplacement Include="CLI_SDK_BRAND_NAME">
+      <ReplacementString>$(SdkBrandName)</ReplacementString>
+    </SdkDebianPackageTemplateReplacement>
+  </ItemGroup>
+
+  <ItemGroup>
+    <TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" />
+
+    <!-- Consumed By Publish -->
+    <GeneratedInstallers Include="$(SdkInstallerFile)" />
+  </ItemGroup>
 </Project>
diff --git a/build_projects/dotnet-cli-build/DotNetDebTool.cs b/build_projects/dotnet-cli-build/DotNetDebTool.cs
index 5946d2c97..77f05b19d 100644
--- a/build_projects/dotnet-cli-build/DotNetDebTool.cs
+++ b/build_projects/dotnet-cli-build/DotNetDebTool.cs
@@ -1,6 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
 namespace Microsoft.DotNet.Cli.Build
 {
     public class DotNetDebTool : DotNetTool