From dd15442dcd3fdd4efa4af85b84dbcf081c84b808 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 9 Aug 2014 01:51:19 -0700 Subject: [PATCH] Copy logo into output folder on build, fix broken tests --- build.ps1 | 4 +++- src/NzbDrone.Core/Notifications/Growl/GrowlService.cs | 3 +-- src/NzbDrone.Core/NzbDrone.Core.csproj | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.ps1 b/build.ps1 index 0a20c3af3..073ab6516 100644 --- a/build.ps1 +++ b/build.ps1 @@ -161,7 +161,7 @@ Function PackageTests() Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force - Copy-Item .\*.sh -Destination $testPackageFolder -Force + Copy-Item .\*.sh -Destination $testPackageFolder -Force get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname} @@ -170,6 +170,8 @@ Function PackageTests() Write-Host "Adding MediaInfoDotNet.dll.config (for dllmap)" Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" -Destination $testPackageFolder -Force + Copy-Item "$outputFolder\64.png" -Destination $testPackageFolder -Force + Write-Host "##teamcity[progressFinish 'Creating Test Package']" } diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index c7c943c5b..32c81e9c7 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -72,8 +72,7 @@ public GrowlService(Logger logger) _logger = logger; _notificationTypes = GetNotificationTypes(); - var iconPath = Path.Combine("UI", "Content", "Images", "logos", "64.png"); - var bytes = File.ReadAllBytes(iconPath); + var bytes = File.ReadAllBytes("64.png"); _growlApplication.Icon = new BinaryData(bytes); } diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 8dbf6f83e..2f2700b26 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -794,6 +794,9 @@ + + Always + Always