RC2 Preparations, version update for the next build

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2554 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4

Greenshot/AssemblyInfo.cs.template

@@ -47,4 +47,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

Greenshot/releases/innosetup/setup.iss

@@ -1,16 +1,5 @@
 #define ExeName "Greenshot"
-#define Version "1.1.1.$WCREV$"
+#define Version "1.1.2.$WCREV$"
-
-; Include the scripts to install .NET Framework 2.0
-; See http://www.codeproject.com/KB/install/dotnetfx_innosetup_instal.aspx
-#include "scripts\products.iss"
-#include "scripts\products\winversion.iss"
-#include "scripts\products\fileversion.iss"
-#include "scripts\products\msi20.iss"
-#include "scripts\products\msi31.iss"
-#include "scripts\products\dotnetfx20.iss"
-#include "scripts\products\dotnetfx20sp1.iss"
-#include "scripts\products\dotnetfx20sp2.iss"
 
 [Files]
 Source: ..\..\bin\Release\Greenshot.exe; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
@@ -292,7 +281,7 @@ Name: "plugins\office"; Description: {cm:office}; Types: default full custom; Fl
 Name: "plugins\ocr"; Description: {cm:ocr}; Types: default full custom; Flags: disablenouninstallwarning 
 Name: "plugins\jira"; Description: {cm:jira}; Types: full custom; Flags: disablenouninstallwarning 
 Name: "plugins\imgur"; Description: {cm:imgur}; Types: default full custom; Flags: disablenouninstallwarning 
-Name: "plugins\confluence"; Description: {cm:confluence}; Types: full custom; Flags: disablenouninstallwarning; Check: hasDotNet35FullOrHigher()
+Name: "plugins\confluence"; Description: {cm:confluence}; Types: full custom; Flags: disablenouninstallwarning
 Name: "plugins\externalcommand"; Description: {cm:externalcommand}; Types: default full custom; Flags: disablenouninstallwarning 
 ;Name: "plugins\networkimport"; Description: "Network Import Plugin"; Types: full
 Name: "plugins\box"; Description: "Box Plugin"; Types: full custom; Flags: disablenouninstallwarning
@@ -510,61 +499,6 @@ begin
 	Result := returnValue;
 end;
 
-function hasDotNet(version: string; service: cardinal): Boolean;
-// Indicates whether the specified version and service pack of the .NET Framework is installed.
-//
-// version -- Specify one of these strings for the required .NET Framework version:
-//    'v1.1.4322'     .NET Framework 1.1
-//    'v2.0.50727'    .NET Framework 2.0
-//    'v3.0'          .NET Framework 3.0
-//    'v3.5'          .NET Framework 3.5
-//    'v4\Client'     .NET Framework 4.0 Client Profile
-//    'v4\Full'       .NET Framework 4.0 Full Installation
-//
-// service -- Specify any non-negative integer for the required service pack level:
-//    0               No service packs required
-//    1, 2, etc.      Service pack 1, 2, etc. required
-var
-    key: string;
-    install, serviceCount: cardinal;
-    success: boolean;
-begin
-    key := 'SOFTWARE\Microsoft\NET Framework Setup\NDP\' + version;
-    // .NET 3.0 uses value InstallSuccess in subkey Setup
-    if Pos('v3.0', version) = 1 then begin
-        success := RegQueryDWordValue(HKLM, key + '\Setup', 'InstallSuccess', install);
-    end else begin
-        success := RegQueryDWordValue(HKLM, key, 'Install', install);
-    end;
-    // .NET 4.0 uses value Servicing instead of SP
-    if Pos('v4', version) = 1 then begin
-        success := success and RegQueryDWordValue(HKLM, key, 'Servicing', serviceCount);
-    end else begin
-        success := success and RegQueryDWordValue(HKLM, key, 'SP', serviceCount);
-    end;
-    result := success and (install = 1) and (serviceCount >= service);
-end;
-
-function hasDotNet20() : boolean;
-begin
-	Result := hasDotNet('v2.0.50727',0);
-end;
-
-function hasDotNet40() : boolean;
-begin
-	Result := hasDotNet('v4\Client',0) or hasDotNet('v4\Full',0);
-end;
-
-function hasDotNet35FullOrHigher() : boolean;
-begin
-	Result := hasDotNet('v3.5',0) or hasDotNet('v4\Full',0) or hasDotNet('4.5\Full',0);
-end;
-
-function hasDotNet35OrHigher() : boolean;
-begin
-	Result := hasDotNet('v3.5',0) or hasDotNet('v4\Client',0) or hasDotNet('v4\Full',0) or hasDotNet('4.5\Client',0) or hasDotNet('4.5\Full',0);
-end;
-
 function getNGENPath(argument: String) : String;
 var
 	installPath: string;
@@ -582,30 +516,6 @@ begin
 	Result := installPath;
 end;
 
-// Initialize the setup
-function InitializeSetup(): Boolean;
-begin
-	// Only check for 2.0 and install if we don't have .net 3.5 or higher
-	if not hasDotNet35OrHigher() then
-	begin
-		// Enhance installer otherwise .NET installations won't work
-		msi20('2.0');
-		msi31('3.0');
-		
-		//install .netfx 2.0 sp2 if possible; if not sp1 if possible; if not .netfx 2.0
-		if minwinversion(5, 1) then begin
-			dotnetfx20sp2();
-		end else begin
-			if minwinversion(5, 0) and minwinspversion(5, 0, 4) then begin
-				// kb835732();
-				dotnetfx20sp1();
-			end else begin
-				dotnetfx20();
-			end;
-		end;
-	end;
-	Result := true;
-end;
 [Run]
 Filename: "{code:getNGENPath}\ngen.exe"; Parameters: "install ""{app}\{#ExeName}.exe"""; StatusMsg: "{cm:optimize}"; Flags: runhidden runasoriginaluser
 Filename: "{code:getNGENPath}\ngen.exe"; Parameters: "install ""{app}\GreenshotPlugin.dll"""; StatusMsg: "{cm:optimize}"; Flags: runhidden runasoriginaluser

Greenshot/releases/package.bat

@@ -23,6 +23,6 @@ del /s *.bak
 del /s *installer*.xml
 del /s *website*.xml
 del /s *template.txt
-..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.1.$WCREV$-RC1.zip *
+..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.2.$WCREV$-RC1.zip *
 cd ..
 rmdir /s /q NO-INSTALLER

GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template

@@ -50,4 +50,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template

@@ -51,4 +51,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

GreenshotPlugin/Properties/AssemblyInfo.cs.template

@@ -48,4 +48,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.1.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]

PluginExample/Properties/AssemblyInfo.cs.template

@@ -52,4 +52,4 @@ using Greenshot.Plugin;
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.7.$WCREV$")]
+[assembly: AssemblyVersion("1.1.2.$WCREV$")]