diff options
| author | sr55 <[email protected]> | 2010-12-03 21:08:10 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2010-12-03 21:08:10 +0000 |
| commit | f1f5d2c1b9c020dc07d1c8e8f3c1120310972fa1 (patch) | |
| tree | 62503a261a17e48de4ed03ce2acc9ec48f047617 | |
| parent | 5d6b22826353d5028799362292cd85e5da91cfaf (diff) | |
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://svn.handbrake.fr/HandBrake/trunk@3699 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/HandBrake.ApplicationServices/Functions/EnumHelper.cs (renamed from win/C#/HandBrake.Framework/Helpers/EnumHelper.cs) | 2 | ||||
| -rw-r--r-- | win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj | 1 | ||||
| -rw-r--r-- | win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs | 2 | ||||
| -rw-r--r-- | win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl | 2 | ||||
| -rw-r--r-- | win/C#/HandBrake.Framework/HandBrake.Framework.csproj | 1 | ||||
| -rw-r--r-- | win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs | 2 | ||||
| -rw-r--r-- | win/C#/HandBrake.Framework/Services/UpdateService.cs | 1 | ||||
| -rw-r--r-- | win/C#/Properties/AssemblyInfo.cs.tmpl | 2 |
8 files changed, 5 insertions, 8 deletions
diff --git a/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs b/win/C#/HandBrake.ApplicationServices/Functions/EnumHelper.cs index 640081184..6cf7342a9 100644 --- a/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs +++ b/win/C#/HandBrake.ApplicationServices/Functions/EnumHelper.cs @@ -3,7 +3,7 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Helpers
+namespace HandBrake.ApplicationServices.Functions
{
using System.ComponentModel;
using System.Reflection;
diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index ba0e3a64e..8b9d7e30b 100644 --- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -77,6 +77,7 @@ </ItemGroup>
<ItemGroup>
<Compile Include="EncodeProgressEventArgs.cs" />
+ <Compile Include="Functions\EnumHelper.cs" />
<Compile Include="Functions\Logging.cs" />
<Compile Include="Functions\GrowlCommunicator.cs" />
<Compile Include="Functions\Main.cs" />
diff --git a/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs b/win/C#/HandBrake.ApplicationServices/Parsing/Subtitle.cs index 2d94e45f2..4bf9458c0 100644 --- 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;
using System.Text.RegularExpressions;
+ using HandBrake.ApplicationServices.Functions;
using HandBrake.ApplicationServices.Model;
- using HandBrake.Framework.Helpers;
/// <summary>
/// An object that represents a subtitle associated with a Title, in a DVD
diff --git a/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl b/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl index 840bd82df..ebf742688 100644 --- 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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.4.$WCREV$")]
+[assembly: AssemblyVersion("0.9.5.$WCREV$")]
[assembly: NeutralResourcesLanguage("")]
diff --git a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj index 30c5ea6d6..8d806e5b8 100644 --- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj +++ b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj @@ -55,7 +55,6 @@ </ItemGroup>
<ItemGroup>
<Compile Include="Services\AppcastReader.cs" />
- <Compile Include="Helpers\EnumHelper.cs" />
<Compile Include="Model\UpdateCheckResult.cs" />
<Compile Include="Model\UpdateCheckInformation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs b/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs index 668d8a668..ff59dce72 100644 --- a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs +++ b/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs @@ -6,8 +6,6 @@ namespace HandBrake.Framework.Model
{
using System;
- using HandBrake.Framework.Helpers;
- using HandBrake.Framework.Services;
using HandBrake.Framework.Services.Interfaces;
/// <summary>
diff --git a/win/C#/HandBrake.Framework/Services/UpdateService.cs b/win/C#/HandBrake.Framework/Services/UpdateService.cs index 31fb85525..0bbd781f3 100644 --- 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;
using System.Threading;
- using HandBrake.Framework.Helpers;
using HandBrake.Framework.Model;
using HandBrake.Framework.Services.Interfaces;
diff --git a/win/C#/Properties/AssemblyInfo.cs.tmpl b/win/C#/Properties/AssemblyInfo.cs.tmpl index eab0c05a7..bb0c88122 100644 --- a/win/C#/Properties/AssemblyInfo.cs.tmpl +++ b/win/C#/Properties/AssemblyInfo.cs.tmpl @@ -38,5 +38,5 @@ using System.Runtime.InteropServices; // Revision
//
-[assembly: AssemblyVersion("0.9.4.$WCREV$")]
+[assembly: AssemblyVersion("0.9.5.$WCREV$")]
[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file |