From f42599dec212148ebfbc7f77c9c8deefd2ce614e Mon Sep 17 00:00:00 2001
From: Parallels <livar@live.com>
Date: Fri, 3 Mar 2017 11:13:41 -0800
Subject: [PATCH] Fixing ubuntu deb generation.

---
 build/package/Installer.DEB.targets           | 157 +++++++++---------
 build/package/dotnet-deb-tool-consumer.csproj |   1 +
 2 files changed, 82 insertions(+), 76 deletions(-)

diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index 0296b11ad..d7e5b9c19 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -1,93 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SdkDebianPackageName>dotnet-dev-$(SdkVersion)</SdkDebianPackageName>
-  </PropertyGroup>
-
-  <!-- dotnet deb-tool -->
-  <PropertyGroup>
-    <DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>
-    <DotnetDebToolVersion Condition=" '$(DotnetDebToolVersion)' == '' ">1.0.0-*</DotnetDebToolVersion>
-    <DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer</DotnetDebToolConsumerProjectName>
-    <DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
-    <DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
-  </PropertyGroup>
-
-  <!-- constants -->
-  <PropertyGroup>
-    <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
-
-    <LayoutPackageRootDirName>package_root</LayoutPackageRootDirName>
-    <LayoutAbsolutePlacementDirName>$</LayoutAbsolutePlacementDirName>
-    <LayoutSamplesDirName>samples</LayoutSamplesDirName>
-    <LayoutDocsDirName>docs</LayoutDocsDirName>
-    <LayoutDebianFilesDirName>debian</LayoutDebianFilesDirName>
-  </PropertyGroup>
-
-  <!-- Package Identities -->
-  <PropertyGroup>
-    <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkVersion)</SharedFxDebianPackageName>
-    <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
-    <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageName>
-    <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
-    <HostDebianPackageName>dotnet-host</HostDebianPackageName>
-
-    <AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageName>
-    <AdditionalSharedFxDebianPackageName>$(AdditionalSharedFxDebianPackageName.ToLower())</AdditionalSharedFxDebianPackageName>
-    <AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageName>
-    <AdditionalHostFxrDebianPackageName>$(AdditionalHostFxrDebianPackageName.ToLower())</AdditionalHostFxrDebianPackageName>
-  </PropertyGroup>
-
-  <!-- Inputs -->
-  <PropertyGroup>
-    <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
-    <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
-    <CLISdkRoot>$(OutputDirectory)/sdk</CLISdkRoot>
-  </PropertyGroup>
-
-  <!-- Output Directories -->
-  <PropertyGroup>
-    <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)/deb-tool-output</DotNetDebToolOutputDirectory>
-    <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
-  </PropertyGroup>
-
-  <!-- Layout Directories -->
-  <PropertyGroup>
-    <LayoutPackageRootDir>$(LayoutDirectory)/$(LayoutPackageRootDirName)</LayoutPackageRootDir>
-    <LayoutAbsolutePlacementDir>$(LayoutDirectory)/$(LayoutAbsolutePlacementDirName)</LayoutAbsolutePlacementDir>
-    <LayoutSamplesDir>$(LayoutDirectory)/$(LayoutSamplesDirName)</LayoutSamplesDir>
-    <LayoutDocsDir>$(LayoutDirectory)/$(LayoutDocsDirName)</LayoutDocsDir>
-    <LayoutDebianFilesDir>$(LayoutDirectory)/$(LayoutDebianFilesDirName)</LayoutDebianFilesDir>
-  </PropertyGroup>
-
-  <!-- debian_config.json -->
-  <PropertyGroup>
-    <DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/dotnet-debian_config.json</DebianConfigTemplateFile>
-    <DebianConfigJsonFile>$(LayoutDirectory)/debian_config.json</DebianConfigJsonFile>
-  </PropertyGroup>
-
   <Target Name="SetupDebProps"
           DependsOnTargets="Init">
-    <ItemGroup>
-      <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;," />
-      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;frameworks&quot;: { &quot;netcoreapp1.0&quot;: {}, &quot;netcoreapp1.1&quot;: {} }," />
-      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;tools&quot;: {&quot;$(DotnetDebToolPackageId)&quot;: &quot;$(DotnetDebToolVersion)&quot; }" />
-      <DotnetDebToolProjectJsonLines Include="}" />
-    </ItemGroup>
+    <PropertyGroup>
+      <SdkDebianPackageName>dotnet-dev-$(SdkVersion)</SdkDebianPackageName>
+    </PropertyGroup>
+
+    <!-- dotnet deb-tool -->
+    <PropertyGroup>
+      <DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer.csproj</DotnetDebToolConsumerProjectName>
+      <DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
+    </PropertyGroup>
+
+    <!-- constants -->
+    <PropertyGroup>
+      <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
+
+      <LayoutPackageRootDirName>package_root</LayoutPackageRootDirName>
+      <LayoutAbsolutePlacementDirName>$</LayoutAbsolutePlacementDirName>
+      <LayoutSamplesDirName>samples</LayoutSamplesDirName>
+      <LayoutDocsDirName>docs</LayoutDocsDirName>
+      <LayoutDebianFilesDirName>debian</LayoutDebianFilesDirName>
+    </PropertyGroup>
+
+    <!-- Package Identities -->
+    <PropertyGroup>
+      <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
+      <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
+      <SharedFxDebianPackageVersion>$(SharedFrameworkVersion)</SharedFxDebianPackageVersion>
+      <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
+      <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
+      <HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
+      <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
+      <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
+      <HostDebianPackageName>dotnet-host</HostDebianPackageName>
+
+      <AdditionalSharedFxDebianPackageVersion>$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageVersion>
+      <AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion)</AdditionalSharedFxDebianPackageName>
+      <AdditionalSharedFxDebianPackageName>$(AdditionalSharedFxDebianPackageName.ToLower())</AdditionalSharedFxDebianPackageName>
+      <AdditionalHostFxrDebianPackageVersion>$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageVersion>
+      <AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion)</AdditionalHostFxrDebianPackageName>
+      <AdditionalHostFxrDebianPackageName>$(AdditionalHostFxrDebianPackageName.ToLower())</AdditionalHostFxrDebianPackageName>
+    </PropertyGroup>
+
+    <!-- Inputs -->
+    <PropertyGroup>
+      <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
+      <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
+      <CLISdkRoot>$(OutputDirectory)/sdk</CLISdkRoot>
+    </PropertyGroup>
 
     <ItemGroup>
       <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
       <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
     </ItemGroup>
 
+    <!-- Output Directories -->
+    <PropertyGroup>
+      <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
+      <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+
+      <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
+      <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)/deb-tool-output</DotNetDebToolOutputDirectory>
+      <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
+    </PropertyGroup>
+
+    <!-- Layout Directories -->
+    <PropertyGroup>
+      <LayoutDirectory>$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
+      <LayoutPackageRootDir>$(LayoutDirectory)/$(LayoutPackageRootDirName)</LayoutPackageRootDir>
+      <LayoutAbsolutePlacementDir>$(LayoutDirectory)/$(LayoutAbsolutePlacementDirName)</LayoutAbsolutePlacementDir>
+      <LayoutSamplesDir>$(LayoutDirectory)/$(LayoutSamplesDirName)</LayoutSamplesDir>
+      <LayoutDocsDir>$(LayoutDirectory)/$(LayoutDocsDirName)</LayoutDocsDir>
+      <LayoutDebianFilesDir>$(LayoutDirectory)/$(LayoutDebianFilesDirName)</LayoutDebianFilesDir>
+    </PropertyGroup>
+
+    <!-- debian_config.json -->
+    <PropertyGroup>
+      <DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/dotnet-debian_config.json</DebianConfigTemplateFile>
+      <DebianConfigJsonFile>$(LayoutDirectory)/debian_config.json</DebianConfigJsonFile>
+    </PropertyGroup>
+
     <ItemGroup>
       <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
         <ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
       </DebianConfigTokenValues>
-      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%">
-        <ReplacementString>$(AdditionalSharedFxDebianPackageName)</ReplacementString>
+      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
+                               Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'">
+        <ReplacementString>,
+        "$(AdditionalSharedFxDebianPackageName)" : {}</ReplacementString>
+      </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
+                               Condition="'$(IncludeAdditionalSharedFrameworks)' != 'true'">
+        <ReplacementString></ReplacementString>
       </DebianConfigTokenValues>
       <DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
         <ReplacementString>$(SdkVersion)</ReplacementString>
diff --git a/build/package/dotnet-deb-tool-consumer.csproj b/build/package/dotnet-deb-tool-consumer.csproj
index 82b9f9356..ab41745f0 100644
--- a/build/package/dotnet-deb-tool-consumer.csproj
+++ b/build/package/dotnet-deb-tool-consumer.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeFrameworkVersion>2.0.0-beta-001509-00</RuntimeFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-deb-tool" Version="2.0.0-*" />