From 8bea6108653dd0c642d4412316e0bf550a31412e Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <tylerl0706@gmail.com>
Date: Tue, 21 Jul 2020 07:53:51 -0700
Subject: [PATCH] Remove rcedit dependency, move daily ico dependency to props
 file (#13123)

---
 PowerShell.Common.props      |  3 ++-
 tools/install-powershell.ps1 | 13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 520dc62229..8b7a050e3d 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -63,7 +63,8 @@
       <PackageVersion>$(PSCoreBuildVersion)</PackageVersion>
 
       <ApplicationIcon Condition="$(ProductVersion.Contains('preview'))">..\..\assets\Powershell_av_colors.ico</ApplicationIcon>
-      <ApplicationIcon Condition="!$(ProductVersion.Contains('preview'))">..\..\assets\Powershell_black.ico</ApplicationIcon>
+      <ApplicationIcon Condition="$(ProductVersion.Contains('daily'))">..\..\assets\Powershell_avatar.ico</ApplicationIcon>
+      <ApplicationIcon Condition="!$(ProductVersion.Contains('preview')) And !$(ProductVersion.Contains('daily'))">..\..\assets\Powershell_black.ico</ApplicationIcon>
 
     </PropertyGroup>
 
diff --git a/tools/install-powershell.ps1 b/tools/install-powershell.ps1
index 6347982227..58b6c72294 100644
--- a/tools/install-powershell.ps1
+++ b/tools/install-powershell.ps1
@@ -429,19 +429,6 @@ try {
         }
     }
 
-    # Edit icon to disambiguate daily builds.
-    if ($IsWinEnv -and $Daily.IsPresent) {
-        if (-not (Test-Path "~/.rcedit/rcedit-x64.exe")) {
-            Write-Verbose "Install RCEdit for modifying exe resources" -Verbose
-            $rceditUrl = "https://github.com/electron/rcedit/releases/download/v1.0.0/rcedit-x64.exe"
-            $null = New-Item -Path "~/.rcedit" -Type Directory -Force -ErrorAction SilentlyContinue
-            Invoke-WebRequest -OutFile "~/.rcedit/rcedit-x64.exe" -Uri $rceditUrl
-        }
-
-        Write-Verbose "Change icon to disambiguate it from a released installation" -Verbose
-        & "~/.rcedit/rcedit-x64.exe" "$Destination\pwsh.exe" --set-icon "$Destination\assets\Powershell_avatar.ico"
-    }
-
     ## Change the mode of 'pwsh' to 'rwxr-xr-x' to allow execution
     if (-not $IsWinEnv) { chmod 755 $Destination/pwsh }