commit merge
This commit is contained in:
robvde
commit
71875ca55f
1 changed files with 61 additions and 99 deletions
|
|
@ -31,7 +31,9 @@
|
|||
<ServerSrc>$(TrunkFolder)\Sources\WebsitePanel.Server</ServerSrc>
|
||||
<EnterpriseServerSrc>$(TrunkFolder)\Sources\WebsitePanel.EnterpriseServer</EnterpriseServerSrc>
|
||||
<ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc>
|
||||
<ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc>
|
||||
<HyperVUtilsSrc>$(RootFolder)\WebsitePanel.HyperV.Utils\Sources\WebsitePanel.HyperV.Utils\bin\$(BuildConfiguration)</HyperVUtilsSrc>
|
||||
<VMConfigSrc>$(RootFolder)\WebsitePanel.VmConfig\Sources\WebsitePanel.VmConfig\bin\$(BuildConfiguration)</VMConfigSrc>
|
||||
<ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc>
|
||||
<AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc>
|
||||
<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
|
||||
|
||||
|
|
@ -39,7 +41,9 @@
|
|||
<EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild>
|
||||
<PortalBuild>$(BuildFolder)\Portal</PortalBuild>
|
||||
<ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild>
|
||||
<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
|
||||
<HyperVUtilsBuild>$(BuildFolder)\HyperVUtils</HyperVUtilsBuild>
|
||||
<VMConfigBuild>$(BuildFolder)\VMConfig</VMConfigBuild>
|
||||
<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
|
||||
<AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild>
|
||||
<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
|
||||
<LocalizationToolkitBuild>$(BuildFolder)\LocalizationToolkit</LocalizationToolkitBuild>
|
||||
|
|
@ -71,6 +75,8 @@
|
|||
|
||||
<!-- Tools -->
|
||||
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk.sln" Properties="Configuration=$(BuildConfiguration)" />
|
||||
<MSBuild Projects="$(RootFolder)\WebsitePanel.HyperV.Utils\Sources\WebsitePanel.HyperV.Utils.sln" Properties="Configuration=$(BuildConfiguration)" />
|
||||
<MSBuild Projects="$(RootFolder)\WebsitePanel.VmConfig\Sources\WebsitePanel.VmConfig.sln" Properties="Configuration=$(BuildConfiguration)" />
|
||||
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise.sln" Properties="Configuration=$(BuildConfiguration)" />
|
||||
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer.sln" Properties="Configuration=$(BuildConfiguration)" />
|
||||
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WSPTransportAgent.sln" Properties="Configuration=$(BuildConfiguration)" />
|
||||
|
|
@ -83,6 +89,8 @@
|
|||
<RemoveDir Directories="$(PortalBuild)"/>
|
||||
<RemoveDir Directories="$(ImportCsvBuild)"/>
|
||||
<RemoveDir Directories="$(ImportEnterpriseBuild)"/>
|
||||
<RemoveDir Directories="$(VMConfigBuild)"/>
|
||||
<RemoveDir Directories="$(HyperVUtilsBuild)"/>
|
||||
<RemoveDir Directories="$(AWStatsViewerBuild)"/>
|
||||
<RemoveDir Directories="$(WSPTransportAgentBuild)"/>
|
||||
<RemoveDir Directories="$(LocalizationToolkitBuild)"/>
|
||||
|
|
@ -93,6 +101,8 @@
|
|||
<MakeDir Directories="$(ServerBuild)"/>
|
||||
<MakeDir Directories="$(EnterpriseServerBuild)"/>
|
||||
<MakeDir Directories="$(PortalBuild)"/>
|
||||
<MakeDir Directories="$(HyperVUtilsBuild)"/>
|
||||
<MakeDir Directories="$(VmConfigBuild)"/>
|
||||
<MakeDir Directories="$(ImportCsvBuild)"/>
|
||||
<MakeDir Directories="$(ImportEnterpriseBuild)"/>
|
||||
<MakeDir Directories="$(AWStatsViewerBuild)"/>
|
||||
|
|
@ -176,7 +186,25 @@
|
|||
<Copy SourceFiles="@(ImportCsvBuildFiles)" DestinationFolder="$(ImportCsvBuild)\%(RecursiveDir)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="CreateImportEnterpriseBuild" DependsOnTargets="CreateImportCsvBuild">
|
||||
<Target Name="CreateHyperVUtilsBuild" DependsOnTargets="CreateImportCsvBuild">
|
||||
<ItemGroup>
|
||||
<HyperVUtilsExclude Include="$(HyperVUtilsSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
|
||||
<HyperVUtilsExclude Include="$(HyperVUtilsSrc)\**\*.vshost.*" />
|
||||
<HyperVUtilsBuildFiles Include="$(HyperVUtilsSrc)\**\*.*" Exclude="@(HyperVUtilsExclude)" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(HyperVUtilsBuildFiles)" DestinationFolder="$(HyperVUtilsBuild)\%(RecursiveDir)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="CreateVMConfigBuild" DependsOnTargets="CreateHyperVUtilsBuild">
|
||||
<ItemGroup>
|
||||
<VMConfigExclude Include="$(VMConfigSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
|
||||
<VMConfigExclude Include="$(VMConfigSrc)\**\*.vshost.*" />
|
||||
<VMConfigBuildFiles Include="$(VMConfigSrc)\**\*.*" Exclude="@(VMConfigExclude)" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(VMConfigBuildFiles)" DestinationFolder="$(VMConfigBuild)\%(RecursiveDir)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="CreateImportEnterpriseBuild" DependsOnTargets="CreateVMConfigBuild">
|
||||
<ItemGroup>
|
||||
<ImportEnterpriseExclude Include="$(ImportEnterpriseSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
|
||||
<ImportEnterpriseExclude Include="$(ImportEnterpriseSrc)\**\*.vshost.*" />
|
||||
|
|
@ -289,6 +317,8 @@
|
|||
<!-- Tools -->
|
||||
<ToolsFolder>$(DeployFolder)\Tools</ToolsFolder>
|
||||
<ImportCsvInstall>$(ToolsFolder)\Import.CsvBulk</ImportCsvInstall>
|
||||
<HyperVUtilsInstall>$(ToolsFolder)\HyperVUtils</HyperVUtilsInstall>
|
||||
<VMConfigInstall>$(ToolsFolder)\VMconfig</VMConfigInstall>
|
||||
<ImportEnterpriseInstall>$(ToolsFolder)\Import.Enterprise</ImportEnterpriseInstall>
|
||||
<AWStatsViewerInstall>$(ToolsFolder)\AWStats.Viewer</AWStatsViewerInstall>
|
||||
<WSPTransportAgentInstall>$(ToolsFolder)\WSPTransportAgent</WSPTransportAgentInstall>
|
||||
|
|
@ -349,8 +379,28 @@
|
|||
<Copy SourceFiles="@(ImportCsvDeployFiles)" DestinationFolder="$(ImportCsvInstall)\%(RecursiveDir)" />
|
||||
<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(ImportCsvInstall)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="CreateHyperVUtilsCsvInstall" DependsOnTargets="CreateImportCsvInstall">
|
||||
<ItemGroup>
|
||||
<HyperVUtilsDeployFiles Include="$(HyperVUtilsBuild)\**\*.*" />
|
||||
</ItemGroup>
|
||||
<RemoveDir Directories="$(HyperVUtilsInstall)"/>
|
||||
<MakeDir Directories="$(HyperVUtilsInstall)"/>
|
||||
<Copy SourceFiles="@(HyperVUtilsDeployFiles)" DestinationFolder="$(HyperVUtilsInstall)\%(RecursiveDir)" />
|
||||
<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(HyperVUtilsInstall)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="CreateVMConfigInstall" DependsOnTargets="CreateHyperVUtilsCsvInstall">
|
||||
<ItemGroup>
|
||||
<VMConfigDeployFiles Include="$(VMConfigBuild)\**\*.*" />
|
||||
</ItemGroup>
|
||||
<RemoveDir Directories="$(VMConfigInstall)"/>
|
||||
<MakeDir Directories="$(VMConfigInstall)"/>
|
||||
<Copy SourceFiles="@(VMConfigDeployFiles)" DestinationFolder="$(VMConfigInstall)\%(RecursiveDir)" />
|
||||
<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(VMConfigInstall)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="CreateImportEnterpriseInstall" DependsOnTargets="CreateImportCsvInstall">
|
||||
<Target Name="CreateImportEnterpriseInstall" DependsOnTargets="CreateVMConfigInstall">
|
||||
<ItemGroup>
|
||||
<ImportEnterpriseDeployFiles Include="$(ImportEnterpriseBuild)\**\*.*" />
|
||||
</ItemGroup>
|
||||
|
|
@ -510,6 +560,8 @@
|
|||
<ServerInstallFiles Include="$(ServerInstall)\**\*.*" />
|
||||
|
||||
<ImportCsvInstallFiles Include="$(ImportCsvInstall)\**\*.*" />
|
||||
<HyperVUtilsInstallFiles Include="$(HyperVUtilsInstall)\**\*.*" />
|
||||
<VMConfigInstallFiles Include="$(VMConfigInstall)\**\*.*" />
|
||||
<ImportEnterpriseInstallFiles Include="$(ImportEnterpriseInstall)\**\*.*" />
|
||||
<AWStatsViewerInstallFiles Include="$(AWStatsViewerInstall)\**\*.*" />
|
||||
<WSPTransportAgentInstallFiles Include="$(WSPTransportAgentInstall)\**\*.*" />
|
||||
|
|
@ -549,11 +601,12 @@
|
|||
|
||||
<!-- zip tools -->
|
||||
<Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" WorkingDirectory="$(ImportCsvInstall)" />
|
||||
<Zip Files="@(HyperVUtilsInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-HyperVUtils-$(Version).zip" WorkingDirectory="$(HyperVUtilsInstall)" />
|
||||
<Zip Files="@(VMConfigInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-VMConfig-$(Version).zip" WorkingDirectory="$(VMConfigInstall)" />
|
||||
<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>
|
||||
|
||||
<Target Name="uploadtoftp">
|
||||
|
|
@ -566,7 +619,9 @@
|
|||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Server-$(Version)-Update.zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanel-Installer-$(Version)-Update.zip" RemoteFiles="WebsitePanel-Installer-$(Version)-Update.zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" RemoteFiles="WebsitePanel-Import-CsvBulk-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" RemoteFiles="WebsitePanel-Import-Enterprise-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-HyperVUtils-$(Version).zip" RemoteFiles="WebsitePanel-HyperVUtils-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-VMConfig-$(Version).zip" RemoteFiles="WebsitePanel-VMConfig-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" RemoteFiles="WebsitePanel-Import-Enterprise-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip" RemoteFiles="WebsitePanel-AWStatsViewer-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" />
|
||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" RemoteFiles="WebsitePanel.LocalizationToolkit-$(Version).msi" />
|
||||
|
|
@ -574,97 +629,4 @@
|
|||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\Manual-Update.zip" RemoteFiles="Manual-Update-$(Version).zip" />
|
||||
</Target>
|
||||
|
||||
<Target Name="uploadtocodeplex">
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile1 Include="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile1>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile1)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile2 Include="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile2>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile2)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile3 Include="$(DeployFolder)\WebsitePanel-Server-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile3>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile3)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile4 Include="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile4>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile4)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile5 Include="$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile5>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile5)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile6 Include="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile6>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile6)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile7 Include="$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile7>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile7)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile8 Include="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile8>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile8)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile9 Include="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile9>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile9)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile10 Include="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile10>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile10)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
<ItemGroup>
|
||||
<ReleaseFile11 Include="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip">
|
||||
<FileType>RuntimeBinary</FileType>
|
||||
</ReleaseFile11>
|
||||
</ItemGroup>
|
||||
|
||||
<UploadFiles ProjectName="$(codeplexProjectName)" ReleaseName="$(codeplexReleaseName)" ReleaseFiles="@(ReleaseFile11)" Username="$(codeplexUser)" Password="$(codeplexPassword)"></UploadFiles>
|
||||
|
||||
</Target>
|
||||
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue