diff options
| -rw-r--r-- | MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model.net35/Fody.targets | 89 | ||||
| -rw-r--r-- | MediaBrowser.Model.net35/FodyWeavers.xml | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model.net35/packages.config | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/SessionInfoDto.cs | 8 |
7 files changed, 14 insertions, 101 deletions
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index ca0479cf2..2098007d2 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -47,6 +47,10 @@ <Reference Include="Microsoft.Threading.Tasks.Extensions"> <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.Extensions.dll</HintPath> </Reference> + <Reference Include="PropertyChanged"> + <HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath> + <Private>False</Private> + </Reference> <Reference Include="System.Runtime"> <HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\portable-net40+sl4+win8+wp71\System.Runtime.dll</HintPath> </Reference> diff --git a/MediaBrowser.Model.net35/Fody.targets b/MediaBrowser.Model.net35/Fody.targets deleted file mode 100644 index a668a51fc..000000000 --- a/MediaBrowser.Model.net35/Fody.targets +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Choose> - <When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'"> - <PropertyGroup> - <FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir> - </PropertyGroup> - </When> - <When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'"> - <PropertyGroup> - <FodySolutionDir>$(SolutionDir)</FodySolutionDir> - </PropertyGroup> - </When> - <When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'"> - <PropertyGroup> - <FodySolutionDir>$(MSBuildProjectDirectory)\..\</FodySolutionDir> - </PropertyGroup> - </When> - </Choose> - <Choose> - <When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'"> - <PropertyGroup> - <FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath> - </PropertyGroup> - </When> - <When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'"> - <PropertyGroup> - <FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath> - </PropertyGroup> - </When> - <Otherwise > - <PropertyGroup> - <FodyKeyFilePath></FodyKeyFilePath> - </PropertyGroup> - </Otherwise> - </Choose> - <PropertyGroup> - <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir> - <FodyMessageImportance Condition="$(FodyMessageImportance) == '' Or $(FodyMessageImportance) == '*Undefined*'">Low</FodyMessageImportance> - <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly> - <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)</FodyPath> - </PropertyGroup> - <UsingTask - TaskName="Fody.WeavingTask" - AssemblyFile="$(FodyPath)\Fody.dll" /> - <Target - AfterTargets="AfterCompile" - Name="WinFodyTarget" - Condition=" '$(OS)' == 'Windows_NT'"> - - <Fody.WeavingTask - AssemblyPath="@(IntermediateAssembly)" - IntermediateDir="$(IntermediateDir)" - KeyFilePath="$(FodyKeyFilePath)" - MessageImportance="$(FodyMessageImportance)" - ProjectDirectory="$(ProjectDir)" - SolutionDir="$(FodySolutionDir)" - References="@(ReferencePath)" - SignAssembly="$(FodySignAssembly)" - ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)" - DefineConstants="$(DefineConstants)" - /> - </Target> - - <Target - AfterTargets="AfterBuild" - Name="NonWinFodyTarget" - Condition=" '$(OS)' != 'Windows_NT'"> - <Fody.WeavingTask - AssemblyPath="$(TargetPath)" - IntermediateDir="$(IntermediateDir)" - KeyFilePath="$(FodyKeyFilePath)" - MessageImportance="$(FodyMessageImportance)" - ProjectDirectory="$(ProjectDir)" - SolutionDir="$(FodySolutionDir)" - References="@(ReferencePath)" - SignAssembly="$(FodySignAssembly)" - ReferenceCopyLocalPaths="$(ReferenceCopyLocalPaths)" - DefineConstants="$(DefineConstants)" - /> - </Target> - - - <!--Support for ncrunch--> - <ItemGroup> - <None Include="$(FodyPath)\*.*" /> - </ItemGroup> - -</Project>
\ No newline at end of file diff --git a/MediaBrowser.Model.net35/FodyWeavers.xml b/MediaBrowser.Model.net35/FodyWeavers.xml index bb0f322ee..6e2fa02e6 100644 --- a/MediaBrowser.Model.net35/FodyWeavers.xml +++ b/MediaBrowser.Model.net35/FodyWeavers.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <Weavers> - <PropertyChanged /> </Weavers>
\ No newline at end of file diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index cedaa6b52..4286c91eb 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -370,9 +370,7 @@ <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="Fody.targets" /> <None Include="MediaBrowser.Model.snk" /> - <None Include="packages.config" /> </ItemGroup> <ItemGroup> <Content Include="FodyWeavers.xml" /> @@ -384,7 +382,6 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\net35\" /y /d /r /i )</PostBuildEvent> </PropertyGroup> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> - <Import Project="Fody.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> diff --git a/MediaBrowser.Model.net35/packages.config b/MediaBrowser.Model.net35/packages.config deleted file mode 100644 index 7b0bdb1b6..000000000 --- a/MediaBrowser.Model.net35/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Fody" version="1.17.0.0" targetFramework="net35" /> - <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="net35" /> -</packages>
\ No newline at end of file diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index e902029f8..d0e7ffd7b 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -158,6 +158,11 @@ </ItemGroup> <ItemGroup> <Reference Include="Microsoft.CSharp" /> + <Reference Include="PropertyChanged, Version=1.41.0.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\NET35\PropertyChanged.dll</HintPath> + <Private>False</Private> + </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Runtime.Serialization" /> diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs index ada624736..f9b0e0abd 100644 --- a/MediaBrowser.Model/Session/SessionInfoDto.cs +++ b/MediaBrowser.Model/Session/SessionInfoDto.cs @@ -1,10 +1,10 @@ -using MediaBrowser.Model.Entities; +using System.ComponentModel; +using MediaBrowser.Model.Entities; using System; namespace MediaBrowser.Model.Session { - [ImplementPropertyChanged] - public class SessionInfoDto + public class SessionInfoDto : INotifyPropertyChanged { /// <summary> /// Gets or sets the id. @@ -107,5 +107,7 @@ namespace MediaBrowser.Model.Session /// </summary> /// <value><c>true</c> if [supports remote control]; otherwise, <c>false</c>.</value> public bool SupportsRemoteControl { get; set; } + + public event PropertyChangedEventHandler PropertyChanged; } } |