From 860b88a6432ca7413ccdbb32b7da23e69ffa2fb7 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 20 Jun 2013 10:24:05 +0300
Subject: [PATCH] Deploy-Relese issue fixing

---
 .../Sources/Setup.SchedulerService/Config.wxi                 | 1 +
 .../Sources/Setup.SchedulerService/Product.wxs                | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WebsitePanel.Installer/Sources/Setup.SchedulerService/Config.wxi b/WebsitePanel.Installer/Sources/Setup.SchedulerService/Config.wxi
index 4ca6a21c..8265cb6f 100644
--- a/WebsitePanel.Installer/Sources/Setup.SchedulerService/Config.wxi
+++ b/WebsitePanel.Installer/Sources/Setup.SchedulerService/Config.wxi
@@ -2,4 +2,5 @@
 <Include>
   <?define PROJECTPATH = "..\..\..\WebsitePanel"?>
   <?define BUILDPATH = "$(var.PROJECTPATH)\Build\$(var.BUILD)\SchedulerService\bin"?>
+  <?define SERVERBUILDPATH = "$(var.PROJECTPATH)\Build\$(var.BUILD)\Server\bin"?>
 </Include>
diff --git a/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs b/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs
index 6e6dee04..f66dd59c 100644
--- a/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs
+++ b/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs
@@ -117,8 +117,8 @@
             <Component Id="ProductFiles" Guid="A89FA6CF-53E2-4390-9E9D-11CD4297D739">
                 <File Id="WebsitePanel.SchedulerService.exe" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe" />
                 <File Id="WebsitePanel.SchedulerService.exe.config" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe.config" />
-              <File Id="Ionic.Zip.Reduced.dll" Source="$(var.BUILDPATH)\Ionic.Zip.Reduced.dll"/>
-              <File Id="Microsoft.Web.Services3.dll" Source="$(var.BUILDPATH)\Microsoft.Web.Services3.dll"/>
+              <File Id="Ionic.Zip.Reduced.dll" Source="$(var.SERVERBUILDPATH)\Ionic.Zip.Reduced.dll"/>
+              <File Id="Microsoft.Web.Services3.dll" Source="$(var.SERVERBUILDPATH)\Microsoft.Web.Services3.dll"/>
               <File Id="WebsitePanel.Common.Utils.dll" Source="$(var.BUILDPATH)\WebsitePanel.Common.Utils.dll"/>
               <File Id="WebsitePanel.EnterpriseServer.Base.dll" Source="$(var.BUILDPATH)\WebsitePanel.EnterpriseServer.Base.dll"/>
               <File Id="WebsitePanel.EnterpriseServer.Code.dll" Source="$(var.BUILDPATH)\WebsitePanel.EnterpriseServer.Code.dll"/>