From 622d2d90aade5301dbfc87d78aa19773d0a94343 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 10 Sep 2012 17:06:03 -0400
Subject: [PATCH] Merge

---
 WebsitePanel/build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index 05fa3ad7..27ebfc22 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -10,7 +10,6 @@
 		<RootFolder>..</RootFolder>
 		<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
 
-
 		<SetupTrunkFolder>$(RootFolder)\WebsitePanel.Installer</SetupTrunkFolder>
 		<SetupBuildFolder>$(SetupTrunkFolder)\Build\$(BuildConfiguration)</SetupBuildFolder>
 
@@ -56,11 +55,11 @@
 
 	</PropertyGroup>
 
-	<Target Name="GenerateBuildVersionFilesInstaller" Inputs="build.xml" Outputs="$(RootFolder)\WebsitePanel.Installer\Sources\VersionInfo.cs">
+	<Target Name="GenerateBuildVersionFilesInstaller">
 		<AssemblyInfo CodeLanguage="CS" OutputFile="$(RootFolder)\WebsitePanel.Installer\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(VersionLabel)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(Version)" />
 	</Target>
 
-	<Target Name="GenerateBuildVersionFiles" Inputs="build.xml" Outputs="$(TrunkFolder)\Sources\VersionInfo.cs;$(TrunkFolder)\Sources\VersionInfo.vb" DependsOnTargets="GenerateBuildVersionFilesInstaller">
+	<Target Name="GenerateBuildVersionFiles" DependsOnTargets="GenerateBuildVersionFilesInstaller">
 		<AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(VersionLabel)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(Version)" />
 		<AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(VersionLabel)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(Version)" />
 	</Target>