Move PathManager and SavestateManager to Client.Common, also remove the dependency for System.Web in PathManager by doing a more logical way of getting the executing assembly path
This commit is contained in:
parent
360ff31a54
commit
3e429736d5
|
@ -100,6 +100,7 @@
|
||||||
<Compile Include="movie\MultitrackRecording.cs" />
|
<Compile Include="movie\MultitrackRecording.cs" />
|
||||||
<Compile Include="movie\Subtitle.cs" />
|
<Compile Include="movie\Subtitle.cs" />
|
||||||
<Compile Include="movie\SubtitleList.cs" />
|
<Compile Include="movie\SubtitleList.cs" />
|
||||||
|
<Compile Include="PathManager.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="RecentFiles.cs" />
|
<Compile Include="RecentFiles.cs" />
|
||||||
<Compile Include="helpers\StringHelpers.cs" />
|
<Compile Include="helpers\StringHelpers.cs" />
|
||||||
|
|
|
@ -3,17 +3,13 @@ using System.Linq;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
using BizHawk.Client.Common;
|
namespace BizHawk.Client.Common
|
||||||
|
|
||||||
namespace BizHawk.MultiClient
|
|
||||||
{
|
{
|
||||||
public static class PathManager
|
public static class PathManager
|
||||||
{
|
{
|
||||||
public static string GetExeDirectoryAbsolute()
|
public static string GetExeDirectoryAbsolute()
|
||||||
{
|
{
|
||||||
var uri = new Uri(Assembly.GetEntryAssembly().GetName().CodeBase);
|
return AppDomain.CurrentDomain.BaseDirectory;
|
||||||
string module = uri.LocalPath + System.Web.HttpUtility.UrlDecode(uri.Fragment);
|
|
||||||
return Path.GetDirectoryName(module);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
|
@ -1,8 +1,6 @@
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
using BizHawk.Client.Common;
|
namespace BizHawk.Client.Common
|
||||||
|
|
||||||
namespace BizHawk.MultiClient
|
|
||||||
{
|
{
|
||||||
class SavestateManager
|
class SavestateManager
|
||||||
{
|
{
|
|
@ -3,6 +3,8 @@ using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
|
using BizHawk.Client.Common;
|
||||||
|
|
||||||
namespace BizHawk.MultiClient
|
namespace BizHawk.MultiClient
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -84,7 +84,6 @@
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.DirectoryServices" />
|
<Reference Include="System.DirectoryServices" />
|
||||||
<Reference Include="System.Numerics" />
|
<Reference Include="System.Numerics" />
|
||||||
<Reference Include="System.Web" />
|
|
||||||
<Reference Include="System.Xml.Linq">
|
<Reference Include="System.Xml.Linq">
|
||||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
@ -232,7 +231,6 @@
|
||||||
<Compile Include="config\PathInfo.Designer.cs">
|
<Compile Include="config\PathInfo.Designer.cs">
|
||||||
<DependentUpon>PathInfo.cs</DependentUpon>
|
<DependentUpon>PathInfo.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="config\PathManager.cs" />
|
|
||||||
<Compile Include="config\RewindConfig.cs">
|
<Compile Include="config\RewindConfig.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
Loading…
Reference in New Issue