Backed out changeset: a259f8f937bc
This commit is contained in:
parent
945cc4d6ba
commit
4bb59317e6
20 changed files with 1 additions and 7596 deletions
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Include>
|
||||
<?define PROJECTPATH = "..\..\..\WebsitePanel"?>
|
||||
<?define BUILDPATH = "$(var.PROJECTPATH)\Build\$(var.BUILD)\SchedulerService\bin"?>
|
||||
<?define SERVERBUILDPATH = "$(var.PROJECTPATH)\Build\$(var.BUILD)\Server\bin"?>
|
||||
</Include>
|
Binary file not shown.
|
@ -1,132 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<?include Config.wxi?>
|
||||
<?define VERSION="2.1"?>
|
||||
<Product Id="*" Name="WebsitePanel Scheduler Service Installer" Language="1033" Version="$(var.VERSION)" Manufacturer="Outercurve Foundation" UpgradeCode="629ccd5c-1f6d-4168-bbe6-01c69e232f44">
|
||||
<Package InstallerVersion="200" Compressed="yes" />
|
||||
<Media Id="1" EmbedCab="yes" Cabinet="schedulerservice.cab" />
|
||||
<Feature Id="ProductFeature" Title="WebsitePanel Scheduler Service Installer" Level="1">
|
||||
<ComponentRef Id="ProductFiles" />
|
||||
</Feature>
|
||||
<Property Id="BannerBitmap">bannrbmp</Property>
|
||||
<WixVariable Id="WixUIBannerBmp" Value="bannrbmp.bmp" />
|
||||
<WixVariable Id="WixUIDialogBmp" Value="dlgbmp.bmp" />
|
||||
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
|
||||
<Icon Id="WebSitePanel.ico" SourceFile="WebSitePanel.ico" />
|
||||
<Property Id="ARPPRODUCTICON" Value="WebSitePanel.ico" />
|
||||
<Property Id="SERVERNAME" Value="localhost\SQLExpress" />
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
|
||||
<Property Id="INSTALLFOLDER" Value="c:\WebsitePanel\SchedulerService" />
|
||||
<Property Id="CONNECTIONSTRING" Value="1" />
|
||||
<Property Id="DATABASENAME" Value="WebsitePanel" />
|
||||
<Property Id="AUTHENTICATIONTYPE" Value="Windows Authentication" />
|
||||
<Binary Id="bannrbmp" SourceFile="bannrbmp.bmp" />
|
||||
<UI Id="CustomInstaller">
|
||||
<UIRef Id="WixUI_Mondo" />
|
||||
<Dialog Id="DatabaseConnectionDlg" Width="370" Height="270" NoMinimize="yes" Title="[ProductName] Setup">
|
||||
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="Back">
|
||||
<Publish Event="NewDialog" Value="InstallLocationDlg">1</Publish>
|
||||
</Control>
|
||||
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="Next">
|
||||
<Publish Event="DoAction" Value="CheckConnection">1</Publish>
|
||||
<Publish Event="SpawnDialog" Value="ConnectionWarningDlg">CORRECTCONNECTION = "0"</Publish>
|
||||
<Publish Event="NewDialog" Value="VerifyReadyDlg">CORRECTCONNECTION = "1"</Publish>
|
||||
</Control>
|
||||
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
|
||||
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
|
||||
</Control>
|
||||
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
|
||||
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
|
||||
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
|
||||
<Control Id="Description" Type="Text" X="20" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="Configure WebsitePanel database connection string" />
|
||||
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Database connection string" />
|
||||
<Control Type="Text" Id="ServerLabel" Width="50" Height="17" X="75" Y="68" Text="SQL Server:" />
|
||||
<Control Type="Edit" Id="ServerEdit" Width="163" Height="15" X="142" Y="68" Property="SERVERNAME" />
|
||||
<Control Type="Text" Id="AuthenticationLabel" Width="70" Height="17" X="62" Y="94" Text="Authentication:" />
|
||||
<Control Type="ComboBox" Id="AuthenticationCombo" Width="163" Height="16" X="142" Y="94" Property="AUTHENTICATIONTYPE">
|
||||
<ComboBox Property="AUTHENTICATIONTYPE">
|
||||
<ListItem Text="Windows Authentication" Value="Windows Authentication" />
|
||||
<ListItem Text="SQL Server Authentication" Value="SQL Server Authentication" />
|
||||
</ComboBox>
|
||||
</Control>
|
||||
<Control Type="Text" Id="LoginLabel" Width="50" Height="17" X="71" Y="120" Text="Login Name:" />
|
||||
<Control Type="Edit" Id="LoginEdit" Width="163" Height="15" X="142" Y="120" Property="LOGIN">
|
||||
<Condition Action="disable">AUTHENTICATIONTYPE = "Windows Authentication"</Condition>
|
||||
<Condition Action="enable">NOT(AUTHENTICATIONTYPE = "Windows Authentication")</Condition>
|
||||
</Control>
|
||||
<Control Type="Text" Id="PasswordLabel" Width="50" Height="17" X="80" Y="146" Text="Password:" />
|
||||
<Control Type="Edit" Id="PasswordEdit" Width="163" Height="17" X="142" Y="146" Property="PASSWORD" Hidden="no" Password="yes">
|
||||
<Condition Action="disable">AUTHENTICATIONTYPE = "Windows Authentication"</Condition>
|
||||
<Condition Action="enable">NOT(AUTHENTICATIONTYPE = "Windows Authentication")</Condition>
|
||||
</Control>
|
||||
<Control Type="Text" Id="DatabaseLabel" Width="50" Height="17" X="80" Y="172" Text="Database:" />
|
||||
<Control Type="Edit" Id="DatabaseEdit" Width="163" Height="17" X="142" Y="172" Property="DATABASENAME" />
|
||||
</Dialog>
|
||||
<Dialog Id="ConnectionWarningDlg" Width="250" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
|
||||
<Control Id="Ok" Type="PushButton" X="184" Y="60" Width="56" Height="17" Text="Ok">
|
||||
<Publish Event="EndDialog" Value="Return">1</Publish>
|
||||
</Control>
|
||||
<Control Id="Text" Type="Text" X="8" Y="8" Width="221" Height="30">
|
||||
<Text>Connection not valid.</Text>
|
||||
</Control>
|
||||
</Dialog>
|
||||
<Dialog Id="InstallLocationDlg" Width="370" Height="270" Title="[ProductName] Setup">
|
||||
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="Next">
|
||||
<Publish Event="NewDialog" Value="DatabaseConnectionDlg" Order="3">1</Publish>
|
||||
</Control>
|
||||
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="Back">
|
||||
<Publish Event="NewDialog" Value="LicenseAgreementDlg" Order="3">1</Publish>
|
||||
</Control>
|
||||
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
|
||||
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
|
||||
</Control>
|
||||
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Configure Scheduler Service Install location" />
|
||||
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Install Location" />
|
||||
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
|
||||
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
|
||||
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
|
||||
<Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="Folder Name:" />
|
||||
<Control Id="Folder" Type="PathEdit" X="22" Y="90" Width="320" Height="15" Property="WIXUI_INSTALLDIR" Indirect="yes" />
|
||||
</Dialog>
|
||||
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallLocationDlg" Order="3">
|
||||
LicenseAccepted = "1"
|
||||
</Publish>
|
||||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="DatabaseConnectionDlg">1</Publish>
|
||||
<TextStyle Id="DlgTitleFont" FaceName="Tahoma" Size="8" Bold="yes" />
|
||||
</UI>
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="FinalizeInstall" After="InstallFinalize" />
|
||||
</InstallExecuteSequence>
|
||||
</Product>
|
||||
<Fragment>
|
||||
<CustomAction Id="CheckConnection" BinaryKey="CheckConnection.CA" DllEntry="CheckConnection" />
|
||||
<Binary Id="CheckConnection.CA" SourceFile="bin\WebsitePanel.SchedulerServiceInstaller.CA.dll" />
|
||||
</Fragment>
|
||||
<Fragment>
|
||||
<CustomAction Id="FinalizeInstall" BinaryKey="CheckConnection.CA" DllEntry="FinalizeInstall" />
|
||||
</Fragment>
|
||||
<Fragment>
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="WEBSITEPANELFOLDER" Name="WebsitePanel">
|
||||
<Directory Id="INSTALLFOLDER" Name="SchedulerService" />
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Fragment>
|
||||
<Fragment>
|
||||
<DirectoryRef Id="INSTALLFOLDER">
|
||||
<Component Id="ProductFiles" Guid="A89FA6CF-53E2-4390-9E9D-11CD4297D739">
|
||||
<File Id="WebsitePanel.SchedulerService.exe" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe" />
|
||||
<File Id="WebsitePanel.SchedulerService.exe.config" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe.config" />
|
||||
<File Id="Ionic.Zip.Reduced.dll" Source="$(var.SERVERBUILDPATH)\Ionic.Zip.Reduced.dll"/>
|
||||
<File Id="Microsoft.Web.Services3.dll" Source="$(var.SERVERBUILDPATH)\Microsoft.Web.Services3.dll"/>
|
||||
<File Id="WebsitePanel.Common.Utils.dll" Source="$(var.BUILDPATH)\WebsitePanel.Common.Utils.dll"/>
|
||||
<File Id="WebsitePanel.EnterpriseServer.Base.dll" Source="$(var.BUILDPATH)\WebsitePanel.EnterpriseServer.Base.dll"/>
|
||||
<File Id="WebsitePanel.EnterpriseServer.Code.dll" Source="$(var.BUILDPATH)\WebsitePanel.EnterpriseServer.Code.dll"/>
|
||||
<File Id="WebsitePanel.Providers.Base.dll" Source="$(var.BUILDPATH)\WebsitePanel.Providers.Base.dll"/>
|
||||
<File Id="WebsitePanel.Server.Client.dll" Source="$(var.BUILDPATH)\WebsitePanel.Server.Client.dll"/>
|
||||
<File Id="WebsitePanel.Templates.dll" Source="$(var.BUILDPATH)\WebsitePanel.Templates.dll"/>
|
||||
<File Id="WebsitePanel.Whois.dll" Source="$(var.BUILDPATH)\WebsitePanel.Whois.dll"/>
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
</Wix>
|
Binary file not shown.
Before Width: | Height: | Size: 15 KiB |
|
@ -1,52 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>3.7</ProductVersion>
|
||||
<ProjectGuid>{ead7c528-ea3d-40e8-9688-9f1d8dc8d758}</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>Setup.SchedulerService</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>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug;BUILD=debug</DefineConstants>
|
||||
<SuppressValidation>False</SuppressValidation>
|
||||
<SuppressIces>
|
||||
</SuppressIces>
|
||||
<CompilerAdditionalOptions>
|
||||
</CompilerAdditionalOptions>
|
||||
<LinkerAdditionalOptions>
|
||||
</LinkerAdditionalOptions>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>BUILD=release</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Product.wxs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Config.wxi" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<WixExtension Include="WixUIExtension">
|
||||
<HintPath>..\..\..\tools\WIX\WixUIExtension.dll</HintPath>
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
Binary file not shown.
Before Width: | Height: | Size: 84 KiB |
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 451 KiB |
File diff suppressed because one or more lines are too long
|
@ -1,2 +0,0 @@
|
|||
C:\Projects\wsp210\WebsitePanel.Installer\Sources\Setup.SchedulerService\bin\Release\Setup.SchedulerService.msi
|
||||
C:\Projects\wsp210\WebsitePanel.Installer\Sources\Setup.SchedulerService\bin\Release\Setup.SchedulerService.wixpdb
|
|
@ -1,11 +0,0 @@
|
|||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\Ionic.Zip.Reduced.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\Microsoft.Web.Services3.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.Common.Utils.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.EnterpriseServer.Base.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.EnterpriseServer.Code.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.Providers.Base.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.SchedulerService.exe
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.SchedulerService.exe.config
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.Server.Client.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.Templates.dll
|
||||
..\..\..\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.Whois.dll
|
|
@ -1,2 +0,0 @@
|
|||
C:\Projects\wsp210\WebsitePanel.Installer\Sources\Setup.SchedulerService\bin\Release\Setup.SchedulerService.msi
|
||||
C:\Projects\wsp210\WebsitePanel.Installer\Sources\Setup.SchedulerService\bin\Release\Setup.SchedulerService.wixpdb
|
|
@ -1,6 +0,0 @@
|
|||
C:\Projects\wsp210\WebsitePanel.Installer\Sources\Setup.SchedulerService\bin\Release\Setup.SchedulerService.msi
|
||||
C:\Projects\wsp210\WebsitePanel.Installer\Sources\Setup.SchedulerService\bin\Release\Setup.SchedulerService.wixpdb
|
||||
obj\Release\Product.wixobj
|
||||
obj\Release\Setup.SchedulerService.wixproj.BindContentsFileListnull.txt
|
||||
obj\Release\Setup.SchedulerService.wixproj.BindOutputsFileListnull.txt
|
||||
obj\Release\Setup.SchedulerService.wixproj.BindBuiltOutputsFileListnull.txt
|
|
@ -331,7 +331,7 @@
|
|||
|
||||
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.SchedulerServiceInstaller\WebsitePanel.SchedulerServiceInstaller.csproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false"/>
|
||||
|
||||
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.SchedulerService\WebsitePanel.SchedulerService.wixproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false">
|
||||
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.SchedulerService\Setup.SchedulerService.wixproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false">
|
||||
<Output
|
||||
TaskParameter="TargetOutputs"
|
||||
ItemName="WebsitePanelInstallerMsi" />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue