From f513e006a60ee629799444822c1c1f5223d95e03 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 5 Nov 2020 17:41:40 -0500
Subject: [PATCH 1/2] added ubuntu20.04 to list of deb distributions and add
 the ssl and icu info

---
 tools/packaging/packaging.psm1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 664f5455553..63beec30952 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -6,7 +6,7 @@ $RepoRoot = (Resolve-Path -Path "$PSScriptRoot/../..").Path
 
 $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.psd1"
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
-$DebianDistributions = @("ubuntu.16.04", "ubuntu.18.04", "debian.9", "debian.10", "debian.11")
+$DebianDistributions = @("ubuntu.16.04", "ubuntu.18.04", "ubuntu.20.04", "debian.9", "debian.10", "debian.11")
 $RedhatDistributions = @("rhel.7","centos.8")
 $script:netCoreRuntime = 'net5.0'
 $script:iconFileName = "Powershell_black_64.png"
@@ -1274,6 +1274,7 @@ function Get-PackageDependencies
             switch -regex ($Distribution) {
                 "ubuntu\.16\.04" { $Dependencies += @("libssl1.0.0", "libicu55") }
                 "ubuntu\.18\.04" { $Dependencies += @("libssl1.0.0", "libicu60") }
+                "ubuntu\.20\.04" { $Dependencies += @("libssl1.1", "libicu66") }
                 "debian\.9" { $Dependencies += @("libssl1.0.2", "libicu57") }
                 "debian\.(10|11)" { $Dependencies += @("libssl1.1", "libicu63") }
                 default { throw "Debian distro '$Distribution' is not supported." }

From 738a9304b94bf1ad84eb3a620246100cee1747b7 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 5 Nov 2020 17:44:39 -0500
Subject: [PATCH 2/2] added check to validate ubuntu20.04 platform

---
 build.psm1                     | 1 +
 tools/packaging/packaging.psm1 | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/build.psm1 b/build.psm1
index 9f5f5fe7c4e..5e079e4fa2d 100644
--- a/build.psm1
+++ b/build.psm1
@@ -156,6 +156,7 @@ function Get-EnvironmentInformation
         $environment += @{'IsUbuntu' = $LinuxInfo.ID -match 'ubuntu' -or $LinuxID -match 'Ubuntu'}
         $environment += @{'IsUbuntu16' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'}
         $environment += @{'IsUbuntu18' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '18.04'}
+        $environment += @{'IsUbuntu20' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '20.04'}
         $environment += @{'IsCentOS' = $LinuxInfo.ID -match 'centos' -and $LinuxInfo.VERSION_ID -match '7'}
         $environment += @{'IsFedora' = $LinuxInfo.ID -match 'fedora' -and $LinuxInfo.VERSION_ID -ge 24}
         $environment += @{'IsOpenSUSE' = $LinuxInfo.ID -match 'opensuse'}
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 63beec30952..4a1ecd52854 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -780,6 +780,8 @@ function New-UnixPackage {
                     $DebDistro = "ubuntu.16.04"
                 } elseif ($Environment.IsUbuntu18) {
                     $DebDistro = "ubuntu.18.04"
+                } elseif ($Environment.IsUbuntu20) {
+                    $DebDistro = "ubuntu.20.04"
                 } elseif ($Environment.IsDebian9) {
                     $DebDistro = "debian.9"
                 } else {