diff options
| author | RedShirtMB Mark Linton redshirt linton <RedShirtMB Mark Linton redshirt.linton@gmail.com> | 2012-08-10 20:06:37 -0700 |
|---|---|---|
| committer | RedShirtMB Mark Linton redshirt linton <RedShirtMB Mark Linton redshirt.linton@gmail.com> | 2012-08-10 20:06:37 -0700 |
| commit | 3d7b637a23310583e4dab1d67feb366d727b1829 (patch) | |
| tree | 91e76f9a4651df594f74e6261a64ccefea447aa4 | |
| parent | 92056c4d3d409590b23996eef2795419d4b9617b (diff) | |
Moved SingleInstance into UI subfolder and deleted Util folder.
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj | 2 | ||||
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj.orig | 16 | ||||
| -rw-r--r-- | MediaBrowser.Common/UI/SingleInstance.cs (renamed from MediaBrowser.Common/Util/SingleInstance.cs) | 0 |
3 files changed, 17 insertions, 1 deletions
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index d5f6230e1..2a0c5740c 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -80,7 +80,7 @@ <Compile Include="UI\Splash.xaml.cs">
<DependentUpon>Splash.xaml</DependentUpon>
</Compile>
- <Compile Include="Util\SingleInstance.cs" />
+ <Compile Include="UI\SingleInstance.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj.orig b/MediaBrowser.Common/MediaBrowser.Common.csproj.orig index 326bbe424..40e2094e6 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj.orig +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj.orig @@ -10,6 +10,7 @@ <RootNamespace>MediaBrowser.Common</RootNamespace>
<AssemblyName>MediaBrowser.Common</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,6 +31,8 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="PresentationCore" />
+ <Reference Include="PresentationFramework" />
<Reference Include="ServiceStack.Text, Version=3.9.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ServiceStack.Text.3.9.3\lib\net35\ServiceStack.Text.dll</HintPath>
@@ -42,11 +45,14 @@ <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll</HintPath>
</Reference>
+ <Reference Include="System.Runtime.Remoting" />
+ <Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
+ <Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="Configuration\ApplicationPaths.cs" />
@@ -70,6 +76,10 @@ <Compile Include="Net\StreamExtensions.cs" />
<Compile Include="Plugins\BasePlugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="UI\Splash.xaml.cs">
+ <DependentUpon>Splash.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="UI\SingleInstance.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
@@ -80,6 +90,12 @@ <Name>MediaBrowser.Model</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Page Include="UI\Splash.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/MediaBrowser.Common/Util/SingleInstance.cs b/MediaBrowser.Common/UI/SingleInstance.cs index 837d3bb57..837d3bb57 100644 --- a/MediaBrowser.Common/Util/SingleInstance.cs +++ b/MediaBrowser.Common/UI/SingleInstance.cs |