diff --git a/CameraControl.Core/Properties/AssemblyInfo.cs b/CameraControl.Core/Properties/AssemblyInfo.cs index 8ea5e1618..dcfce4e26 100644 --- a/CameraControl.Core/Properties/AssemblyInfo.cs +++ b/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")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.26.0")] +[assembly: AssemblyFileVersion("2.0.26.0")] \ No newline at end of file diff --git a/CameraControl/Properties/AssemblyInfo.cs b/CameraControl/Properties/AssemblyInfo.cs index a0a80f431..e10bd9b58 100644 --- a/CameraControl/Properties/AssemblyInfo.cs +++ b/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")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.26.0")] +[assembly: AssemblyFileVersion("2.0.26.0")] \ No newline at end of file diff --git a/Setup/Setup.csproj b/Setup/Setup.csproj index 9e35f9c4f..2f0373433 100644 --- a/Setup/Setup.csproj +++ b/Setup/Setup.csproj @@ -11,7 +11,7 @@ Setup v4.0 512 - 35c254aa + 4d103d19 @@ -57,11 +57,11 @@ - ..\packages\WixSharp.bin.1.0.35.3\lib\BootstrapperCore.dll + ..\packages\WixSharp.bin.1.0.36.0\lib\BootstrapperCore.dll True - ..\packages\WixSharp.bin.1.0.35.3\lib\Microsoft.Deployment.WindowsInstaller.dll + ..\packages\WixSharp.bin.1.0.36.0\lib\Microsoft.Deployment.WindowsInstaller.dll True @@ -73,16 +73,16 @@ - - ..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.dll + + ..\packages\WixSharp.bin.1.0.36.0\lib\WixSharp.dll True - ..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.Msi.dll + ..\packages\WixSharp.bin.1.0.36.0\lib\WixSharp.Msi.dll True - ..\packages\WixSharp.bin.1.0.35.3\lib\WixSharp.UI.dll + ..\packages\WixSharp.bin.1.0.36.0\lib\WixSharp.UI.dll True @@ -108,6 +108,7 @@ $(TargetPath) --> + @@ -115,5 +116,4 @@ $(TargetPath) - \ No newline at end of file diff --git a/Setup/log.txt b/Setup/log.txt index 0847558bd..001ce1c5c 100644 Binary files a/Setup/log.txt and b/Setup/log.txt differ diff --git a/Setup/packages.config b/Setup/packages.config index 6ca7c7653..c1cf93661 100644 --- a/Setup/packages.config +++ b/Setup/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Setup/wix/Setup.g.wxs b/Setup/wix/Setup.g.wxs index 86bdb57dd..dc124a86e 100644 --- a/Setup/wix/Setup.g.wxs +++ b/Setup/wix/Setup.g.wxs @@ -44,7 +44,7 @@ - + diff --git a/packages/WixSharp.bin.1.0.35.3/WixSharp.bin.1.0.35.3.nupkg b/packages/WixSharp.bin.1.0.35.3/WixSharp.bin.1.0.35.3.nupkg deleted file mode 100644 index 4a352921f..000000000 Binary files a/packages/WixSharp.bin.1.0.35.3/WixSharp.bin.1.0.35.3.nupkg and /dev/null differ diff --git a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.dll b/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.dll deleted file mode 100644 index b4df444a2..000000000 Binary files a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.dll and /dev/null differ diff --git a/packages/WixSharp.bin.1.0.36.0/WixSharp.bin.1.0.36.0.nupkg b/packages/WixSharp.bin.1.0.36.0/WixSharp.bin.1.0.36.0.nupkg new file mode 100644 index 000000000..76e2ce835 Binary files /dev/null and b/packages/WixSharp.bin.1.0.36.0/WixSharp.bin.1.0.36.0.nupkg differ diff --git a/packages/WixSharp.bin.1.0.35.3/lib/BootstrapperCore.dll b/packages/WixSharp.bin.1.0.36.0/lib/BootstrapperCore.dll similarity index 100% rename from packages/WixSharp.bin.1.0.35.3/lib/BootstrapperCore.dll rename to packages/WixSharp.bin.1.0.36.0/lib/BootstrapperCore.dll diff --git a/packages/WixSharp.bin.1.0.35.3/lib/BootstrapperCore.xml b/packages/WixSharp.bin.1.0.36.0/lib/BootstrapperCore.xml similarity index 100% rename from packages/WixSharp.bin.1.0.35.3/lib/BootstrapperCore.xml rename to packages/WixSharp.bin.1.0.36.0/lib/BootstrapperCore.xml diff --git a/packages/WixSharp.bin.1.0.35.3/lib/Microsoft.Deployment.WindowsInstaller.dll b/packages/WixSharp.bin.1.0.36.0/lib/Microsoft.Deployment.WindowsInstaller.dll similarity index 100% rename from packages/WixSharp.bin.1.0.35.3/lib/Microsoft.Deployment.WindowsInstaller.dll rename to packages/WixSharp.bin.1.0.36.0/lib/Microsoft.Deployment.WindowsInstaller.dll diff --git a/packages/WixSharp.bin.1.0.35.3/lib/Microsoft.Deployment.WindowsInstaller.xml b/packages/WixSharp.bin.1.0.36.0/lib/Microsoft.Deployment.WindowsInstaller.xml similarity index 100% rename from packages/WixSharp.bin.1.0.35.3/lib/Microsoft.Deployment.WindowsInstaller.xml rename to packages/WixSharp.bin.1.0.36.0/lib/Microsoft.Deployment.WindowsInstaller.xml diff --git a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.Msi.dll b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.Msi.dll similarity index 93% rename from packages/WixSharp.bin.1.0.35.3/lib/WixSharp.Msi.dll rename to packages/WixSharp.bin.1.0.36.0/lib/WixSharp.Msi.dll index 615c4170f..eecfed4d0 100644 Binary files a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.Msi.dll and b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.Msi.dll differ diff --git a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.Msi.xml b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.Msi.xml similarity index 100% rename from packages/WixSharp.bin.1.0.35.3/lib/WixSharp.Msi.xml rename to packages/WixSharp.bin.1.0.36.0/lib/WixSharp.Msi.xml diff --git a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.UI.dll b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.UI.dll similarity index 79% rename from packages/WixSharp.bin.1.0.35.3/lib/WixSharp.UI.dll rename to packages/WixSharp.bin.1.0.36.0/lib/WixSharp.UI.dll index 4609530d6..f88a08ef4 100644 Binary files a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.UI.dll and b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.UI.dll differ diff --git a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.UI.xml b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.UI.xml similarity index 99% rename from packages/WixSharp.bin.1.0.35.3/lib/WixSharp.UI.xml rename to packages/WixSharp.bin.1.0.36.0/lib/WixSharp.UI.xml index 1f05a1a2a..38406c0a8 100644 --- a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.UI.xml +++ b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.UI.xml @@ -359,6 +359,9 @@ The standard Welcome dialog + + The standard Welcome dialog + diff --git a/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.dll b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.dll new file mode 100644 index 000000000..11a89c695 Binary files /dev/null and b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.dll differ diff --git a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.xml b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.xml similarity index 99% rename from packages/WixSharp.bin.1.0.35.3/lib/WixSharp.xml rename to packages/WixSharp.bin.1.0.36.0/lib/WixSharp.xml index 7babd18a4..ee462d1df 100644 --- a/packages/WixSharp.bin.1.0.35.3/lib/WixSharp.xml +++ b/packages/WixSharp.bin.1.0.36.0/lib/WixSharp.xml @@ -2466,11 +2466,18 @@ The id. The name. + + + the FirewallException belongs to. + + Gets or sets a value indicating whether the exception is a process/program specific or system wide one.

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.

+ You can achieve the same functionality by passing FirewallException instance directly into Project constructor as a top + level argument.
true if this instance is process specific; otherwise, false. @@ -9005,6 +9012,11 @@ Collection of to be installed.
+ + + Collection of to be installed. + + Collection of WiX/MSI objects to be created during the installed. @@ -9067,6 +9079,17 @@ Path to the file containing the image (e.g. bmp) setup dialogs background. If not specified default image will be used. + + 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. + + + + + + Performs validation of aspect ratio for . Validation assists with avoiding the situations + when ManagedUI dialog has UI elements 'pushed away' from the view by oversizes .