Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy logo into output folder on build, fix broken tests

This commit is contained in:
Mark McDowall 2014-08-09 01:51:19 -07:00
parent ca09588390
commit dd15442dcd
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.ps1
View File

@ -161,7 +161,7 @@ Function PackageTests()
Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force
Copy-Item $outputFolder\*.pdb -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} 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)" Write-Host "Adding MediaInfoDotNet.dll.config (for dllmap)"
Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" -Destination $testPackageFolder -Force Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" -Destination $testPackageFolder -Force
Copy-Item "$outputFolder\64.png" -Destination $testPackageFolder -Force
Write-Host "##teamcity[progressFinish 'Creating Test Package']" Write-Host "##teamcity[progressFinish 'Creating Test Package']"
} }

3
src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
View File

@ -72,8 +72,7 @@ namespace NzbDrone.Core.Notifications.Growl
_logger = logger; _logger = logger;
_notificationTypes = GetNotificationTypes(); _notificationTypes = GetNotificationTypes();
var iconPath = Path.Combine("UI", "Content", "Images", "logos", "64.png"); var bytes = File.ReadAllBytes("64.png");
var bytes = File.ReadAllBytes(iconPath);
_growlApplication.Icon = new BinaryData(bytes); _growlApplication.Icon = new BinaryData(bytes);
} }

3
src/NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -794,6 +794,9 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="64.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="MediaInfo.dll"> <Content Include="MediaInfo.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>