BUILD: Added BuildWebPlatformInstallerFeed target to automatically generate a WebPI feed from the template file;
BUILD: Updated build.xml to reference SqlCmd, WebDeploy, WIX and CodePlex dependencies from the build tools location; BUILD: Updated Setup.WIX.wixproj to reference WIX from the build tools location (builds seamlessly in VS.NET as well); BUILD: Updated WebsitePanel.LocalizationToolkit.Wix.wixproj to reference WIX from the build tools location (builds seamlessly in VS.NET as well); BUILD: Updated deploy-debug.bat, deploy-release.bat to build WebPI feed along with everything else (BuildWebPlatformInstallerFeed target);
This commit is contained in:
ptsurbeleu
parent
95f136cf66
commit
92975d7272
5 changed files with 89 additions and 23 deletions
|
|
@ -8,8 +8,10 @@
|
|||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>WebsitePanelInstaller</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<BuildToolsPath Condition=" '$(BuildToolsPath)' == '' ">$(ProjectDir)..\..\..\</BuildToolsPath>
|
||||
<WixToolPath Condition=" '$(WixToolPath)' == '' ">$(BuildToolsPath)tools\wix\</WixToolPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(BuildToolsPath)\tools\wix\wix.targets</WixTargetsPath>
|
||||
<WixTasksPath Condition=" '$(WixTasksPath)' == '' ">wixtasks.dll</WixTasksPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
|
|
@ -72,11 +74,11 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<WixExtension Include="WixUIExtension">
|
||||
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
|
||||
<HintPath>$(WixExtDir)WixUIExtension.dll</HintPath>
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
<WixExtension Include="WixNetFxExtension">
|
||||
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
|
||||
<HintPath>$(WixExtDir)WixNetFxExtension.dll</HintPath>
|
||||
<Name>WixNetFxExtension</Name>
|
||||
</WixExtension>
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -8,8 +8,10 @@
|
|||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>WebsitePanel.LocalizationToolkit</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<BuildToolsPath Condition=" '$(BuildToolsPath)' == '' ">$(ProjectDir)..\..\..\..\</BuildToolsPath>
|
||||
<WixToolPath Condition=" '$(WixToolPath)' == '' ">$(BuildToolsPath)tools\wix\</WixToolPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(BuildToolsPath)\tools\wix\wix.targets</WixTargetsPath>
|
||||
<WixTasksPath Condition=" '$(WixTasksPath)' == '' ">wixtasks.dll</WixTasksPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
|
|
@ -44,11 +46,11 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<WixExtension Include="WixUIExtension">
|
||||
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
|
||||
<HintPath>$(WixExtDir)WixUIExtension.dll</HintPath>
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
<WixExtension Include="WixNetFxExtension">
|
||||
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
|
||||
<HintPath>$(WixExtDir)WixNetFxExtension.dll</HintPath>
|
||||
<Name>WixNetFxExtension</Name>
|
||||
</WixExtension>
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
|
||||
<UsingTask TaskName="UploadFiles" AssemblyFile="lib\CodePlex.WebServices.Client.dll" />
|
||||
<PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<Version>2.0.0</Version>
|
||||
<FileVersion>$(BUILD_NUMBER)</FileVersion>
|
||||
<VersionLabel>$(BUILD_NUMBER)</VersionLabel>
|
||||
|
|
@ -9,7 +7,6 @@
|
|||
<BuildConfiguration></BuildConfiguration>
|
||||
<RootFolder>..</RootFolder>
|
||||
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
|
||||
|
||||
<SetupTrunkFolder>$(RootFolder)\WebsitePanel.Installer</SetupTrunkFolder>
|
||||
<SetupBuildFolder>$(SetupTrunkFolder)\Build\$(BuildConfiguration)</SetupBuildFolder>
|
||||
|
||||
|
|
@ -17,12 +14,11 @@
|
|||
<DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder>
|
||||
|
||||
<PreviousBuildFolder>$(RootFolder)\..\prev\$(BuildConfiguration)</PreviousBuildFolder>
|
||||
|
||||
|
||||
<DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd>
|
||||
<SqlCmd>"C:\Program Files\Microsoft SQL Server\110\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
|
||||
|
||||
<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 V3\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy V3\msdeploy.exe"</MSDeployPath>
|
||||
<!-- Lets keep all tools we need for the build together in a well-known place to avoid BUIDL HELL -->
|
||||
<SqlCmd Condition="Exists('$(RootFolder)\tools\sqlcmd\sqlcmd.exe')">"$(RootFolder)\tools\sqlcmd\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
|
||||
<MSDeployPath Condition="Exists('$(RootFolder)\tools\webdeploy\msdeploy.exe')">"$(RootFolder)\tools\webdeploy\msdeploy.exe"</MSDeployPath>
|
||||
|
||||
<DataBaseName>WebsitePanel_build</DataBaseName>
|
||||
<MSDeployConnectionString>server=(local)\SQLEXPRESS;database=$(DataBaseName);Integrated Security=true;</MSDeployConnectionString>
|
||||
|
|
@ -237,7 +233,8 @@
|
|||
<Exec Command="@(LocalizationToolkitExe) -L $(PortalSrc)"/>
|
||||
|
||||
<!-- build MSI package -->
|
||||
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.LocalizationToolkit.Wix\WebsitePanel.LocalizationToolkit.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
|
||||
<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.LocalizationToolkit.Wix\WebsitePanel.LocalizationToolkit.Wix.wixproj"
|
||||
Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false">
|
||||
<Output
|
||||
TaskParameter="TargetOutputs"
|
||||
ItemName="LocalizationToolkitMsi" />
|
||||
|
|
@ -266,7 +263,8 @@
|
|||
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.Updater\WebsitePanel.Updater.csproj" Properties="Configuration=$(BuildConfiguration)" />
|
||||
|
||||
<!-- build MSI package -->
|
||||
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIX\Setup.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
|
||||
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIX\Setup.Wix.wixproj"
|
||||
Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false">
|
||||
<Output
|
||||
TaskParameter="TargetOutputs"
|
||||
ItemName="WebsitePanelInstallerMsi" />
|
||||
|
|
@ -552,8 +550,6 @@
|
|||
<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">
|
||||
|
|
@ -665,5 +661,67 @@
|
|||
|
||||
</Target>
|
||||
|
||||
<Target Name="BuildWebPlatformInstallerFeed" DependsOnTargets="Deploy">
|
||||
<ItemGroup>
|
||||
<InstallerFilePath Include="$(DeployFolder)\WebsitePanelInstaller.msi" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<GetFileSizeScript>
|
||||
<![CDATA[
|
||||
public static string ScriptMain() {
|
||||
System.Int32 KB = 1024;
|
||||
System.IO.FileInfo fileInfo = new System.IO.FileInfo(@"%(InstallerFilePath.FullPath)");
|
||||
return System.Convert.ToString(fileInfo.Length / KB);
|
||||
}
|
||||
]]>
|
||||
</GetFileSizeScript>
|
||||
<ComputeChecksumScript>
|
||||
<![CDATA[
|
||||
public static string ScriptMain() {
|
||||
System.String checksumStr = "";
|
||||
using(System.IO.FileStream stream = System.IO.File.OpenRead(@"%(InstallerFilePath.FullPath)"))
|
||||
{
|
||||
System.Security.Cryptography.SHA1Managed sha = new System.Security.Cryptography.SHA1Managed();
|
||||
System.Byte[] checksum = sha.ComputeHash(stream);
|
||||
checksumStr = System.BitConverter.ToString(checksum).Replace("-", System.String.Empty);
|
||||
}
|
||||
return checksumStr;
|
||||
}
|
||||
]]>
|
||||
</ComputeChecksumScript>
|
||||
</PropertyGroup>
|
||||
<Script Language="C#" Code="$(ComputeChecksumScript)">
|
||||
<Output TaskParameter="ReturnValue" PropertyName="InstallerFileChecksum" />
|
||||
</Script>
|
||||
<Script Language="C#" Code="$(GetFileSizeScript)">
|
||||
<Output TaskParameter="ReturnValue" PropertyName="InstallerFileSize" />
|
||||
</Script>
|
||||
|
||||
<ItemGroup>
|
||||
<Tokens Include="ProductVersion">
|
||||
<ReplacementValue>$(Version)</ReplacementValue>
|
||||
</Tokens>
|
||||
<Tokens Include="ProductTitle">
|
||||
<ReplacementValue>WebsitePanel $(Version)</ReplacementValue>
|
||||
</Tokens>
|
||||
<Tokens Include="ReleaseDate">
|
||||
<ReplacementValue>$(ReleaseDate)T00:00:00Z</ReplacementValue>
|
||||
</Tokens>
|
||||
<Tokens Include="InstallerFileSize">
|
||||
<ReplacementValue>$(InstallerFileSize)</ReplacementValue>
|
||||
</Tokens>
|
||||
<Tokens Include="InstallerFileSHA1">
|
||||
<ReplacementValue>$(InstallerFileChecksum)</ReplacementValue>
|
||||
</Tokens>
|
||||
<Tokens Include="InstallerFileUrl">
|
||||
<ReplacementValue>TODO: Evaluate MSI file URL</ReplacementValue>
|
||||
</Tokens>
|
||||
</ItemGroup>
|
||||
<TemplateFile Template="$(TrunkFolder)\WebsitePanelFeedTemplate.xml" OutputFilename="$(DeployFolder)\WebsitePanelFeed.xml" Tokens="@(Tokens)" />
|
||||
</Target>
|
||||
|
||||
<!--<Import Project="$(TrunkFolder)\WebsitePanelFeed.webpi.xml"/>-->
|
||||
<Import Project="$(RootFolder)\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
|
||||
<UsingTask TaskName="UploadFiles" AssemblyFile="$(RootFolder)\tools\CodePlex\CodePlex.WebServices.Client.dll" />
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1 +1,3 @@
|
|||
%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Debug /p:Version="2.0.0" /p:FileVersion="2.0.0.1" /p:VersionLabel="2.0.0.1" /v:n /fileLogger /m
|
||||
%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:BuildWebPlatformInstallerFeed /p:BuildConfiguration=Debug /p:Version="2.0.0" /p:FileVersion="2.0.0.1" /p:VersionLabel="2.0.0.1" /v:n /fileLogger /m
|
||||
|
||||
rem %windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Debug /p:Version="2.0.0" /p:FileVersion="2.0.0.1" /p:VersionLabel="2.0.0.1" /v:n /fileLogger /m
|
||||
|
|
@ -1 +1,3 @@
|
|||
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Release /p:Version="2.0.0" /p:FileVersion="2.0.0.1" /p:VersionLabel="2.0.0.1" /v:n /fileLogger /m
|
||||
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:BuildWebPlatformInstallerFeed /p:BuildConfiguration=Release /p:Version="2.0.0" /p:FileVersion="2.0.0.1" /p:VersionLabel="2.0.0.1" /v:n /fileLogger /m
|
||||
|
||||
rem %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Release /p:Version="2.0.0" /p:FileVersion="2.0.0.1" /p:VersionLabel="2.0.0.1" /v:n /fileLogger /m
|
||||
Loading…
Add table
Add a link
Reference in a new issue