From 8dd5a3e8252243a32c673fbd3420d8c9b7f8d7c6 Mon Sep 17 00:00:00 2001 From: RKrom Date: Tue, 30 Apr 2013 11:34:45 +0000 Subject: [PATCH] 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 --- Greenshot/AssemblyInfo.cs.template | 2 +- Greenshot/releases/appinfo.ini.template | 4 ++-- Greenshot/releases/innosetup/setup.iss | 4 ++-- Greenshot/releases/package_zip.bat | 2 +- GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template | 2 +- GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template | 2 +- GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template | 2 +- GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template | 2 +- GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template | 2 +- GreenshotOCRCommand/Properties/AssemblyInfo.cs | 4 ++-- GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template | 2 +- GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template | 2 +- GreenshotPlugin/Core/CoreConfiguration.cs | 2 +- GreenshotPlugin/Properties/AssemblyInfo.cs.template | 2 +- PluginExample/Properties/AssemblyInfo.cs.template | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Greenshot/AssemblyInfo.cs.template b/Greenshot/AssemblyInfo.cs.template index 2d660bfff..8e855aa32 100644 --- a/Greenshot/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/Greenshot/releases/appinfo.ini.template b/Greenshot/releases/appinfo.ini.template index a519d60c0..1189db6b3 100644 --- a/Greenshot/releases/appinfo.ini.template +++ b/Greenshot/releases/appinfo.ini.template @@ -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 diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss index 59a75ff1b..90a4b4d9c 100644 --- a/Greenshot/releases/innosetup/setup.iss +++ b/Greenshot/releases/innosetup/setup.iss @@ -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 diff --git a/Greenshot/releases/package_zip.bat b/Greenshot/releases/package_zip.bat index b220325f4..03a0efeb6 100644 --- a/Greenshot/releases/package_zip.bat +++ b/Greenshot/releases/package_zip.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.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 diff --git a/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template b/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template index f6f006574..419a6fc88 100644 --- a/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template b/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template index 725e6bdcb..18b2ede5e 100644 --- a/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.4.$WCREV$")] \ No newline at end of file diff --git a/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template b/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template index 4762881e2..b42ce24d4 100644 --- a/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template b/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template index fc60c6504..08d093bd7 100644 --- a/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template b/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template index 62d5375aa..7e01b9dcf 100644 --- a/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template b/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template index 752f1da06..358d61ac9 100644 --- a/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template b/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template index 2d634f938..38ea09469 100644 --- a/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.4.$WCREV$")] \ No newline at end of file diff --git a/GreenshotOCRCommand/Properties/AssemblyInfo.cs b/GreenshotOCRCommand/Properties/AssemblyInfo.cs index bfc901eec..8baa671dc 100644 --- a/GreenshotOCRCommand/Properties/AssemblyInfo.cs +++ b/GreenshotOCRCommand/Properties/AssemblyInfo.cs @@ -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")] diff --git a/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template b/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template index d5b1a22c5..923e2bdce 100644 --- a/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template b/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template index e268231bf..2e6452dc9 100644 --- a/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template index ecb89ab3b..022aa7b52 100644 --- a/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template index 352813cce..8b8a1f527 100644 --- a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/GreenshotPlugin/Core/CoreConfiguration.cs b/GreenshotPlugin/Core/CoreConfiguration.cs index 9af32f638..569d5b6b2 100644 --- a/GreenshotPlugin/Core/CoreConfiguration.cs +++ b/GreenshotPlugin/Core/CoreConfiguration.cs @@ -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; /// /// A helper method which returns true if the supplied experimental feature is enabled diff --git a/GreenshotPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPlugin/Properties/AssemblyInfo.cs.template index 6f6bb0ba3..8c8a614b3 100644 --- a/GreenshotPlugin/Properties/AssemblyInfo.cs.template +++ b/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.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")] diff --git a/PluginExample/Properties/AssemblyInfo.cs.template b/PluginExample/Properties/AssemblyInfo.cs.template index c0548738e..4ceea25ef 100644 --- a/PluginExample/Properties/AssemblyInfo.cs.template +++ b/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.1.3.$WCREV$")] +[assembly: AssemblyVersion("1.1.4.$WCREV$")]