From d69255af16cff8227af990c38922a59d301cb819 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 13 Aug 2012 18:46:07 -0400
Subject: [PATCH] Update Build batch files to support new build.xml format Add
 rest of FTP Uploading commands to Build.xml

---
 .../WebsitePanel.Installer/Updater.exe        | Bin 198144 -> 198144 bytes
 WebsitePanel/build-debug.bat                  |   2 +-
 WebsitePanel/build-release.bat                |   2 +-
 WebsitePanel/build.xml                        |  13 +++++++++++--
 WebsitePanel/deploy-debug.bat                 |   2 +-
 WebsitePanel/deploy-release.bat               |   2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index c93427211164e76b972800b38793eebc138ea9d8..cf5936bc47d96567aa1e4539aa00efcac2560369 100644
GIT binary patch
delta 45
zcmZqZ;c4jMnb5(kXRX=T-P+B#wVUZ+fq;S0{md1Kz0T9MmR>ZP%c-+HrjTjL6abFa
B5&8fC

delta 45
zcmV+|0Mh?}j0}K`43LNexz;Fwi-n5;wTlA5a1h$m$J~D-&P}Bzh)}I`TUfVTaRQ{2
D*l-l)

diff --git a/WebsitePanel/build-debug.bat b/WebsitePanel/build-debug.bat
index cc6e25f7..4e38c74d 100644
--- a/WebsitePanel/build-debug.bat
+++ b/WebsitePanel/build-debug.bat
@@ -1 +1 @@
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /property:BuildConfiguration=Debug /v:n /fileLogger /m
\ No newline at end of file
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /p:BuildConfiguration=Debug /p:Version="1.2.2" /p:FileVersion="1.2.2.1" /p:VersionLabel="1.2.2.1" /v:n /fileLogger /m
\ No newline at end of file
diff --git a/WebsitePanel/build-release.bat b/WebsitePanel/build-release.bat
index 4c1a2418..61344540 100644
--- a/WebsitePanel/build-release.bat
+++ b/WebsitePanel/build-release.bat
@@ -1 +1 @@
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /property:BuildConfiguration=Release /v:n /fileLogger /m
\ No newline at end of file
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /p:BuildConfiguration=Release /p:Version="1.2.2" /p:FileVersion="1.2.2.1" /p:VersionLabel="1.2.2.1" /v:n /fileLogger /m
\ No newline at end of file
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index c64d7628..d183ca84 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -5,7 +5,7 @@
 		<FileVersion></FileVersion>
 		<VersionLabel></VersionLabel>
 		<ReleaseDate>2012-08-13</ReleaseDate>
-		<BuildConfiguration>Release</BuildConfiguration>
+		<BuildConfiguration></BuildConfiguration>
 		<RootFolder>..</RootFolder>
 		<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
 
@@ -476,7 +476,16 @@
   </Target>
 
 	<Target Name="uploadtoftp">
-
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" RemoteFiles="WebsitePanel-Portal-$(Version).zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" RemoteFiles="WebsitePanel-EnterpriseServer-$(Version).zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Server-$(Version).zip" RemoteFiles="WebsitePanel-Server-$(Version).zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" RemoteFiles="WebsitePanel-StandaloneServerSetup-$(Version).zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Portal-$(Version)-Update.zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip" RemoteFiles="WebsitePanel-EnterpriseServer-$(Version)-Update.zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Server-$(Version)-Update.zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" RemoteFiles="WebsitePanel-Import-CsvBulk-$(Version).zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" RemoteFiles="WebsitePanel-Import-Enterprise-$(Version).zip" />
+	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip" RemoteFiles="WebsitePanel-AWStatsViewer-$(Version).zip" />
 	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" />
 
 	</Target>
diff --git a/WebsitePanel/deploy-debug.bat b/WebsitePanel/deploy-debug.bat
index 35fd6db8..fb7ac0fa 100644
--- a/WebsitePanel/deploy-debug.bat
+++ b/WebsitePanel/deploy-debug.bat
@@ -1 +1 @@
-%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger /m
+%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Debug /p:Version="1.2.2" /p:FileVersion="1.2.2.1" /p:VersionLabel="1.2.2.1" /v:n /fileLogger /m
diff --git a/WebsitePanel/deploy-release.bat b/WebsitePanel/deploy-release.bat
index 26d713ca..6ad1a89e 100644
--- a/WebsitePanel/deploy-release.bat
+++ b/WebsitePanel/deploy-release.bat
@@ -1 +1 @@
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Release /v:n /fileLogger /m
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Release /p:Version="1.2.2" /p:FileVersion="1.2.2.1" /p:VersionLabel="1.2.2.1" /v:n /fileLogger /m