Preparations for the release 1.1.4

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2598 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-04-30 11:34:45 +00:00
commit 8dd5a3e825
19 changed files with 22 additions and 22 deletions

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -21,8 +21,8 @@ CommercialUse=true
EULAVersion=true
[Version]
PackageVersion=1.1.3.$WCREV$
DisplayVersion=1.1.3.$WCREV$-RC3
PackageVersion=1.1.4.$WCREV$
DisplayVersion=1.1.4.$WCREV$
[SpecialPaths]
Plugins=NONE

View file

@ -1,5 +1,5 @@
#define ExeName "Greenshot"
#define Version "1.1.3.$WCREV$"
#define Version "1.1.4.$WCREV$"
; Include the scripts to install .NET Framework 2.0
; See http://www.codeproject.com/KB/install/dotnetfx_innosetup_instal.aspx
@ -119,7 +119,7 @@ InfoBeforeFile=..\additional_files\readme.txt
LicenseFile=..\additional_files\license.txt
LanguageDetectionMethod=uilanguage
MinVersion=0,5.01.2600
OutputBaseFilename={#ExeName}-INSTALLER-{#Version}-RC3
OutputBaseFilename={#ExeName}-INSTALLER-{#Version}
OutputDir=..\
PrivilegesRequired=none
SetupIconFile=..\..\icons\applicationIcon\icon.ico

View file

@ -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.3.$WCREV$-RC3.zip *
..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.4.$WCREV$.zip *
cd ..
rmdir /s /q NO-INSTALLER

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.1.4.0")]
[assembly: AssemblyFileVersion("1.1.4.0")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -247,7 +247,7 @@ namespace GreenshotPlugin.Core {
public string LastSaveWithVersion;
// Specifies what THIS build is
public BuildStates BuildState = BuildStates.RELEASE_CANDIDATE;
public BuildStates BuildState = BuildStates.RELEASE;
/// <summary>
/// A helper method which returns true if the supplied experimental feature is enabled

View file

@ -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.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]

View file

@ -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.1.3.$WCREV$")]
[assembly: AssemblyVersion("1.1.4.$WCREV$")]