PUBLISH (3.3.1) with fix

cyanfish · Jun 12, 2015 · 0a1d142 · 0a1d142
1 parent 8ddf2b8
commit 0a1d142
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/NAPS2.Console/Properties/AssemblyInfo.cs b/NAPS2.Console/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.0.*")]
+[assembly: AssemblyVersion("3.3.1.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NAPS2.Core/Properties/AssemblyInfo.cs b/NAPS2.Core/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("3.3.0.*")]
-[assembly: AssemblyVersion("3.3.0.*")]
+// [assembly: AssemblyVersion("3.3.1.*")]
+[assembly: AssemblyVersion("3.3.1.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NAPS2.Setup/NAPS2.Setup.wxs b/NAPS2.Setup/NAPS2.Setup.wxs
@@ -4,7 +4,7 @@
       Id="*"
       Name="NAPS2"
       Language="1033"
-      Version="3.3.0"
+      Version="3.3.1"
       Manufacturer="Ben Olden-Cooligan"
       UpgradeCode="FEB82971-B3E6-4F19-9684-1D543E644D73">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
@@ -45,6 +45,7 @@
         <File Source="..\NAPS2\bin\InstallerMSI\Interop.WIA.dll" />
         <File Source="..\NAPS2\bin\InstallerMSI\Ninject.dll" />
         <File Source="..\NAPS2\bin\InstallerMSI\NLog.dll" />
+        <File Source="..\NAPS2\bin\InstallerMSI\NTwain.dll" />
         <File Source="..\NAPS2.Core\Resources\scanner-app.ico" />
         <File Source="..\NAPS2\Setup\lib\wiaaut.dll" />
         <File Source="..\NAPS2.Console\bin\InstallerMSI\CommandLine.dll" />

diff --git a/NAPS2/Properties/AssemblyInfo.cs b/NAPS2/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.0.*")]
+[assembly: AssemblyVersion("3.3.1.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NAPS2/Setup/setup.iss b/NAPS2/Setup/setup.iss
@@ -1,7 +1,7 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define AppVersion "3.3.0"
+#define AppVersion "3.3.1"
 
 [Setup]
 AppName=NAPS2 (Not Another PDF Scanner 2)
@@ -34,6 +34,7 @@ Source: "..\bin\InstallerEXE\PdfSharp.dll"; DestDir: "{app}"; Flags: ignoreversi
 Source: "..\bin\InstallerEXE\Interop.WIA.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\bin\InstallerEXE\Ninject.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\bin\InstallerEXE\NLog.dll"; DestDir: "{app}"; Flags: ignoreversion     
+Source: "..\bin\InstallerEXE\NTwain.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\NAPS2.Core\Resources\scanner-app.ico"; DestDir: "{app}"; Flags: ignoreversion 
 Source: "..\appsettings.xml"; DestDir: "{app}"; Flags: ignoreversion           
 Source: "license.txt"; DestDir: "{app}"; Flags: ignoreversion