Updated wix installer

CameraControl.Core/Properties/AssemblyInfo.cs

@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.25.0")]
-[assembly: AssemblyFileVersion("2.0.25.0")]
+[assembly: AssemblyVersion("2.0.26.0")]
+[assembly: AssemblyFileVersion("2.0.26.0")]

CameraControl/Properties/AssemblyInfo.cs

@@ -86,5 +86,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.25.0")]
-[assembly: AssemblyFileVersion("2.0.25.0")]
+[assembly: AssemblyVersion("2.0.26.0")]
+[assembly: AssemblyFileVersion("2.0.26.0")]

Setup/Setup.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>Setup</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>35c254aa</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>4d103d19</NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -57,11 +57,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BootstrapperCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
-      <HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\BootstrapperCore.dll</HintPath>
+      <HintPath>..\packages\WixSharp.bin.1.0.36.0\lib\BootstrapperCore.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Deployment.WindowsInstaller, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
-      <HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
+      <HintPath>..\packages\WixSharp.bin.1.0.36.0\lib\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -73,16 +73,16 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WixSharp, Version=1.0.35.3, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
-      <HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.dll</HintPath>
+    <Reference Include="WixSharp, Version=1.0.36.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
+      <HintPath>..\packages\WixSharp.bin.1.0.36.0\lib\WixSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WixSharp.Msi, Version=1.0.35.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
-      <HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.Msi.dll</HintPath>
+      <HintPath>..\packages\WixSharp.bin.1.0.36.0\lib\WixSharp.Msi.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WixSharp.UI, Version=1.0.35.2, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
-      <HintPath>..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.UI.dll</HintPath>
+      <HintPath>..\packages\WixSharp.bin.1.0.36.0\lib\WixSharp.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -108,12 +108,12 @@ $(TargetPath)</PostBuildEvent>
   <Target Name="AfterBuild">
   </Target>
   -->
+  <UsingTask AssemblyFile="packages\WixSharp.1.0.35.3\build\SetEnvVar.dll" TaskName="SetEnvVar" />
   <Import Project="..\packages\WixSharp.1.0.35.3\build\WixSharp.targets" Condition="Exists('..\packages\WixSharp.1.0.35.3\build\WixSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\WixSharp.1.0.35.3\build\WixSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixSharp.1.0.35.3\build\WixSharp.targets'))" />
   </Target>
-  <UsingTask AssemblyFile="packages\WixSharp.1.0.35.3\build\SetEnvVar.dll" TaskName="SetEnvVar" />
 </Project>

Setup/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="WixSharp" version="1.0.35.3" targetFramework="net40" />
-  <package id="WixSharp.bin" version="1.0.35.3" targetFramework="net40" />
+  <package id="WixSharp.bin" version="1.0.36.0" targetFramework="net40" />
 </packages>

Setup/wix/Setup.g.wxs

@@ -44,7 +44,7 @@
 
     <PropertyRef Id="NETFRAMEWORK45" />
 
-    <WixVariable Id="WixUILicenseRtf" Value="d:\devel\vs2010\CameraControl\CameraControl\bin\Debug\Licenses\DigiCamControlLicence.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="f:\devel\vs2010\CameraControl\CameraControl\bin\Debug\Licenses\DigiCamControlLicence.rtf" />
 
     <Upgrade Id="357e0d80-5093-478e-8c11-28b1a72096e7">
       <UpgradeVersion Minimum="0.0.0.0" Maximum="1.0.0.0" IncludeMinimum="yes" IncludeMaximum="no" Property="UPGRADEFOUND" />

packages/WixSharp.bin.1.0.35.3/lib/WixSharp.xml → packages/WixSharp.bin.1.0.36.0/lib/WixSharp.xml

@@ -2466,11 +2466,18 @@
             <param name="id">The id.</param>
             <param name="name">The name.</param>
         </member>
+        <member name="F:WixSharp.FirewallException.Feature">
+            <summary>
+            <see cref="F:WixSharp.FirewallException.Feature"></see> the FirewallException belongs to.
+            </summary>
+        </member>
         <member name="F:WixSharp.FirewallException.IsProcessSpecific">
             <summary>
             Gets or sets a value indicating whether the exception is a process/program specific or system wide one.
             <p>If this value is set to true (default) then the exception element will be placed inside of the parent File element in the 
             emitted WiX XML, otherwise it is placed in the File's Component element.</p>
+            You can achieve the same functionality by passing FirewallException instance directly into Project constructor as a top 
+            level argument. 
             </summary>
             <value>
             <c>true</c> if this instance is process specific; otherwise, <c>false</c>.
@@ -9005,6 +9012,11 @@
             Collection of <see cref="T:WixSharp.Certificate"/> to be installed.
             </summary>
         </member>
+        <member name="F:WixSharp.Project.FirewallExceptions">
+            <summary>
+            Collection of <see cref="T:WixSharp.FirewallException"/> to be installed.
+            </summary>
+        </member>
         <member name="F:WixSharp.Project.Properties">
             <summary>
             Collection of WiX/MSI <see cref="T:WixSharp.Property"/> objects to be created during the installed.
@@ -9067,6 +9079,17 @@
         <member name="F:WixSharp.Project.BackgroundImage">
             <summary>
             Path to the file containing the image (e.g. bmp) setup dialogs background. If not specified default image will be used.
+            <remarks>
+            <para>If the image is to be used in the default ManagedUI dialogs it will be left-docked at runtime and will effectively 
+            play the role of a left-aligned dialog banner. Thus if it is too wide it can push away (to right) the all other UI elements.
+            The optimal size of the image for ManagedUI is 494x312.</para>
+            </remarks>
+            </summary>
+        </member>
+        <member name="F:WixSharp.Project.ValidateBackgroundImage">
+            <summary>
+            Performs validation of aspect ratio for <see cref="F:WixSharp.Project.BackgroundImage"/>. Validation assists with avoiding the situations 
+            when ManagedUI dialog has UI elements 'pushed away' from the view by oversizes <see cref="F:WixSharp.Project.BackgroundImage"/>.
             </summary>
         </member>
         <member name="P:WixSharp.Project.DefaultFeature">