Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Removed Wix project, will only be using NAnt from now on.

Created a separate installer for API documentation since it's about 3x as large as the rest.

SVN: trunk@2630
  • Loading branch information...
commit 76d7a53276aff76eb9ebaf1c194c9e82c8a9dca3 1 parent e138806
Sergey Koshcheyev authored
16 src/NHibernate.Everything-2.0.sln
@@ -189,12 +189,6 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "C:\...\NHibernate.Example.W
189 189 DefaultWebSiteLanguage = "Visual C#"
190 190 EndProjectSection
191 191 EndProject
192   -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "NHibernate.Setup", "NHibernate.Setup\NHibernate.Setup.wixproj", "{C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}"
193   - ProjectSection(WebsiteProperties) = preProject
194   - Debug.AspNetCompiler.Debug = "True"
195   - Release.AspNetCompiler.Debug = "False"
196   - EndProjectSection
197   -EndProject
198 192 Global
199 193 GlobalSection(SolutionConfigurationPlatforms) = preSolution
200 194 Debug|.NET = Debug|.NET
@@ -476,16 +470,6 @@ Global
476 470 {C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Any CPU.ActiveCfg = Debug|.NET
477 471 {C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
478 472 {C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Mixed Platforms.Build.0 = Debug|.NET
479   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|.NET.ActiveCfg = Debug|Any CPU
480   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
481   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Any CPU.Build.0 = Debug|Any CPU
482   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
483   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
484   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|.NET.ActiveCfg = Release|Any CPU
485   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Any CPU.ActiveCfg = Release|Any CPU
486   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Any CPU.Build.0 = Release|Any CPU
487   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
488   - {C801DD1E-8550-4B81-94B0-8AFAF4E3D34F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
489 473 EndGlobalSection
490 474 GlobalSection(SolutionProperties) = preSolution
491 475 HideSolutionNode = FALSE
87 src/NHibernate.Setup/APIDocumentation.wxs
... ... @@ -0,0 +1,87 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
  3 + <Product Id="771D1A4D-322B-4683-A95C-B505EF09619C"
  4 + Name="NHibernate $(var.ShortVersion) API Documentation"
  5 + Language="1033"
  6 + Version="$(var.NumericVersion)"
  7 + Manufacturer="JBoss, a division of Red Hat"
  8 + UpgradeCode="34BC7653-111A-4C7D-B4EB-2B92DFE205B4">
  9 +
  10 + <Package InstallerVersion="200" Compressed="yes" />
  11 +
  12 + <Media Id="1" Cabinet="VSDocumentation.cab" EmbedCab="yes" />
  13 +
  14 + <Upgrade Id="34BC7653-111A-4C7D-B4EB-2B92DFE205B4" />
  15 +
  16 + <Directory Id="TARGETDIR" Name="SourceDir">
  17 + <Directory Id="ProgramFilesFolder">
  18 + <Directory Id="NHibernate" Name="NHibernate" FileSource="$(var.BuildDir)">
  19 + <Directory Id="INSTALLLOCATION" Name="doc">
  20 + <Directory Id="help2" Name="help2">
  21 + <Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\VSIPCC_Collection_Files_RTL_---_---.msm"
  22 + DiskId="1" Language="1033" Id="Merge.VSIPCC" />
  23 + <Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\HTML_Help_Registration__RTL_X86_---.msm"
  24 + DiskId="1" Language="1033" Id="Merge.HelpReg" />
  25 +
  26 + <Component Id="NHibernate.API.VSHelp" Guid="{49536A11-87CD-4035-A21D-D866CE3C8DB5}">
  27 + <File Id="NHibernate.API.HxS" Name="NHibernate.API.HxS" KeyPath="yes">
  28 + <HelpFile Id="NHibernate.API" Name="NHibernate.API" xmlns="http://schemas.microsoft.com/wix/VSExtension"
  29 + Index="NHibernate.API.HxI" Language="1033" />
  30 + </File>
  31 + <File Id="NHibernate.API.HxI" Name="NHibernate.API.HxI" />
  32 + <File Id="NHibernate.APICollection.HxC" Name="NHibernate.APICollection.HxC">
  33 + <HelpCollection xmlns="http://schemas.microsoft.com/wix/VSExtension"
  34 + Id="NHibernate12"
  35 + Name="NHibernate.1.2"
  36 + Description="NHibernate 1.2 documentation">
  37 + <HelpFileRef Id="NHibernate.API" />
  38 + <PlugCollectionInto TableOfContents="NHibernate.APICollection.HxT"
  39 + TargetCollection="MS_VSIPCC_v80"
  40 + TargetTableOfContents="FL_vsipcc_hxt_86880________.3643236F_FC70_11D3_A536_0090278A1BB8" />
  41 + </HelpCollection>
  42 + </File>
  43 + <File Id="NHibernate.APICollection.HxT" Name="NHibernate.APICollection.HxT" />
  44 + <File Id="NHibernate.APICollection_A.HxK" Name="NHibernate.APICollection_A.HxK" />
  45 + <File Id="NHibernate.APICollection_F.HxK" Name="NHibernate.APICollection_F.HxK" />
  46 + <File Id="NHibernate.APICollection_K.HxK" Name="NHibernate.APICollection_K.HxK" />
  47 + </Component>
  48 + </Directory>
  49 + <Component Id="NHibernate.API.chm" Guid="{5E218CF6-F36A-4F54-98C2-27728A79DB56}">
  50 + <File Id="NHibernate.API.chm" Name="NHibernate.API.chm" KeyPath="yes" />
  51 + </Component>
  52 + </Directory>
  53 + </Directory>
  54 + </Directory>
  55 + </Directory>
  56 +
  57 + <Feature
  58 + Id="Complete"
  59 + Title="NHibernate API Documentation"
  60 + Description="NHibernate API documentation for version $(var.Version)"
  61 + Display="expand"
  62 + ConfigurableDirectory="INSTALLLOCATION"
  63 + Absent="disallow"
  64 + AllowAdvertise="no"
  65 + Level="1">
  66 + <Feature Id="Standalone" Title="Standalone (.chm)" Level="1"
  67 + Description="NHibernate API documentation in HTML Help (.chm) format">
  68 + <ComponentRef Id="NHibernate.API.chm" />
  69 + </Feature>
  70 +
  71 + <Feature Id="Integrated2005" Title="Integrated (.HxS)" Level="1"
  72 + Description="NHibernate API documentation in HTML Help2 (.HxS) format, integrated into Visual Studio 2005">
  73 + <MergeRef Id="Merge.HelpReg"/>
  74 + <MergeRef Id="Merge.VSIPCC" />
  75 + <ComponentRef Id="NHibernate.API.VSHelp" />
  76 + </Feature>
  77 + </Feature>
  78 +
  79 + <WixVariable Id="WixUILicenseRtf" Value="lgpl.rtf" />
  80 + <UIRef Id="WixUI_FeatureTree" />
  81 + <UIRef Id="WixUI_ErrorProgressText" />
  82 +
  83 + <InstallExecuteSequence>
  84 + <InstallFinalize Sequence="7800" />
  85 + </InstallExecuteSequence>
  86 + </Product>
  87 +</Wix>
38 src/NHibernate.Setup/NHibernate.Setup.build
@@ -13,7 +13,9 @@
13 13
14 14 <target name="init" depends="common.init" />
15 15
16   - <target name="msi" depends="init">
  16 + <target name="msi" depends="msi.nhibernate msi.apidocs" />
  17 +
  18 + <target name="msi.nhibernate" depends="init">
17 19 <property name="msi.tmp.dir" value="${build.dir}/msi-tmp" />
18 20 <mkdir dir="${msi.tmp.dir}" />
19 21 <candle
@@ -21,10 +23,11 @@
21 23 exedir="${wix.bin.dir}"
22 24 extensions="${wix.bin.dir}/WixUIExtension.dll">
23 25 <sources>
24   - <include name="*.wxs" />
  26 + <include name="NHibernate.Setup.wxs" />
25 27 </sources>
26 28 <arg line="-dVersion=${project.version}" />
27 29 <arg line="-dNumericVersion=${project.version.numeric}" />
  30 + <arg line="-dShortVersion=${project.version.short}" />
28 31 <arg line="-dBuildDir=${build.dir}" />
29 32 </candle>
30 33
@@ -34,7 +37,36 @@
34 37 extensions="${wix.bin.dir}/WixUIExtension.dll"
35 38 cultures="en-us">
36 39 <sources>
37   - <include name="${msi.tmp.dir}/*.wixobj" />
  40 + <include name="${msi.tmp.dir}/NHibernate.Setup.wixobj" />
  41 + </sources>
  42 + </light>
  43 +
  44 + <delete dir="${msi.tmp.dir}" />
  45 + </target>
  46 +
  47 + <target name="msi.apidocs" depends="init">
  48 + <property name="msi.tmp.dir" value="${build.dir}/msi-tmp" />
  49 + <mkdir dir="${msi.tmp.dir}" />
  50 + <candle
  51 + out="${msi.tmp.dir}/"
  52 + exedir="${wix.bin.dir}"
  53 + extensions="${wix.bin.dir}/WixUIExtension.dll;${wix.bin.dir}/WixVSExtension.dll">
  54 + <sources>
  55 + <include name="APIDocumentation.wxs" />
  56 + </sources>
  57 + <arg line="-dVersion=${project.version}" />
  58 + <arg line="-dNumericVersion=${project.version.numeric}" />
  59 + <arg line="-dShortVersion=${project.version.short}" />
  60 + <arg line="-dBuildDir=${build.dir}" />
  61 + </candle>
  62 +
  63 + <light
  64 + out="${build.dir}/NHibernate-${project.version}-APIDocumentation.msi"
  65 + exedir="${wix.bin.dir}"
  66 + extensions="${wix.bin.dir}/WixUIExtension.dll;${wix.bin.dir}/WixVSExtension.dll"
  67 + cultures="en-us">
  68 + <sources>
  69 + <include name="${msi.tmp.dir}/APIDocumentation.wixobj" />
38 70 </sources>
39 71 </light>
40 72
82 src/NHibernate.Setup/NHibernate.Setup.wixproj
... ... @@ -1,82 +0,0 @@
1   -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2   - <PropertyGroup>
3   - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4   - <ProductVersion>3.0</ProductVersion>
5   - <ProjectGuid>{c801dd1e-8550-4b81-94b0-8afaf4e3d34f}</ProjectGuid>
6   - <SchemaVersion>2.0</SchemaVersion>
7   - <OutputName>NHibernate</OutputName>
8   - <OutputType>Package</OutputType>
9   - <WixToolPath>C:\Program Files\Windows Installer XML v3\bin\</WixToolPath>
10   - </PropertyGroup>
11   - <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
12   - <OutputPath>bin\Debug\</OutputPath>
13   - <IntermediateOutputPath>
14   - </IntermediateOutputPath>
15   - <DefineConstants>Version=1.2.0.CR1;NumericVersion=1.2.0.3001;BuildDir=..\..\..\..\build\NHibernate-1.2.0.CR1</DefineConstants>
16   - <IncludeSearchPaths>
17   - </IncludeSearchPaths>
18   - <Pedantic>True</Pedantic>
19   - <ShowSourceTrace>False</ShowSourceTrace>
20   - <SuppressSchemaValidation>False</SuppressSchemaValidation>
21   - <SuppressSpecificWarnings>
22   - </SuppressSpecificWarnings>
23   - <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
24   - <VerboseOutput>False</VerboseOutput>
25   - <AllowIdenticalRows>False</AllowIdenticalRows>
26   - <CabinetCachePath>
27   - </CabinetCachePath>
28   - <CabinetCreationThreadCount>-1</CabinetCreationThreadCount>
29   - <Cultures>en-us</Cultures>
30   - <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
31   - <LinkerPedantic>True</LinkerPedantic>
32   - <ReuseCabinetCache>False</ReuseCabinetCache>
33   - <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion>
34   - <SuppressAclReset>False</SuppressAclReset>
35   - <SuppressAssemblies>False</SuppressAssemblies>
36   - <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions>
37   - <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions>
38   - <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions>
39   - <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables>
40   - <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo>
41   - <SuppressFiles>False</SuppressFiles>
42   - <SuppressIces>
43   - </SuppressIces>
44   - <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching>
45   - <SuppressLayout>False</SuppressLayout>
46   - <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing>
47   - <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation>
48   - <LinkerSuppressSpecificWarnings>
49   - </LinkerSuppressSpecificWarnings>
50   - <SuppressValidation>False</SuppressValidation>
51   - <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors>
52   - <LinkerVerboseOutput>False</LinkerVerboseOutput>
53   - <WixVariables>
54   - </WixVariables>
55   - </PropertyGroup>
56   - <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
57   - <OutputPath>bin\Release\</OutputPath>
58   - <IntermediateOutputPath>
59   - </IntermediateOutputPath>
60   - <DefineConstants>Version=1.2.0.CR1;NumericVersion=1.2.0.3001;BuildDir=..\..\..\..\build\NHibernate-1.2.0.CR1</DefineConstants>
61   - <IncludeSearchPaths>
62   - </IncludeSearchPaths>
63   - <Pedantic>True</Pedantic>
64   - <ShowSourceTrace>False</ShowSourceTrace>
65   - <SuppressSchemaValidation>False</SuppressSchemaValidation>
66   - <SuppressSpecificWarnings>
67   - </SuppressSpecificWarnings>
68   - <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
69   - <VerboseOutput>False</VerboseOutput>
70   - </PropertyGroup>
71   - <ItemGroup>
72   - <Compile Include="NHibernate.Setup.wxs" />
73   - </ItemGroup>
74   - <ItemGroup>
75   - <WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
76   - <WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixVSExtension.dll" />
77   - </ItemGroup>
78   - <ItemGroup>
79   - <Content Include="lgpl.rtf" />
80   - </ItemGroup>
81   - <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
82   -</Project>
374 src/NHibernate.Setup/NHibernate.Setup.wxs
... ... @@ -1,7 +1,7 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3 3 <Product Id="0DF4DA42-605B-4E19-AE18-D066BD4700C3"
4   - Name="NHibernate $(var.Version)"
  4 + Name="NHibernate $(var.ShortVersion)"
5 5 Language="1033"
6 6 Version="$(var.NumericVersion)"
7 7 Manufacturer="JBoss, a division of Red Hat"
@@ -315,44 +315,12 @@
315 315 </Directory>
316 316 </Directory>
317 317 <Directory Id="doc" Name="doc">
318   - <Component Id="NHibernate.API.chm" Guid="{5E218CF6-F36A-4F54-98C2-27728A79DB56}">
319   - <File Id="NHibernate.API.chm" Name="NHibernate.API.chm" KeyPath="yes" />
320   - </Component>
321 318 <Component Id="NHibernate.Documentation.chm" Guid="{BDDA5742-7E4D-4B76-A23F-B948D2544C0F}">
322 319 <File Id="NHibernate.Documentation.chm" Name="NHibernate.Documentation.chm" KeyPath="yes" />
323 320 </Component>
324 321 <Component Id="nhibernate_reference.pdf" Guid="{A760C7CB-354B-419E-90DD-C27AA24F434E}">
325 322 <File Id="nhibernate_reference.pdf" Name="nhibernate_reference.pdf" KeyPath="yes" />
326 323 </Component>
327   - <Directory Id="help2" Name="help2">
328   - <Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\VSIPCC_Collection_Files_RTL_---_---.msm"
329   - DiskId="1" Language="1033" Id="Merge.VSIPCC" />
330   - <Merge SourceFile="C:\Program Files\Visual Studio 2005 SDK\2006.09\VisualStudioIntegration\Redistributables\HTML_Help_Registration__RTL_X86_---.msm"
331   - DiskId="1" Language="1033" Id="Merge.HelpReg" />
332   -
333   - <Component Id="NHibernate.API.VSHelp" Guid="{49536A11-87CD-4035-A21D-D866CE3C8DB5}">
334   - <File Id="NHibernate.API.HxS" Name="NHibernate.API.HxS" KeyPath="yes">
335   - <HelpFile Id="NHibernate.API" Name="NHibernate.API" xmlns="http://schemas.microsoft.com/wix/VSExtension"
336   - Index="NHibernate.API.HxI" Language="1033" />
337   - </File>
338   - <File Id="NHibernate.API.HxI" Name="NHibernate.API.HxI" />
339   - <File Id="NHibernate.APICollection.HxC" Name="NHibernate.APICollection.HxC">
340   - <HelpCollection xmlns="http://schemas.microsoft.com/wix/VSExtension"
341   - Id="NHibernate12"
342   - Name="NHibernate.1.2"
343   - Description="NHibernate 1.2 documentation">
344   - <HelpFileRef Id="NHibernate.API" />
345   - <PlugCollectionInto TableOfContents="NHibernate.APICollection.HxT"
346   - TargetCollection="MS_VSIPCC_v80"
347   - TargetTableOfContents="FL_vsipcc_hxt_86880________.3643236F_FC70_11D3_A536_0090278A1BB8" />
348   - </HelpCollection>
349   - </File>
350   - <File Id="NHibernate.APICollection.HxT" Name="NHibernate.APICollection.HxT" />
351   - <File Id="NHibernate.APICollection_A.HxK" Name="NHibernate.APICollection_A.HxK" />
352   - <File Id="NHibernate.APICollection_F.HxK" Name="NHibernate.APICollection_F.HxK" />
353   - <File Id="NHibernate.APICollection_K.HxK" Name="NHibernate.APICollection_K.HxK" />
354   - </Component>
355   - </Directory>
356 324 </Directory>
357 325 <Directory Id="src" Name="src">
358 326 <Component Id="SourceZip" Guid="CAD2DAF4-AD0E-4E0D-9726-94F2F7F95301">
@@ -363,202 +331,198 @@
363 331 </Directory>
364 332 </Directory>
365 333
366   - <Feature Id="Binaries" Title="Binaries" Level="1">
367   - <Feature Id="Core" Title="NHibernate Core" Level="1" Absent="disallow" InstallDefault="followParent" AllowAdvertise="no">
368   - <ComponentRef Id="NHibernate.dll_net20" />
369   - <ComponentRef Id="NHibernate.xml_net20" />
370   - <ComponentRef Id="NHibernate.license.txt_net20" />
371   -
372   - <ComponentRef Id="log4net.dll_net20" />
373   - <ComponentRef Id="log4net.xml_net20" />
374   - <ComponentRef Id="log4net.license.txt_net20" />
375   -
376   - <ComponentRef Id="Iesi.Collections.dll_net20" />
377   - <ComponentRef Id="Iesi.Collections.xml_net20" />
378   - <ComponentRef Id="Iesi.Collections.license.txt_net20" />
379   -
380   - <ComponentRef Id="Castle.DynamicProxy.dll_net20" />
381   - <ComponentRef Id="Castle.DynamicProxy.xml_net20" />
382   - <ComponentRef Id="Castle.DynamicProxy.license.txt_net20" />
383   -
384   - <ComponentRef Id="NHibernate.dll_net11" />
385   - <ComponentRef Id="NHibernate.xml_net11" />
386   - <ComponentRef Id="NHibernate.license.txt_net11" />
387   -
388   - <ComponentRef Id="log4net.dll_net11" />
389   - <ComponentRef Id="log4net.xml_net11" />
390   - <ComponentRef Id="log4net.license.txt_net11" />
391   -
392   - <ComponentRef Id="Iesi.Collections.dll_net11" />
393   - <ComponentRef Id="Iesi.Collections.xml_net11" />
394   - <ComponentRef Id="Iesi.Collections.license.txt_net11" />
395   -
396   - <ComponentRef Id="Castle.DynamicProxy.dll_net11" />
397   - <ComponentRef Id="Castle.DynamicProxy.xml_net11" />
398   - <ComponentRef Id="Castle.DynamicProxy.license.txt_net11" />
399   -
400   - <ComponentRef Id="HashCodeProvider.dll_net11" />
401   - <ComponentRef Id="HashCodeProvider.license.txt_net11" />
402   - </Feature>
  334 + <Feature
  335 + Id="Complete"
  336 + Title="NHibernate"
  337 + Description="NHibernate $(var.Version)"
  338 + Display="expand"
  339 + ConfigurableDirectory="INSTALLLOCATION"
  340 + Absent="disallow"
  341 + AllowAdvertise="no"
  342 + Level="1">
  343 + <Feature Id="Binaries" Title="Binaries" Level="1">
  344 + <Feature Id="Core" Title="NHibernate Core" Level="1" Absent="disallow" InstallDefault="followParent" AllowAdvertise="no">
  345 + <ComponentRef Id="NHibernate.dll_net20" />
  346 + <ComponentRef Id="NHibernate.xml_net20" />
  347 + <ComponentRef Id="NHibernate.license.txt_net20" />
  348 +
  349 + <ComponentRef Id="log4net.dll_net20" />
  350 + <ComponentRef Id="log4net.xml_net20" />
  351 + <ComponentRef Id="log4net.license.txt_net20" />
  352 +
  353 + <ComponentRef Id="Iesi.Collections.dll_net20" />
  354 + <ComponentRef Id="Iesi.Collections.xml_net20" />
  355 + <ComponentRef Id="Iesi.Collections.license.txt_net20" />
  356 +
  357 + <ComponentRef Id="Castle.DynamicProxy.dll_net20" />
  358 + <ComponentRef Id="Castle.DynamicProxy.xml_net20" />
  359 + <ComponentRef Id="Castle.DynamicProxy.license.txt_net20" />
  360 +
  361 + <ComponentRef Id="NHibernate.dll_net11" />
  362 + <ComponentRef Id="NHibernate.xml_net11" />
  363 + <ComponentRef Id="NHibernate.license.txt_net11" />
  364 +
  365 + <ComponentRef Id="log4net.dll_net11" />
  366 + <ComponentRef Id="log4net.xml_net11" />
  367 + <ComponentRef Id="log4net.license.txt_net11" />
  368 +
  369 + <ComponentRef Id="Iesi.Collections.dll_net11" />
  370 + <ComponentRef Id="Iesi.Collections.xml_net11" />
  371 + <ComponentRef Id="Iesi.Collections.license.txt_net11" />
  372 +
  373 + <ComponentRef Id="Castle.DynamicProxy.dll_net11" />
  374 + <ComponentRef Id="Castle.DynamicProxy.xml_net11" />
  375 + <ComponentRef Id="Castle.DynamicProxy.license.txt_net11" />
  376 +
  377 + <ComponentRef Id="HashCodeProvider.dll_net11" />
  378 + <ComponentRef Id="HashCodeProvider.license.txt_net11" />
  379 + </Feature>
403 380
404   - <Feature Id="Contrib" Title="Contributions (Unsupported)" Level="1" AllowAdvertise="no">
405   - <Feature Id="UserTypes" Level="1" Title="User Types" Description="Extensions for NHibernate to support non-standard types."
406   - AllowAdvertise="no">
407   - <Feature Id="Nullables"
408   - Title="Nullables"
409   - Description="Provides nullable versions of standard value types (primarily for use on .NET 1.1)."
410   - Level="1"
  381 + <Feature Id="Contrib" Title="Contributions (Unsupported)" Level="1" AllowAdvertise="no">
  382 + <Feature Id="UserTypes" Level="1" Title="User Types" Description="Extensions for NHibernate to support non-standard types."
411 383 AllowAdvertise="no">
412   - <ComponentRef Id="Nullables.dll_net20" />
413   - <ComponentRef Id="Nullables.xml_net20" />
414   -
415   - <ComponentRef Id="Nullables.NHibernate.dll_net20" />
416   - <ComponentRef Id="Nullables.NHibernate.xml_net20" />
417   -
418   - <ComponentRef Id="Nullables.dll_net11" />
419   - <ComponentRef Id="Nullables.xml_net11" />
420   -
421   - <ComponentRef Id="Nullables.NHibernate.dll_net11" />
422   - <ComponentRef Id="Nullables.NHibernate.xml_net11" />
  384 + <Feature Id="Nullables"
  385 + Title="Nullables"
  386 + Description="Provides nullable versions of standard value types (primarily for use on .NET 1.1)."
  387 + Level="1"
  388 + AllowAdvertise="no">
  389 + <ComponentRef Id="Nullables.dll_net20" />
  390 + <ComponentRef Id="Nullables.xml_net20" />
  391 +
  392 + <ComponentRef Id="Nullables.NHibernate.dll_net20" />
  393 + <ComponentRef Id="Nullables.NHibernate.xml_net20" />
  394 +
  395 + <ComponentRef Id="Nullables.dll_net11" />
  396 + <ComponentRef Id="Nullables.xml_net11" />
  397 +
  398 + <ComponentRef Id="Nullables.NHibernate.dll_net11" />
  399 + <ComponentRef Id="Nullables.NHibernate.xml_net11" />
  400 + </Feature>
  401 +
  402 + <Feature Id="OracleUserTypes" Title="Oracle-Specific User Types" Level="1" AllowAdvertise="no">
  403 + <ComponentRef Id="NHibernate.UserTypes.Oracle.dll_net20" />
  404 + <ComponentRef Id="NHibernate.UserTypes.Oracle.xml_net20" />
  405 +
  406 + <ComponentRef Id="NHibernate.UserTypes.Oracle.dll_net11" />
  407 + <ComponentRef Id="NHibernate.UserTypes.Oracle.xml_net11" />
  408 + </Feature>
  409 +
  410 + <Feature Id="SqlUserTypes" Title="SQL Server-Specific User Types" Level="1" AllowAdvertise="no">
  411 + <ComponentRef Id="NHibernate.UserTypes.SqlTypes.dll_net20" />
  412 + <ComponentRef Id="NHibernate.UserTypes.SqlTypes.xml_net20" />
  413 +
  414 + <ComponentRef Id="NHibernate.UserTypes.SqlTypes.dll_net11" />
  415 + <ComponentRef Id="NHibernate.UserTypes.SqlTypes.xml_net11" />
  416 + </Feature>
423 417 </Feature>
424 418
425   - <Feature Id="OracleUserTypes" Title="Oracle-Specific User Types" Level="1" AllowAdvertise="no">
426   - <ComponentRef Id="NHibernate.UserTypes.Oracle.dll_net20" />
427   - <ComponentRef Id="NHibernate.UserTypes.Oracle.xml_net20" />
428   -
429   - <ComponentRef Id="NHibernate.UserTypes.Oracle.dll_net11" />
430   - <ComponentRef Id="NHibernate.UserTypes.Oracle.xml_net11" />
  419 + <Feature Id="CacheProviders" Level="1" Title="Cache Providers"
  420 + Description="Second-level cache provider implementations." AllowAdvertise="no">
  421 +
  422 + <Feature Id="Memcached" Title="Memcached Cache Provider" Level="1" AllowAdvertise="no">
  423 + <ComponentRef Id="NHibernate.Caches.MemCache.dll_net20" />
  424 + <ComponentRef Id="NHibernate.Caches.MemCache.xml_net20" />
  425 +
  426 + <ComponentRef Id="ICSharpCode.SharpZipLib.dll_net20" />
  427 + <ComponentRef Id="Memcached.ClientLibrary.dll_net20" />
  428 + <ComponentRef Id="Memcached.ClientLibrary.license.txt_net20" />
  429 +
  430 + <ComponentRef Id="NHibernate.Caches.MemCache.dll_net11" />
  431 + <ComponentRef Id="NHibernate.Caches.MemCache.xml_net11" />
  432 +
  433 + <ComponentRef Id="ICSharpCode.SharpZipLib.dll_net11" />
  434 + <ComponentRef Id="Memcached.ClientLibrary.dll_net11" />
  435 + <ComponentRef Id="Memcached.ClientLibrary.license.txt_net11" />
  436 + </Feature>
  437 +
  438 + <Feature Id="Prevalence" Title="Prevalence Cache Provider" Level="1" AllowAdvertise="no">
  439 + <ComponentRef Id="Bamboo.Prevalence.dll_net20" />
  440 + <ComponentRef Id="Bamboo.Prevalence.license.txt_net20"/>
  441 + <ComponentRef Id="Bamboo.Prevalence.Util.dll_net20" />
  442 + <ComponentRef Id="NHibernate.Caches.Prevalence.dll_net20" />
  443 + <ComponentRef Id="NHibernate.Caches.Prevalence.xml_net20" />
  444 +
  445 + <ComponentRef Id="Bamboo.Prevalence.dll_net11" />
  446 + <ComponentRef Id="Bamboo.Prevalence.license.txt_net11"/>
  447 + <ComponentRef Id="Bamboo.Prevalence.Util.dll_net11" />
  448 + <ComponentRef Id="NHibernate.Caches.Prevalence.dll_net11" />
  449 + <ComponentRef Id="NHibernate.Caches.Prevalence.xml_net11" />
  450 + </Feature>
  451 +
  452 + <Feature Id="SysCache" Title="SysCache Cache Provider" Level="1" AllowAdvertise="no">
  453 + <ComponentRef Id="NHibernate.Caches.SysCache.dll_net20" />
  454 + <ComponentRef Id="NHibernate.Caches.SysCache.xml_net20" />
  455 +
  456 + <ComponentRef Id="NHibernate.Caches.SysCache.dll_net11" />
  457 + <ComponentRef Id="NHibernate.Caches.SysCache.xml_net11" />
  458 + </Feature>
431 459 </Feature>
432 460
433   - <Feature Id="SqlUserTypes" Title="SQL Server-Specific User Types" Level="1" AllowAdvertise="no">
434   - <ComponentRef Id="NHibernate.UserTypes.SqlTypes.dll_net20" />
435   - <ComponentRef Id="NHibernate.UserTypes.SqlTypes.xml_net20" />
  461 + <Feature Id="Attributes" Title="Mapping Attributes" Level="1" AllowAdvertise="no">
  462 + <ComponentRef Id="NHibernate.Mapping.Attributes.dll_net20" />
  463 + <ComponentRef Id="NHibernate.Mapping.Attributes.xml_net20" />
436 464
437   - <ComponentRef Id="NHibernate.UserTypes.SqlTypes.dll_net11" />
438   - <ComponentRef Id="NHibernate.UserTypes.SqlTypes.xml_net11" />
  465 + <ComponentRef Id="NHibernate.Mapping.Attributes.dll_net11" />
  466 + <ComponentRef Id="NHibernate.Mapping.Attributes.xml_net11" />
439 467 </Feature>
440   - </Feature>
441   -
442   - <Feature Id="CacheProviders" Level="1" Title="Cache Providers"
443   - Description="Second-level cache provider implementations." AllowAdvertise="no">
444   -
445   - <Feature Id="Memcached" Title="Memcached Cache Provider" Level="1" AllowAdvertise="no">
446   - <ComponentRef Id="NHibernate.Caches.MemCache.dll_net20" />
447   - <ComponentRef Id="NHibernate.Caches.MemCache.xml_net20" />
448 468
449   - <ComponentRef Id="ICSharpCode.SharpZipLib.dll_net20" />
450   - <ComponentRef Id="Memcached.ClientLibrary.dll_net20" />
451   - <ComponentRef Id="Memcached.ClientLibrary.license.txt_net20" />
  469 + <Feature Id="Tools" Title="Tools" Level="1" AllowAdvertise="no">
  470 +
  471 + <Feature Id="Hbm2net" Title="hbm2net" Level="1" AllowAdvertise="no">
  472 + <ComponentRef Id="NHibernate.Tool.hbm2net.Console.exe_net20" />
  473 + <ComponentRef Id="NHibernate.Tool.hbm2net.dll_net20" />
  474 + <ComponentRef Id="NHibernate.Tool.hbm2net.xml_net20" />
  475 + <ComponentRef Id="NVelocity.dll_net20" />
  476 + <ComponentRef Id="NVelocity.license.txt_net20" />
  477 +
  478 + <ComponentRef Id="NHibernate.Tool.hbm2net.Console.exe_net11" />
  479 + <ComponentRef Id="NHibernate.Tool.hbm2net.dll_net11" />
  480 + <ComponentRef Id="NHibernate.Tool.hbm2net.xml_net11" />
  481 + <ComponentRef Id="NVelocity.dll_net11" />
  482 + <ComponentRef Id="NVelocity.license.txt_net11" />
  483 + </Feature>
  484 +
  485 + <Feature Id="NAntTasks" Title="NAnt Tasks" Level="1" AllowAdvertise="no">
  486 + <ComponentRef Id="NHibernate.Tasks.dll_net20" />
  487 + <ComponentRef Id="NHibernate.Tasks.xml_net20" />
  488 + <ComponentRef Id="log4net.dll_nant_net20" />
  489 + <ComponentRef Id="NAnt.Core.dll_net20" />
  490 + <ComponentRef Id="NAnt.Core.xml_net20" />
  491 + <ComponentRef Id="NAnt.Core.license.txt_net20" />
  492 +
  493 + <ComponentRef Id="NHibernate.Tasks.dll_net11" />
  494 + <ComponentRef Id="NHibernate.Tasks.xml_net11" />
  495 + <ComponentRef Id="log4net.dll_nant_net11" />
  496 + <ComponentRef Id="NAnt.Core.dll_net11" />
  497 + <ComponentRef Id="NAnt.Core.xml_net11" />
  498 + <ComponentRef Id="NAnt.Core.license.txt_net11" />
  499 + </Feature>
452 500
453   - <ComponentRef Id="NHibernate.Caches.MemCache.dll_net11" />
454   - <ComponentRef Id="NHibernate.Caches.MemCache.xml_net11" />
455   -
456   - <ComponentRef Id="ICSharpCode.SharpZipLib.dll_net11" />
457   - <ComponentRef Id="Memcached.ClientLibrary.dll_net11" />
458   - <ComponentRef Id="Memcached.ClientLibrary.license.txt_net11" />
459 501 </Feature>
460 502
461   - <Feature Id="Prevalence" Title="Prevalence Cache Provider" Level="1" AllowAdvertise="no">
462   - <ComponentRef Id="Bamboo.Prevalence.dll_net20" />
463   - <ComponentRef Id="Bamboo.Prevalence.license.txt_net20"/>
464   - <ComponentRef Id="Bamboo.Prevalence.Util.dll_net20" />
465   - <ComponentRef Id="NHibernate.Caches.Prevalence.dll_net20" />
466   - <ComponentRef Id="NHibernate.Caches.Prevalence.xml_net20" />
467   -
468   - <ComponentRef Id="Bamboo.Prevalence.dll_net11" />
469   - <ComponentRef Id="Bamboo.Prevalence.license.txt_net11"/>
470   - <ComponentRef Id="Bamboo.Prevalence.Util.dll_net11" />
471   - <ComponentRef Id="NHibernate.Caches.Prevalence.dll_net11" />
472   - <ComponentRef Id="NHibernate.Caches.Prevalence.xml_net11" />
473   - </Feature>
  503 + <Feature Id="JetDriver" Title="Driver for Microsoft Access (Jet DB)" Level="1" AllowAdvertise="no">
  504 + <ComponentRef Id="NHibernate.JetDriver.dll_net20" />
  505 + <ComponentRef Id="NHibernate.JetDriver.xml_net20" />
474 506
475   - <Feature Id="SysCache" Title="SysCache Cache Provider" Level="1" AllowAdvertise="no">
476   - <ComponentRef Id="NHibernate.Caches.SysCache.dll_net20" />
477   - <ComponentRef Id="NHibernate.Caches.SysCache.xml_net20" />
478   -
479   - <ComponentRef Id="NHibernate.Caches.SysCache.dll_net11" />
480   - <ComponentRef Id="NHibernate.Caches.SysCache.xml_net11" />
  507 + <ComponentRef Id="NHibernate.JetDriver.dll_net11" />
  508 + <ComponentRef Id="NHibernate.JetDriver.xml_net11" />
481 509 </Feature>
482 510 </Feature>
483   -
484   - <Feature Id="Attributes" Title="Mapping Attributes" Level="1" AllowAdvertise="no">
485   - <ComponentRef Id="NHibernate.Mapping.Attributes.dll_net20" />
486   - <ComponentRef Id="NHibernate.Mapping.Attributes.xml_net20" />
487   -
488   - <ComponentRef Id="NHibernate.Mapping.Attributes.dll_net11" />
489   - <ComponentRef Id="NHibernate.Mapping.Attributes.xml_net11" />
490   - </Feature>
491   -
492   - <Feature Id="Tools" Title="Tools" Level="1" AllowAdvertise="no">
493   -
494   - <Feature Id="Hbm2net" Title="hbm2net" Level="1" AllowAdvertise="no">
495   - <ComponentRef Id="NHibernate.Tool.hbm2net.Console.exe_net20" />
496   - <ComponentRef Id="NHibernate.Tool.hbm2net.dll_net20" />
497   - <ComponentRef Id="NHibernate.Tool.hbm2net.xml_net20" />
498   - <ComponentRef Id="NVelocity.dll_net20" />
499   - <ComponentRef Id="NVelocity.license.txt_net20" />
500   -
501   - <ComponentRef Id="NHibernate.Tool.hbm2net.Console.exe_net11" />
502   - <ComponentRef Id="NHibernate.Tool.hbm2net.dll_net11" />
503   - <ComponentRef Id="NHibernate.Tool.hbm2net.xml_net11" />
504   - <ComponentRef Id="NVelocity.dll_net11" />
505   - <ComponentRef Id="NVelocity.license.txt_net11" />
506   - </Feature>
507   -
508   - <Feature Id="NAntTasks" Title="NAnt Tasks" Level="1" AllowAdvertise="no">
509   - <ComponentRef Id="NHibernate.Tasks.dll_net20" />
510   - <ComponentRef Id="NHibernate.Tasks.xml_net20" />
511   - <ComponentRef Id="log4net.dll_nant_net20" />
512   - <ComponentRef Id="NAnt.Core.dll_net20" />
513   - <ComponentRef Id="NAnt.Core.xml_net20" />
514   - <ComponentRef Id="NAnt.Core.license.txt_net20" />
515   -
516   - <ComponentRef Id="NHibernate.Tasks.dll_net11" />
517   - <ComponentRef Id="NHibernate.Tasks.xml_net11" />
518   - <ComponentRef Id="log4net.dll_nant_net11" />
519   - <ComponentRef Id="NAnt.Core.dll_net11" />
520   - <ComponentRef Id="NAnt.Core.xml_net11" />
521   - <ComponentRef Id="NAnt.Core.license.txt_net11" />
522   - </Feature>
523   -
524   - </Feature>
525   -
526   - <Feature Id="JetDriver" Title="Driver for Microsoft Access (Jet DB)" Level="1" AllowAdvertise="no">
527   - <ComponentRef Id="NHibernate.JetDriver.dll_net20" />
528   - <ComponentRef Id="NHibernate.JetDriver.xml_net20" />
529   -
530   - <ComponentRef Id="NHibernate.JetDriver.dll_net11" />
531   - <ComponentRef Id="NHibernate.JetDriver.xml_net11" />
532   - </Feature>
533 511 </Feature>
534   - </Feature>
535 512
536   - <Feature Id="SourceCode" Title="Source Code" Level="1">
537   - <ComponentRef Id="SourceZip" />
538   - </Feature>
539   -
540   - <Feature Id="Documentation" Title="Documentation" Level="1">
541   - <Feature Id="ApiDocumentation" Title="API Documentation" Level="1">
542   - <ComponentRef Id="NHibernate.API.chm" />
543   - <Feature Id="ApiDocumentationVS" Title="Integrated API Documentation" Level="1"
544   - Description="API documentation for NHibernate integrated into Visual Studio 2005">
545   - <MergeRef Id="Merge.HelpReg"/>
546   - <MergeRef Id="Merge.VSIPCC" />
547   - <ComponentRef Id="NHibernate.API.VSHelp" />
548   - </Feature>
  513 + <Feature Id="SourceCode" Title="Source Code" Level="1">
  514 + <ComponentRef Id="SourceZip" />
549 515 </Feature>
550   - <Feature Id="Reference" Title="Reference" Level="1">
  516 +
  517 + <Feature Id="Reference" Title="Reference Manual" Level="1"
  518 + Description="NHibernate reference manual in HTML Help (.chm) and PDF formats. API documentation is available as a separate download.">
551 519 <ComponentRef Id="NHibernate.Documentation.chm" />
552 520 <ComponentRef Id="nhibernate_reference.pdf" />
553 521 </Feature>
554 522 </Feature>
555 523
556 524 <WixVariable Id="WixUILicenseRtf" Value="lgpl.rtf" />
557   - <UIRef Id="WixUI_Mondo" />
  525 + <UIRef Id="WixUI_FeatureTree" />
558 526 <UIRef Id="WixUI_ErrorProgressText" />
559   -
560   - <InstallExecuteSequence>
561   - <InstallFinalize Sequence="7800" />
562   - </InstallExecuteSequence>
563 527 </Product>
564 528 </Wix>

0 comments on commit 76d7a53

Please sign in to comment.
Something went wrong with that request. Please try again.