From b32af4041486543b5d76f5a4847549442fc59fd5 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 13 Aug 2012 10:52:40 -0400
Subject: [PATCH] Update Build.xml for further better versioning control

---
 .../WebsitePanel.Installer/Updater.exe        | Bin 198144 -> 198144 bytes
 WebsitePanel/Sources/VersionInfo.cs           |   4 +--
 WebsitePanel/Sources/VersionInfo.vb           |   4 +--
 WebsitePanel/build.xml                        |  29 +++++++++---------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index 6f9b58256d1f92509b786b7d4af5df7dace849e0..5f31da641b1d217842e8126ebd498c61686a5818 100644
GIT binary patch
delta 44
zcmZqZ;c4jMnb5(MbGEUowTp3U7t^5vfmbJGR5ca{`YcWQ=;?FyjQ{qSLZ&5C0IbFn
Axc~qF

delta 44
zcmZqZ;c4jMnb5(s&#$qowTp3U7t^5v0b?my{U6z7E)BskXL{@f9&C>(WLh!>0FB5J
A9{>OV

diff --git a/WebsitePanel/Sources/VersionInfo.cs b/WebsitePanel/Sources/VersionInfo.cs
index 5a84a297..56a3acb5 100644
--- a/WebsitePanel/Sources/VersionInfo.cs
+++ b/WebsitePanel/Sources/VersionInfo.cs
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyCompany("Outercurve Foundation")]
 [assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
-[assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
 [assembly: AssemblyInformationalVersion("1.2.2")]
 
 
diff --git a/WebsitePanel/Sources/VersionInfo.vb b/WebsitePanel/Sources/VersionInfo.vb
index 10e75385..4c8abfdc 100644
--- a/WebsitePanel/Sources/VersionInfo.vb
+++ b/WebsitePanel/Sources/VersionInfo.vb
@@ -18,7 +18,7 @@ Imports System.Runtime.CompilerServices
 Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Outercurve Foundation"),  _
  Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."),  _
- Assembly: AssemblyVersion("1.2.2.0"),  _
- Assembly: AssemblyFileVersion("1.2.2.1"),  _
+ Assembly: AssemblyVersion("1.2.2"),  _
+ Assembly: AssemblyFileVersion("1.2.2"),  _
  Assembly: AssemblyInformationalVersion("1.2.2")> 
 
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index 2b4a60a2..280633bf 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -1,10 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
 	<PropertyGroup>
-		<Version>1.2.2.0</Version>
-		<FileVersion>1.2.2.1</FileVersion>
+		<Version>1.2.2</Version>
+		<FileVersion>1.2.2</FileVersion>
 		<VersionLabel>1.2.2</VersionLabel>
-		<ReleaseDate>2012-08-01</ReleaseDate>
+		<ReleaseDate>2012-08-13</ReleaseDate>
 		<BuildConfiguration>Release</BuildConfiguration>
 		<RootFolder>..</RootFolder>
 		<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
@@ -190,6 +190,7 @@
 			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" />
 			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" />
 			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cache" />
+			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\microsoft.*" />
 			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\app.config" />
 			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.txt" />
 			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
@@ -444,10 +445,10 @@
 			<StandaloneInstallFiles Include="$(StandaloneInstall)\**\*.*" />
 		</ItemGroup>
 
-		<Zip Files="@(PortalInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Portal-$(FileVersion).zip" WorkingDirectory="$(PortalInstall)" />
-		<Zip Files="@(EnterpriseServerInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(FileVersion).zip" WorkingDirectory="$(EnterpriseServerInstall)" />
-		<Zip Files="@(ServerInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Server-$(FileVersion).zip" WorkingDirectory="$(ServerInstall)" />
-		<Zip Files="@(StandaloneInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(FileVersion).zip" WorkingDirectory="$(StandaloneInstall)" />
+		<Zip Files="@(PortalInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" WorkingDirectory="$(PortalInstall)" />
+		<Zip Files="@(EnterpriseServerInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" WorkingDirectory="$(EnterpriseServerInstall)" />
+		<Zip Files="@(ServerInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Server-$(Version).zip" WorkingDirectory="$(ServerInstall)" />
+		<Zip Files="@(StandaloneInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" WorkingDirectory="$(StandaloneInstall)" />
 
 
 		<!-- zip updates -->
@@ -457,15 +458,15 @@
 			<ServerUpdateFiles Include="$(ServerUpdate)\**\*.*" />
 		</ItemGroup>
 
-		<Zip Files="@(PortalUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Portal-$(FileVersion)-Update.zip" WorkingDirectory="$(PortalUpdate)" />
-		<Zip Files="@(EnterpriseServerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(FileVersion)-Update.zip" WorkingDirectory="$(EnterpriseServerUpdate)" />
-		<Zip Files="@(ServerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Server-$(FileVersion)-Update.zip" WorkingDirectory="$(ServerUpdate)" />
+		<Zip Files="@(PortalUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip" WorkingDirectory="$(PortalUpdate)" />
+		<Zip Files="@(EnterpriseServerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip" WorkingDirectory="$(EnterpriseServerUpdate)" />
+		<Zip Files="@(ServerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" WorkingDirectory="$(ServerUpdate)" />
 
 		<!-- zip tools -->
-		<Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(FileVersion).zip" WorkingDirectory="$(ImportCsvInstall)" />
-		<Zip Files="@(ImportEnterpriseInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(FileVersion).zip" WorkingDirectory="$(ImportEnterpriseInstall)" />
-		<Zip Files="@(AWStatsViewerInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(FileVersion).zip" WorkingDirectory="$(AWStatsViewerInstall)" />
-		<Zip Files="@(WSPTransportAgentInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(FileVersion).zip" WorkingDirectory="$(WSPTransportAgentInstall)" />
+		<Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" WorkingDirectory="$(ImportCsvInstall)" />
+		<Zip Files="@(ImportEnterpriseInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" WorkingDirectory="$(ImportEnterpriseInstall)" />
+		<Zip Files="@(AWStatsViewerInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip" WorkingDirectory="$(AWStatsViewerInstall)" />
+		<Zip Files="@(WSPTransportAgentInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" WorkingDirectory="$(WSPTransportAgentInstall)" />
   </Target>
 
 </Project>