From 74644828b940874564a0a72a62e64d448ffb5105 Mon Sep 17 00:00:00 2001
From: Rakesh Singh <raksingh@microsoft.com>
Date: Tue, 3 Apr 2018 19:33:17 -0700
Subject: [PATCH]  Fix Linux Mint package name (dotnet/core-setup#3978)

Commit migrated from https://github.com/dotnet/core-setup/commit/1b1a652c1577cb4dfd1c6f7cef15538725995bd6
---
 src/installer/buildpipeline/Core-Setup-Linux-BT.json     | 16 ++++++++--------
 ...net-runtime-deps-debian_config_linuxmint.17-x64.json} |  0
 ...net-runtime-deps-debian_config_linuxmint.18-x64.json} |  0
 src/installer/publish/dir.props                          |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename src/installer/pkg/packaging/deb/{dotnet-runtime-deps-debian_config_linuxmint.7-x64.json => dotnet-runtime-deps-debian_config_linuxmint.17-x64.json} (100%)
 rename src/installer/pkg/packaging/deb/{dotnet-runtime-deps-debian_config_linuxmint.8-x64.json => dotnet-runtime-deps-debian_config_linuxmint.18-x64.json} (100%)

diff --git a/src/installer/buildpipeline/Core-Setup-Linux-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
index f9e1f29..43c7b7f 100644
--- a/src/installer/buildpipeline/Core-Setup-Linux-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
@@ -389,7 +389,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Package Runtime Dep - LinuxMint 7",
+      "displayName": "Package Runtime Dep - LinuxMint 17",
       "timeoutInMinutes": 0,
       "task": {
         "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -398,7 +398,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=linuxmint.7-$(PB_TargetArchitecture)",
+        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=linuxmint.17-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -408,7 +408,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish Runtime Dep - LinuxMint 7",
+      "displayName": "Publish Runtime Dep - LinuxMint 17",
       "timeoutInMinutes": 0,
       "task": {
         "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -417,7 +417,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "$(CommonDockerCommandToPublishRuntimeDepDebPackage) /p:OutputRid=linuxmint.7-$(PB_TargetArchitecture)",
+        "arguments": "$(CommonDockerCommandToPublishRuntimeDepDebPackage) /p:OutputRid=linuxmint.17-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -427,7 +427,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Package Runtime Dep - LinuxMint 8",
+      "displayName": "Package Runtime Dep - LinuxMint 18",
       "timeoutInMinutes": 0,
       "task": {
         "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -436,7 +436,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=linuxmint.8-$(PB_TargetArchitecture)",
+        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=linuxmint.18-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -446,7 +446,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Publish Runtime Dep - LinuxMint 8",
+      "displayName": "Publish Runtime Dep - LinuxMint 18",
       "timeoutInMinutes": 0,
       "task": {
         "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -455,7 +455,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "$(CommonDockerCommandToPublishRuntimeDepDebPackage) /p:OutputRid=linuxmint.8-$(PB_TargetArchitecture)",
+        "arguments": "$(CommonDockerCommandToPublishRuntimeDepDebPackage) /p:OutputRid=linuxmint.18-$(PB_TargetArchitecture)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.7-x64.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.17-x64.json
similarity index 100%
rename from src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.7-x64.json
rename to src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.17-x64.json
diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.8-x64.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.18-x64.json
similarity index 100%
rename from src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.8-x64.json
rename to src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config_linuxmint.18-x64.json
diff --git a/src/installer/publish/dir.props b/src/installer/publish/dir.props
index 7e1d155..b58fa16 100644
--- a/src/installer/publish/dir.props
+++ b/src/installer/publish/dir.props
@@ -47,8 +47,8 @@
     <PublishRid Include="ubuntu.18.04-x64" />
     <PublishRid Include="debian.8-x64" />
     <PublishRid Include="debian.9-x64" />
-    <PublishRid Include="linuxmint.7-x64" />
-    <PublishRid Include="linuxmint.8-x64" />
+    <PublishRid Include="linuxmint.17-x64" />
+    <PublishRid Include="linuxmint.18-x64" />
     <PublishRid Include="linux-x64" />
     <PublishRid Include="win-x86" />
     <PublishRid Include="win-x64" />
-- 
2.7.4