Enable building distro agnostic runtime Deb packages (dotnet/core-setup#3487)

* Initial changes for building distro agnostic dotnet deb packages.

* Build static list of runtime dependencies. This enables us to build runtime deps packages from single docker image

* NIT changes and cleanup

* Update per feedback comments

Commit migrated from https://github.com/dotnet/core-setup/commit/85ec3440673b755b5560f4316af8776186a74767

diff --git a/src/installer/buildpipeline/Core-Setup-Linux-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
index 907d2bc..b0fae14 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Linux-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
@@ -249,7 +249,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Package - Ubuntu 14.04 ",
+      "displayName": "Package Runtime Dep - Ubuntu 14.04 ",
       "timeoutInMinutes": 0,
       "refName": "Task13",
       "task": {
@@ -269,7 +269,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish - Ubuntu 14.04 ",
+      "displayName": "Publish Runtime Dep - Ubuntu 14.04 ",
       "timeoutInMinutes": 0,
       "refName": "Task14",
       "task": {
@@ -289,67 +289,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Initialize docker - Ubuntu16.04",
-      "timeoutInMinutes": 0,
-      "refName": "Task15",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(PB_DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh",
-        "arguments": "$(DockerImageName_Ubuntu1604)",
-        "workingFolder": "$(PB_DockerHost_Sandbox)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Clean - Ubuntu16.04 ",
-      "timeoutInMinutes": 0,
-      "refName": "Task16",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) /bin/bash $(DockerCommonCleanCommands)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Build traversal build dependencies -Ubuntu 16.04 ",
-      "timeoutInMinutes": 0,
-      "refName": "Task17",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package - Ubuntu 16.04",
+      "displayName": "Package Runtime Dep - Ubuntu 16.04",
       "timeoutInMinutes": 0,
       "refName": "Task18",
       "task": {
@@ -359,7 +299,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments) /p:OutputRid=ubuntu.16.04-$(PB_TargetArchitecture) /p:BuildRuntimeDebs=false",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -369,7 +309,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish - Ubuntu 16.04 ",
+      "displayName": "Publish Runtime Dep - Ubuntu 16.04 ",
       "timeoutInMinutes": 0,
       "refName": "Task19",
       "task": {
@@ -379,7 +319,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs) /p:OutputRid=ubuntu.16.04-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -389,67 +329,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Initialize docker - Ubuntu17.04",
-      "timeoutInMinutes": 0,
-      "refName": "ClonedTask151",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(PB_DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh",
-        "arguments": "$(DockerImageName_Ubuntu1704)",
-        "workingFolder": "$(PB_DockerHost_Sandbox)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Clean - Ubuntu17.04",
-      "timeoutInMinutes": 0,
-      "refName": "ClonedTask162",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1704) /bin/bash $(DockerCommonCleanCommands)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Build traversal build dependencies -Ubuntu 17.04",
-      "timeoutInMinutes": 0,
-      "refName": "ClonedTask173",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1704) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package - Ubuntu 17.04",
+      "displayName": "Package Runtime Dep - Ubuntu 17.04",
       "timeoutInMinutes": 0,
       "refName": "ClonedTask184",
       "task": {
@@ -459,7 +339,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1704) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments) /p:OutputRid=ubuntu.17.04-$(PB_TargetArchitecture) /p:BuildRuntimeDebs=false",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -469,7 +349,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish - Ubuntu 17.04",
+      "displayName": "Publish Runtime Dep - Ubuntu 17.04",
       "timeoutInMinutes": 0,
       "refName": "ClonedTask195",
       "task": {
@@ -479,7 +359,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1704) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs) /p:OutputRid=ubuntu.17.04-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -489,67 +369,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Initialize docker - Ubuntu17.10",
-      "timeoutInMinutes": 0,
-      "refName": "ClonedClonedTask1511",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(PB_DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh",
-        "arguments": "$(DockerImageName_Ubuntu1710)",
-        "workingFolder": "$(PB_DockerHost_Sandbox)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Clean - Ubuntu17.10",
-      "timeoutInMinutes": 0,
-      "refName": "ClonedClonedTask1622",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1710) /bin/bash $(DockerCommonCleanCommands)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Build traversal build dependencies -Ubuntu 17.10",
-      "timeoutInMinutes": 0,
-      "refName": "ClonedClonedTask1733",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1710) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package - Ubuntu 17.10",
+      "displayName": "Package Runtime Dep - Ubuntu 17.10",
       "timeoutInMinutes": 0,
       "refName": "ClonedClonedTask1844",
       "task": {
@@ -559,7 +379,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1710) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments) /p:OutputRid=ubuntu.17.10-$(PB_TargetArchitecture) /p:BuildRuntimeDebs=false",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -569,7 +389,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish - Ubuntu 17.10",
+      "displayName": "Publish Runtime Dep - Ubuntu 17.10",
       "timeoutInMinutes": 0,
       "refName": "ClonedClonedTask1955",
       "task": {
@@ -579,47 +399,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1710) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Initialize docker - Debian 8",
-      "timeoutInMinutes": 0,
-      "refName": "Task25",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(PB_DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh",
-        "arguments": "$(DockerImageName_Debian8)",
-        "workingFolder": "$(PB_DockerHost_Sandbox)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Clean - Debian 8 container",
-      "timeoutInMinutes": 0,
-      "refName": "Task26",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian8) /bin/bash $(DockerCommonCleanCommands)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs) /p:OutputRid=ubuntu.17.10-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -629,27 +409,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Build traversal build dependencies - Debian 8",
-      "timeoutInMinutes": 0,
-      "refName": "Task27",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package - Debian 8",
+      "displayName": "Package Runtime Dep - Debian 8",
       "timeoutInMinutes": 0,
       "refName": "Task28",
       "task": {
@@ -659,7 +419,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments) /p:OutputRid=debian.8-$(PB_TargetArchitecture) /p:BuildRuntimeDebs=false",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -669,7 +429,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish - Debian 8",
+      "displayName": "Publish Runtime Dep - Debian 8",
       "timeoutInMinutes": 0,
       "refName": "Task29",
       "task": {
@@ -679,67 +439,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Initialize docker - Debian 9",
-      "timeoutInMinutes": 0,
-      "refName": "Task30",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(PB_DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh",
-        "arguments": "$(DockerImageName_Debian9)",
-        "workingFolder": "$(PB_DockerHost_Sandbox)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Clean - Debian 9 container",
-      "timeoutInMinutes": 0,
-      "refName": "Task31",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian9) /bin/bash $(DockerCommonCleanCommands)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Build traversal build dependencies - Debian 9",
-      "timeoutInMinutes": 0,
-      "refName": "Task32",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian9) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:OutputRid=debian.9-$(PB_TargetArchitecture) $(DistroSpecificMSBuildArguments)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs) /p:OutputRid=debian.8-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -749,7 +449,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Package - Debian 9",
+      "displayName": "Package Runtime Dep - Debian 9",
       "timeoutInMinutes": 0,
       "refName": "Task33",
       "task": {
@@ -759,7 +459,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian9) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) /p:OutputRid=debian.9-$(PB_TargetArchitecture) $(DistroSpecificMSBuildArguments)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) /p:OutputRid=debian.9-$(PB_TargetArchitecture) $(DistroSpecificMSBuildArguments) /p:BuildRuntimeDebs=false",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -769,7 +469,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish - Debian 9",
+      "displayName": "Publish Runtime Dep - Debian 9",
       "timeoutInMinutes": 0,
       "refName": "Task34",
       "task": {
@@ -779,7 +479,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Debian9) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) /p:OutputRid=debian.9-$(PB_TargetArchitecture) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
+        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishType=$(PB_PublishType) /p:OutputRid=debian.9-$(PB_TargetArchitecture) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -1054,29 +754,6 @@
       "value": "-ConfigurationGroup=$(BuildConfiguration) $(PB_AdditionalBuildArguments)",
       "allowOverride": true
     },
-    "CONNECTION_STRING": {
-      "value": "PassedViaPipeBuild"
-    },
-    "DEB_REPO_PASSWORD": {
-      "value": null,
-      "isSecret": true
-    },
-    "PB_DebianId_ubuntu1404-x64": {
-      "value": null,
-      "isSecret": true
-    },
-    "PB_DebianId_debian8-x64": {
-      "value": null,
-      "isSecret": true
-    },
-    "PB_DebianId_debian9-x64": {
-      "value": null,
-      "isSecret": true
-    },
-    "PB_DebianId_ubuntu1604-x64": {
-      "value": null,
-      "isSecret": true
-    },
     "PB_ChecksumAzureAccountName": {
       "value": "dotnetclichecksums"
     },
@@ -1173,12 +850,6 @@
     "PB_PortableBuild": {
       "value": "false"
     },
-    "PB_DebRepoUser": {
-      "value": "dotnet"
-    },
-    "PB_DebRepoServer": {
-      "value": "azure-apt-cat.cloudapp.net"
-    },
     "AdditionalMSBuildPackagingArguments": {
       "value": "/p:UsePrebuiltPortableBinariesForInstallers=true /p:SharedFrameworkPublishDir=/root/sharedFrameworkPublish/"
     },
@@ -1189,10 +860,7 @@
       "value": "/flp:v=diag /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=false /p:ConfigurationGroup=$(BuildConfiguration) /p:OSGroup=Linux /p:OfficialBuildId=$(OfficialBuildId)"
     },
     "DistroSpecificMSBuildPublishArgs": {
-      "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)"
-    },
-    "PB_DebianKeys": {
-      "value": "/p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_debian9-x64=$(PB_DebianId_debian9-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1704-x64=$(PB_DebianId_ubuntu1704-x64) /p:DebianId_ubuntu1710-x64=$(PB_DebianId_ubuntu1710-x64)"
+      "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)"
     },
     "DockerTag_Ubuntu1404": {
       "value": "ubuntu-14.04-debpkg-e5cf912-20175003025046"
@@ -1203,33 +871,6 @@
     "DockerCommonRunArgs_Ubuntu1404": {
       "value": "--name $(PB_DockerContainerName)$(DockerTag_Ubuntu1404) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Ubuntu1404)"
     },
-    "DockerTag_Ubuntu1604": {
-      "value": "ubuntu-16.04-debpkg-e5cf912-20174703024721"
-    },
-    "DockerImageName_Ubuntu1604": {
-      "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1604)"
-    },
-    "DockerCommonRunArgs_Ubuntu1604": {
-      "value": "--name $(PB_DockerContainerName)$(DockerTag_Ubuntu1604) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Ubuntu1604)"
-    },
-    "DockerTag_Debian8": {
-      "value": "debian-8.2-debpkg-9f87c3c-20173003023006"
-    },
-    "DockerImageName_Debian8": {
-      "value": "$(PB_DockerRepository):$(DockerTag_Debian8)"
-    },
-    "DockerCommonRunArgs_Debian8": {
-      "value": "--name $(PB_DockerContainerName)$(DockerTag_Debian8) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Debian8)"
-    },
-    "DockerTag_Debian9": {
-      "value": "debian-8.2-debpkg-9f87c3c-20173003023006"
-    },
-    "DockerImageName_Debian9": {
-      "value": "$(PB_DockerRepository):$(DockerTag_Debian9)"
-    },
-    "DockerCommonRunArgs_Debian9": {
-      "value": "--name $(PB_DockerContainerName)$(DockerTag_Debian9) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Debian9)"
-    },
     "DockerTag_Rhel7": {
       "value": "rhel-7-rpmpkg-c982313-20174116044113"
     },
@@ -1239,42 +880,6 @@
     "DockerCommonRunArgs_Rhel7": {
       "value": "--name $(PB_DockerContainerName)$(DockerTag_Rhel7) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Rhel7)"
     },
-    "CLI_NUGET_FEED_URL": {
-      "value": "https:%2F%2Fdotnet.myget.org/F/cli-deps/api/v2/package"
-    },
-    "CLI_NUGET_SYMBOLS_FEED_URL": {
-      "value": "https:%2F%2Fdotnet.myget.org/F/cli-deps/symbols/api/v2/package"
-    },
-    "CliNuGetApiKey": {
-      "value": null,
-      "isSecret": true
-    },
-    "DockerCommonRunArgs_Ubuntu1704": {
-      "value": "--name $(PB_DockerContainerName)$(DockerTag_Ubuntu1704) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Ubuntu1704)"
-    },
-    "DockerImageName_Ubuntu1704": {
-      "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1704)"
-    },
-    "DockerTag_Ubuntu1704": {
-      "value": "ubuntu-17.04-debpkg-7968025-20172512022553"
-    },
-    "PB_DebianId_ubuntu1704-x64": {
-      "value": null,
-      "isSecret": true
-    },
-    "DockerCommonRunArgs_Ubuntu1710": {
-      "value": "--name $(PB_DockerContainerName)$(DockerTag_Ubuntu1710) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Ubuntu1710)"
-    },
-    "DockerImageName_Ubuntu1710": {
-      "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1710)"
-    },
-    "DockerTag_Ubuntu1710": {
-      "value": "ubuntu-17.10-debpkg-8feab42-20175925105910"
-    },
-    "PB_DebianId_ubuntu1710-x64": {
-      "value": null,
-      "isSecret": true
-    },
     "PB_PackageVersionPropsUrl": {
       "value": ""
     },

diff --git a/src/installer/pkg/packaging/deb/dotnet-deb-tool-consumer.csproj b/src/installer/pkg/packaging/deb/dotnet-deb-tool-consumer.csproj
index 82b9f93..77d4dd2 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-deb-tool-consumer.csproj
+++ b/src/installer/pkg/packaging/deb/dotnet-deb-tool-consumer.csproj
@@ -3,6 +3,6 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-deb-tool" Version="2.0.0-*" />
+    <DotNetCliToolReference Include="dotnet-deb-tool" Version="2.1.0-*" />
   </ItemGroup>
 </Project>

diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_debian.8-x64.json
similarity index 88%
rename from src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json
rename to src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_debian.8-x64.json
index 7d5e1d4..dfd0433 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json
+++ b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_debian.8-x64.json
@@ -29,17 +29,17 @@
     },
 
     "debian_dependencies":{
-    "libc6":{},
-    "libcurl3":{},
-    "libgcc1":{},
-    "libgssapi-krb5-2":{},
-    "liblttng-ust0":{},
-    "libstdc++6":{},
-    "libunwind8":{},
-    "libuuid1":{},
-    "zlib1g":{},
-    "%LIBSSL_PACKAGE_NAME%" : {},
-    "%LIBICU_PACKAGE_NAME%": {} 
+        "libc6":{},
+        "libcurl3":{},
+        "libgcc1":{},
+        "libgssapi-krb5-2":{},
+        "liblttng-ust0":{},
+        "libstdc++6":{},
+        "libunwind8":{},
+        "libuuid1":{},
+        "zlib1g":{},
+        "libssl1.0.0" : {},
+        "libicu52": {} 
     },
 
     "debian_ignored_dependencies" : [

diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian9_config.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_debian.9-x64.json
similarity index 76%
rename from src/installer/pkg/packaging/deb/dotnet-sharedframework-debian9_config.json
rename to src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_debian.9-x64.json
index b357bea..1d2ed25 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian9_config.json
+++ b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_debian.9-x64.json
@@ -2,18 +2,18 @@
     "maintainer_name":".NET Core Team",
     "maintainer_email": "dotnetpackages@dotnetfoundation.org",
 
-    "package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%",
+    "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%",
     "install_root": "/usr/share/dotnet",
 
-    "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
-    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
+    "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
+    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for Dotnet Core Runtime.",
     "homepage": "https://dot.net/core",
 
     "release":{
         "package_version":"1.0.0.0",
         "package_revision":"1",
         "urgency" : "low",
-        "changelog_message" : "Initial shared framework."
+        "changelog_message" : "Dotnet Runtime dependencies package"
     },
 
     "control": {
@@ -29,7 +29,15 @@
     },
 
     "debian_dependencies":{
-        "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : {},
+        "libc6":{},
+        "libcurl3":{},
+        "libgcc1":{},
+        "libgssapi-krb5-2":{},
+        "liblttng-ust0":{},
+        "libstdc++6":{},
+        "libunwind8":{},
+        "libuuid1":{},
+        "zlib1g":{},
         "libssl1.0.2" : {},
         "libicu57": {} 
     },

diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.14.04-x64.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.14.04-x64.json
new file mode 100644 (file)
index 0000000..dfd0433
--- /dev/null
+++ b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.14.04-x64.json
@@ -0,0 +1,49 @@
+{
+    "maintainer_name":".NET Core Team",
+    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
+
+    "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%",
+    "install_root": "/usr/share/dotnet",
+
+    "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
+    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for Dotnet Core Runtime.",
+    "homepage": "https://dot.net/core",
+
+    "release":{
+        "package_version":"1.0.0.0",
+        "package_revision":"1",
+        "urgency" : "low",
+        "changelog_message" : "Dotnet Runtime dependencies package"
+    },
+
+    "control": {
+        "priority":"standard",
+        "section":"libs",
+        "architecture":"amd64"
+    },
+
+    "copyright": "2017 Microsoft",
+    "license": {
+        "type": "MIT and ASL 2.0 and BSD",
+        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+    },
+
+    "debian_dependencies":{
+        "libc6":{},
+        "libcurl3":{},
+        "libgcc1":{},
+        "libgssapi-krb5-2":{},
+        "liblttng-ust0":{},
+        "libstdc++6":{},
+        "libunwind8":{},
+        "libuuid1":{},
+        "zlib1g":{},
+        "libssl1.0.0" : {},
+        "libicu52": {} 
+    },
+
+    "debian_ignored_dependencies" : [
+        "liblldb-3.5",
+        "liblldb-3.6"
+    ]
+}

diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.16.04-x64.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.16.04-x64.json
new file mode 100644 (file)
index 0000000..00f73d1
--- /dev/null
+++ b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.16.04-x64.json
@@ -0,0 +1,49 @@
+{
+    "maintainer_name":".NET Core Team",
+    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
+
+    "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%",
+    "install_root": "/usr/share/dotnet",
+
+    "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
+    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for Dotnet Core Runtime.",
+    "homepage": "https://dot.net/core",
+
+    "release":{
+        "package_version":"1.0.0.0",
+        "package_revision":"1",
+        "urgency" : "low",
+        "changelog_message" : "Dotnet Runtime dependencies package"
+    },
+
+    "control": {
+        "priority":"standard",
+        "section":"libs",
+        "architecture":"amd64"
+    },
+
+    "copyright": "2017 Microsoft",
+    "license": {
+        "type": "MIT and ASL 2.0 and BSD",
+        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+    },
+
+    "debian_dependencies":{
+        "libc6":{},
+        "libcurl3":{},
+        "libgcc1":{},
+        "libgssapi-krb5-2":{},
+        "liblttng-ust0":{},
+        "libstdc++6":{},
+        "libunwind8":{},
+        "libuuid1":{},
+        "zlib1g":{},
+        "libssl1.0.0" : {},
+        "libicu55": {} 
+    },
+
+    "debian_ignored_dependencies" : [
+        "liblldb-3.5",
+        "liblldb-3.6"
+    ]
+}

diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.17.04-x64.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.17.04-x64.json
new file mode 100644 (file)
index 0000000..0dd6800
--- /dev/null
+++ b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.17.04-x64.json
@@ -0,0 +1,49 @@
+{
+    "maintainer_name":".NET Core Team",
+    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
+
+    "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%",
+    "install_root": "/usr/share/dotnet",
+
+    "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
+    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for Dotnet Core Runtime.",
+    "homepage": "https://dot.net/core",
+
+    "release":{
+        "package_version":"1.0.0.0",
+        "package_revision":"1",
+        "urgency" : "low",
+        "changelog_message" : "Dotnet Runtime dependencies package"
+    },
+
+    "control": {
+        "priority":"standard",
+        "section":"libs",
+        "architecture":"amd64"
+    },
+
+    "copyright": "2017 Microsoft",
+    "license": {
+        "type": "MIT and ASL 2.0 and BSD",
+        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+    },
+
+    "debian_dependencies":{
+        "libc6":{},
+        "libcurl3":{},
+        "libgcc1":{},
+        "libgssapi-krb5-2":{},
+        "liblttng-ust0":{},
+        "libstdc++6":{},
+        "libunwind8":{},
+        "libuuid1":{},
+        "zlib1g":{},
+        "libssl1.0.0" : {},
+        "libicu57": {} 
+    },
+
+    "debian_ignored_dependencies" : [
+        "liblldb-3.5",
+        "liblldb-3.6"
+    ]
+}

diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.17.10-x64.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.17.10-x64.json
new file mode 100644 (file)
index 0000000..0dd6800
--- /dev/null
+++ b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_ubuntu.17.10-x64.json
@@ -0,0 +1,49 @@
+{
+    "maintainer_name":".NET Core Team",
+    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
+
+    "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%",
+    "install_root": "/usr/share/dotnet",
+
+    "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
+    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for Dotnet Core Runtime.",
+    "homepage": "https://dot.net/core",
+
+    "release":{
+        "package_version":"1.0.0.0",
+        "package_revision":"1",
+        "urgency" : "low",
+        "changelog_message" : "Dotnet Runtime dependencies package"
+    },
+
+    "control": {
+        "priority":"standard",
+        "section":"libs",
+        "architecture":"amd64"
+    },
+
+    "copyright": "2017 Microsoft",
+    "license": {
+        "type": "MIT and ASL 2.0 and BSD",
+        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+    },
+
+    "debian_dependencies":{
+        "libc6":{},
+        "libcurl3":{},
+        "libgcc1":{},
+        "libgssapi-krb5-2":{},
+        "liblttng-ust0":{},
+        "libstdc++6":{},
+        "libunwind8":{},
+        "libuuid1":{},
+        "zlib1g":{},
+        "libssl1.0.0" : {},
+        "libicu57": {} 
+    },
+
+    "debian_ignored_dependencies" : [
+        "liblldb-3.5",
+        "liblldb-3.6"
+    ]
+}

diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
index 6a714f4..22e0ec3 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
+++ b/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
@@ -29,13 +29,6 @@
     },
 
     "debian_dependencies":{
-        "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : {},
-        "libssl1.0.0" : {},
-        "%LIBICU_PACKAGE_NAME%": {}
-    },
-
-    "debian_ignored_dependencies" : [
-        "liblldb-3.5",
-        "liblldb-3.6"
-    ]
+        "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : {}
+    }
 }

diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
index fe3a65a..ca24265 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
+++ b/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
@@ -28,6 +28,12 @@
         "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
     },
 
+    "debian_dependencies":{
+        "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%" : {
+            "package_version": "%RUNTIME_DEPS_VERSION%"
+        } 
+     },
+
     "package_conflicts" : [
         "dotnet",
         "dotnet-nightly"

diff --git a/src/installer/pkg/packaging/deb/package.targets b/src/installer/pkg/packaging/deb/package.targets
index eaf25a8..15af8e8 100644 (file)
--- a/src/installer/pkg/packaging/deb/package.targets
+++ b/src/installer/pkg/packaging/deb/package.targets
@@ -9,6 +9,7 @@
                                     $(PackageTargetRid.StartsWith('debian'))">true</IsDebianBasedDistro>
     <BuildDebPackage Condition="'$(IsDebianBasedDistro)' == true and '$(TargetArchitecture)' == 'x64'">true</BuildDebPackage>
     <DebianConfigJsonName>debian_config.json</DebianConfigJsonName>
+    <BuildRuntimeDebs>true</BuildRuntimeDebs>
   </PropertyGroup>
 
   <Target Name="InitializeDotnetDebTool">
@@ -41,8 +42,12 @@
                             BuildDebs;"
           Condition="'$(BuildDebPackage)'=='true'" />
 
+  <Target Name="GenerateRuntimeDebs" 
+          DependsOnTargets="GenerateSharedHostDeb;GenerateHostFxrDeb;GenerateSharedFrameworkDeb"
+          Condition="''$(BuildRuntimeDebs)' == 'true'" />
+
   <Target Name="BuildDebs"
-          DependsOnTargets="InitializeDotnetDebTool;GenerateSharedHostDeb;GenerateHostFxrDeb;GenerateSharedFrameworkDeb;GenerateRuntimeDependenciesDeb"
+          DependsOnTargets="InitializeDotnetDebTool;GenerateRuntimeDebs;GenerateRuntimeDependenciesDeb"
           Condition="'$(BuildDebPackage)'=='true' and '$(DebuildPresent)' == 'true'" />
 
   <Target Name="GenerateSharedHostDeb">
@@ -90,6 +95,12 @@
       <SharedHostTokenValue Include="%SHARED_HOST_BRAND_NAME%">
         <ReplacementString>$(SharedHostBrandName)</ReplacementString>
       </SharedHostTokenValue>
+     <SharedHostTokenValue Include="%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%">
+        <ReplacementString>$(RuntimeDependenciesDebPkgName)</ReplacementString>
+      </SharedHostTokenValue>
+      <SharedHostTokenValue Include="%RUNTIME_DEPS_VERSION%">
+        <ReplacementString>$(RuntimeDepsDebVersion)</ReplacementString>
+      </SharedHostTokenValue>
     </ItemGroup>
 
     <ReplaceFileContents InputFile="$(ConfigJsonFile)"
@@ -191,7 +202,7 @@
 
   </Target>
 
-  <Target Name="GenerateSharedFrameworkDeb" DependsOnTargets="GetLibIcuPackageName">
+  <Target Name="GenerateSharedFrameworkDeb">
   
     <PropertyGroup>
       <DebPackageName>$(SharedFxDebPkgName)</DebPackageName>
@@ -199,7 +210,6 @@
       <InputRoot>$(SharedFrameworkPublishRoot)</InputRoot>
       <DebFile>$(SharedFrameworkInstallerFile)</DebFile>
       <ConfigJsonName>dotnet-sharedframework-debian_config.json</ConfigJsonName>
-      <ConfigJsonName  Condition="$(PackageTargetRid.StartsWith('debian.9'))">dotnet-sharedframework-debian9_config.json</ConfigJsonName>
       <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
       <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
     </PropertyGroup>
@@ -247,10 +257,6 @@
       <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_BRAND_NAME%">
         <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
       </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%LIBICU_PACKAGE_NAME%">
-        <ReplacementString>$(LibIcuPackageName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-
     </ItemGroup>
 
     <ReplaceFileContents InputFile="$(ConfigJsonFile)"
@@ -276,12 +282,12 @@
 
   </Target>
   
-  <Target Name="GenerateRuntimeDependenciesDeb" DependsOnTargets="GetLibIcuPackageName">
+  <Target Name="GenerateRuntimeDependenciesDeb">
     <PropertyGroup>
       <DebPackageName>$(RuntimeDependenciesDebPkgName)</DebPackageName>
       <DebPackageVersion>$(SharedFrameworkNugetVersion)</DebPackageVersion>
       <DebFile>$(DotnetRuntimeDependenciesPackageInstallerFile)</DebFile>
-      <ConfigJsonName>dotnet-runtime-deps-debian_config.json</ConfigJsonName>
+      <ConfigJsonName>dotnet-runtime-deps-debian_config_$(OutputRid).json</ConfigJsonName>
       <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
       <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
     </PropertyGroup>
@@ -294,15 +300,12 @@
       <debLayoutDocs>$(debLayoutDirectory)docs</debLayoutDocs>
     </PropertyGroup>
 
+    <!-- Error out if the configuration file doesn't exist -->
+    <Error Condition="!Exists('$(ConfigJsonFile)')" Text="Config file does not exist : '$(ConfigJsonFile)'" />
+
     <RemoveDir Condition="Exists('$(debIntermediatesDir)')" Directories="$(debIntermediatesDir)" />
     <MakeDir Directories="$(debIntermediatesDir)" />
 
-    <!-- Compute LIBSSL Version -->
-    <Exec Command="apt-cache search --names-only '^libssl[.0-9]+$' | cut -d' ' -f1" 
-          ConsoleToMSBuild="true"> 
-       <Output TaskParameter="ConsoleOutput" PropertyName="LibSSLPackageName" /> 
-    </Exec> 
-
     <!-- Create empty debian layout -->
     <RemoveDir Condition="Exists('$(debLayoutDirectory)')" Directories="$(debLayoutDirectory)" />
     <MakeDir Directories="$(debLayoutDirectory)" />
@@ -317,15 +320,8 @@
         <ReplacementString>$(RuntimeDependenciesDebPkgName)</ReplacementString>
       </SharedFrameworkTokenValue>
       <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_VERSION%">
-        <ReplacementString>$(SharedFrameworkNugetVersion)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%LIBSSL_PACKAGE_NAME%">
-        <ReplacementString>$(LibSSLPackageName)</ReplacementString>
+        <ReplacementString>$(RuntimeDepsDebVersion)</ReplacementString>
       </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%LIBICU_PACKAGE_NAME%"> 
-        <ReplacementString>$(LibIcuPackageName)</ReplacementString> 
-      </SharedFrameworkTokenValue> 
-
     </ItemGroup>
 
     <ReplaceFileContents InputFile="$(ConfigJsonFile)"
@@ -370,11 +366,4 @@
              Importance="High" />
   </Target>
 
-  <!-- Compute LibIcu Package Name -->
-  <Target Name="GetLibIcuPackageName">
-    <Exec Command="apt-cache search --names-only '^libicu[0-9]+$' | cut -d' ' -f1" 
-          ConsoleToMSBuild="true"> 
-       <Output TaskParameter="ConsoleOutput" PropertyName="LibIcuPackageName" /> 
-    </Exec>
-  </Target>
 </Project>
\ No newline at end of file

diff --git a/tools-local/setuptools/dotnet-deb-tool/dotnet-deb-tool.csproj b/tools-local/setuptools/dotnet-deb-tool/dotnet-deb-tool.csproj
index e3f79e5..dc3f17d 100644 (file)
--- a/tools-local/setuptools/dotnet-deb-tool/dotnet-deb-tool.csproj
+++ b/tools-local/setuptools/dotnet-deb-tool/dotnet-deb-tool.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>2.1.0</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>dotnet-deb-tool</AssemblyName>
     <OutputType>Exe</OutputType>

diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/templates/debian/control b/tools-local/setuptools/dotnet-deb-tool/tool/templates/debian/control
index 49fb2b9..e6e3358 100644 (file)
--- a/tools-local/setuptools/dotnet-deb-tool/tool/templates/debian/control
+++ b/tools-local/setuptools/dotnet-deb-tool/tool/templates/debian/control
@@ -13,7 +13,7 @@ Homepage: {HOMEPAGE}
 
 Package: {PACKAGE_NAME}
 Architecture: {ARCH}
-Depends: ${{shlibs:Depends}}, ${{misc:Depends}}{DEPENDENT_PACKAGES}
+Depends: {DEPENDENT_PACKAGES}
 Conflicts: {CONFLICT_PACKAGES}
 Description: {SHORT_DESCRIPTION}
  {LONG_DESCRIPTION}