WinGui:

- Sort the versioning out for the upcoming release.
- Move the EnumHelper to the correct library. It was in the wrong place.

git-svn-id: svn://localhost/HandBrake/trunk@3699 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs b/win/C#/HandBrake.ApplicationServices/Functions/EnumHelper.cs
similarity index 92%
rename from win/C#/HandBrake.Framework/Helpers/EnumHelper.cs
rename to win/C#/HandBrake.ApplicationServices/Functions/EnumHelper.cs
index 6400811..6cf7342 100644 (file)
--- a/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs
+++ b/win/C#/HandBrake.ApplicationServices/Functions/EnumHelper.cs
@@ -3,7 +3,7 @@
     Homepage: <http://handbrake.fr>.\r
     It may be used under the terms of the GNU General Public License. */\r
 \r
-namespace HandBrake.Framework.Helpers\r
+namespace HandBrake.ApplicationServices.Functions\r
 {\r
     using System.ComponentModel;\r
     using System.Reflection;\r

diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index ba0e3a6..8b9d7e3 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -77,6 +77,7 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="EncodeProgressEventArgs.cs" />\r
+    <Compile Include="Functions\EnumHelper.cs" />\r
     <Compile Include="Functions\Logging.cs" />\r
     <Compile Include="Functions\GrowlCommunicator.cs" />\r
     <Compile Include="Functions\Main.cs" />\r

diff --git a/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs b/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs
index 2d94e45..4bf9458 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs
+++ b/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs
@@ -9,8 +9,8 @@ namespace HandBrake.ApplicationServices.Parsing
     using System.IO;\r
     using System.Text.RegularExpressions;\r
 \r
+    using HandBrake.ApplicationServices.Functions;\r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.Framework.Helpers;\r
 \r
     /// <summary>\r
     /// An object that represents a subtitle associated with a Title, in a DVD\r

diff --git a/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl b/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
index 840bd82..ebf7426 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
+++ b/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
@@ -38,5 +38,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers \r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("0.9.4.$WCREV$")]\r
+[assembly: AssemblyVersion("0.9.5.$WCREV$")]\r
 [assembly: NeutralResourcesLanguage("")]\r

diff --git a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
index 30c5ea6..8d806e5 100644 (file)
--- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
+++ b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
@@ -55,7 +55,6 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="Services\AppcastReader.cs" />\r
-    <Compile Include="Helpers\EnumHelper.cs" />\r
     <Compile Include="Model\UpdateCheckResult.cs" />\r
     <Compile Include="Model\UpdateCheckInformation.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r

diff --git a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs b/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs
index 668d8a6..ff59dce 100644 (file)
--- a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs
+++ b/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs
@@ -6,8 +6,6 @@
 namespace HandBrake.Framework.Model\r
 {\r
     using System;\r
-    using HandBrake.Framework.Helpers;\r
-    using HandBrake.Framework.Services;\r
     using HandBrake.Framework.Services.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/C#/HandBrake.Framework/Services/UpdateService.cs b/win/C#/HandBrake.Framework/Services/UpdateService.cs
index 31fb855..0bbd781 100644 (file)
--- a/win/C#/HandBrake.Framework/Services/UpdateService.cs
+++ b/win/C#/HandBrake.Framework/Services/UpdateService.cs
@@ -10,7 +10,6 @@ namespace HandBrake.Framework.Services
     using System.Net;\r
     using System.Threading;\r
 \r
-    using HandBrake.Framework.Helpers;\r
     using HandBrake.Framework.Model;\r
     using HandBrake.Framework.Services.Interfaces;\r
 \r

diff --git a/win/C#/Properties/AssemblyInfo.cs.tmpl b/win/C#/Properties/AssemblyInfo.cs.tmpl
index eab0c05..bb0c881 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs.tmpl
+++ b/win/C#/Properties/AssemblyInfo.cs.tmpl
@@ -38,5 +38,5 @@ using System.Runtime.InteropServices;
 //      Revision\r
 //\r
 \r
-[assembly: AssemblyVersion("0.9.4.$WCREV$")]\r
+[assembly: AssemblyVersion("0.9.5.$WCREV$")]\r
 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file