Removed hardcoded paths to MsDeploy and SqlCmd tools like MsDeploy; Removed harcoded path referencing the previous WebsitePanel build location;

This commit is contained in:
ptsurbeleu 2012-04-26 00:34:53 -07:00
parent b51da7e955
commit 596f40c18d

View file

@ -1,5 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="C:\Program Files (x86)\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/> <Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
<PropertyGroup> <PropertyGroup>
<Version>1.2.1.0</Version> <Version>1.2.1.0</Version>
<FileVersion>1.2.1.6</FileVersion> <FileVersion>1.2.1.6</FileVersion>
@ -15,12 +15,13 @@
<BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder> <BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder>
<DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder> <DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder>
<PreviousBuildFolder>C:\Projects\WebsitePanel-1.2.0-distr\$(BuildConfiguration)</PreviousBuildFolder> <PreviousBuildFolder>$(RootFolder)\..\prev\$(BuildConfiguration)</PreviousBuildFolder>
<DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd> <DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd>
<SqlCmd>"C:\Program Files\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd> <SqlCmd>"$(ProgramFiles)\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
<MSDeployPath>"C:\Program Files\IIS\Microsoft Web Deploy V2\msdeploy.exe"</MSDeployPath> <MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe"</MSDeployPath>
<MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy V2\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy V2\msdeploy.exe"</MSDeployPath>
<DataBaseName>WebsitePanel_build</DataBaseName> <DataBaseName>WebsitePanel_build</DataBaseName>
<MSDeployConnectionString>server=(local)\SQLEXPRESS;database=$(DataBaseName);Integrated Security=true;</MSDeployConnectionString> <MSDeployConnectionString>server=(local)\SQLEXPRESS;database=$(DataBaseName);Integrated Security=true;</MSDeployConnectionString>
@ -42,9 +43,9 @@
</PropertyGroup> </PropertyGroup>
<Target Name="GenerateBuildVersionFiles"> <Target Name="GenerateBuildVersionFiles">
<AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2011 Outercurve Foundation." <AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" /> AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
<AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2011 Outercurve Foundation." <AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" /> AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
</Target> </Target>
@ -316,8 +317,8 @@
<PropertyGroup> <PropertyGroup>
<DatabaseFolder>$(DeployFolder)\Database</DatabaseFolder> <DatabaseFolder>$(DeployFolder)\Database</DatabaseFolder>
</PropertyGroup> </PropertyGroup>
<Target Name="CreateEnterpriseServerDatabase" DependsOnTargets="CreatePortalUpdate"> <Target Name="CreateEnterpriseServerDatabase" DependsOnTargets="CreatePortalUpdate">
<MakeDir Directories="$(DatabaseFolder)"/> <MakeDir Directories="$(DatabaseFolder)"/>
<Exec Command="$(SqlCmd) -Q &quot;IF DB_ID (N'$(DataBaseName)') IS NOT NULL DROP DATABASE $(DataBaseName)&quot;" /> <Exec Command="$(SqlCmd) -Q &quot;IF DB_ID (N'$(DataBaseName)') IS NOT NULL DROP DATABASE $(DataBaseName)&quot;" />