diff options
| -rw-r--r-- | MediaBrowser.Model.Portable/FodyWeavers.xml | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj | 12 | ||||
| -rw-r--r-- | MediaBrowser.Model.Portable/packages.config | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemPerson.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/ChapterInfoDto.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/UserDto.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/UserItemDataDto.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/DisplayPreferences.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/ChannelInfoDto.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/SessionInfoDto.cs | 5 |
15 files changed, 15 insertions, 85 deletions
diff --git a/MediaBrowser.Model.Portable/FodyWeavers.xml b/MediaBrowser.Model.Portable/FodyWeavers.xml index 736992810..6e2fa02e6 100644 --- a/MediaBrowser.Model.Portable/FodyWeavers.xml +++ b/MediaBrowser.Model.Portable/FodyWeavers.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Weavers> - <PropertyChanged /> </Weavers>
\ No newline at end of file diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 0de9fb519..862d95f7e 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -36,6 +36,8 @@ <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -617,9 +619,6 @@ <Compile Include="..\MediaBrowser.Model\Extensions\FloatHelper.cs"> <Link>Extensions\FloatHelper.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Extensions\IHasPropertyChangedEvent.cs"> - <Link>Extensions\IHasPropertyChangedEvent.cs</Link> - </Compile> <Compile Include="..\MediaBrowser.Model\Extensions\IntHelper.cs"> <Link>Extensions\IntHelper.cs</Link> </Compile> @@ -1233,13 +1232,6 @@ <PostBuildEvent> </PostBuildEvent> </PropertyGroup> - <Import Project="..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\portable-net+sl+win+wpa+wp\Fody.targets'))" /> - </Target> <!-- 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.Portable/packages.config b/MediaBrowser.Model.Portable/packages.config deleted file mode 100644 index cd4eb36a4..000000000 --- a/MediaBrowser.Model.Portable/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Fody" version="1.29.2" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" /> - <package id="PropertyChanged.Fody" version="1.50.4" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" /> -</packages>
\ 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 fe0b3bcae..953e5b7be 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -591,9 +591,6 @@ <Compile Include="..\MediaBrowser.Model\Extensions\FloatHelper.cs"> <Link>Extensions\FloatHelper.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Extensions\IHasPropertyChangedEvent.cs"> - <Link>Extensions\IHasPropertyChangedEvent.cs</Link> - </Compile> <Compile Include="..\MediaBrowser.Model\Extensions\IntHelper.cs"> <Link>Extensions\IntHelper.cs</Link> </Compile> diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index ac7d97288..5be87ae4a 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -18,7 +18,7 @@ namespace MediaBrowser.Model.Dto /// This holds information about a BaseItem in a format that is convenient for the client. /// </summary> [DebuggerDisplay("Name = {Name}, ID = {Id}, Type = {Type}")] - public class BaseItemDto : IHasProviderIds, IHasPropertyChangedEvent, IItemDto, IHasServerId, IHasSyncInfo + public class BaseItemDto : IHasProviderIds, IItemDto, IHasServerId, IHasSyncInfo { /// <summary> /// Gets or sets the name. @@ -1110,11 +1110,6 @@ namespace MediaBrowser.Model.Dto } /// <summary> - /// Occurs when [property changed]. - /// </summary> - public event PropertyChangedEventHandler PropertyChanged; - - /// <summary> /// Gets or sets the program identifier. /// </summary> /// <value>The program identifier.</value> diff --git a/MediaBrowser.Model/Dto/BaseItemPerson.cs b/MediaBrowser.Model/Dto/BaseItemPerson.cs index 8e7750562..b74912907 100644 --- a/MediaBrowser.Model/Dto/BaseItemPerson.cs +++ b/MediaBrowser.Model/Dto/BaseItemPerson.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Model.Extensions; -using System.ComponentModel; +using System.ComponentModel; using System.Diagnostics; using System.Runtime.Serialization; @@ -9,7 +8,7 @@ namespace MediaBrowser.Model.Dto /// This is used by the api to get information about a Person within a BaseItem /// </summary> [DebuggerDisplay("Name = {Name}, Role = {Role}, Type = {Type}")] - public class BaseItemPerson : IHasPropertyChangedEvent + public class BaseItemPerson { /// <summary> /// Gets or sets the name. @@ -53,10 +52,5 @@ namespace MediaBrowser.Model.Dto return PrimaryImageTag != null; } } - - /// <summary> - /// Occurs when [property changed]. - /// </summary> - public event PropertyChangedEventHandler PropertyChanged; } } diff --git a/MediaBrowser.Model/Dto/ChapterInfoDto.cs b/MediaBrowser.Model/Dto/ChapterInfoDto.cs index 62b1839d4..a71d97990 100644 --- a/MediaBrowser.Model/Dto/ChapterInfoDto.cs +++ b/MediaBrowser.Model/Dto/ChapterInfoDto.cs @@ -1,7 +1,5 @@ -using System.ComponentModel; -using System.Diagnostics; +using System.Diagnostics; using System.Runtime.Serialization; -using MediaBrowser.Model.Extensions; namespace MediaBrowser.Model.Dto { @@ -9,7 +7,7 @@ namespace MediaBrowser.Model.Dto /// Class ChapterInfo /// </summary> [DebuggerDisplay("Name = {Name}")] - public class ChapterInfoDto : IHasPropertyChangedEvent + public class ChapterInfoDto { /// <summary> /// Gets or sets the start position ticks. @@ -38,7 +36,5 @@ namespace MediaBrowser.Model.Dto { get { return ImageTag != null; } } - - public event PropertyChangedEventHandler PropertyChanged; } } diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs index f133f3343..18470466c 100644 --- a/MediaBrowser.Model/Dto/UserDto.cs +++ b/MediaBrowser.Model/Dto/UserDto.cs @@ -1,6 +1,5 @@ using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Connect; -using MediaBrowser.Model.Extensions; using MediaBrowser.Model.Users; using System; using System.ComponentModel; @@ -13,7 +12,7 @@ namespace MediaBrowser.Model.Dto /// Class UserDto /// </summary> [DebuggerDisplay("Name = {Name}, ID = {Id}, HasPassword = {HasPassword}")] - public class UserDto : IHasPropertyChangedEvent, IItemDto, IHasServerId + public class UserDto : IItemDto, IHasServerId { /// <summary> /// Gets or sets the name. @@ -141,11 +140,6 @@ namespace MediaBrowser.Model.Dto Policy = new UserPolicy(); } - /// <summary> - /// Occurs when [property changed]. - /// </summary> - public event PropertyChangedEventHandler PropertyChanged; - public override string ToString() { return Name ?? base.ToString(); diff --git a/MediaBrowser.Model/Dto/UserItemDataDto.cs b/MediaBrowser.Model/Dto/UserItemDataDto.cs index ce0c8fa99..00491002b 100644 --- a/MediaBrowser.Model/Dto/UserItemDataDto.cs +++ b/MediaBrowser.Model/Dto/UserItemDataDto.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Model.Extensions; -using System; +using System; using System.ComponentModel; namespace MediaBrowser.Model.Dto @@ -7,7 +6,7 @@ namespace MediaBrowser.Model.Dto /// <summary> /// Class UserItemDataDto /// </summary> - public class UserItemDataDto : IHasPropertyChangedEvent + public class UserItemDataDto { /// <summary> /// Gets or sets the rating. @@ -74,7 +73,5 @@ namespace MediaBrowser.Model.Dto /// </summary> /// <value>The item identifier.</value> public string ItemId { get; set; } - - public event PropertyChangedEventHandler PropertyChanged; } } diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs index 6399670c9..0ba8eaa4f 100644 --- a/MediaBrowser.Model/Entities/DisplayPreferences.cs +++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs @@ -1,22 +1,15 @@ using MediaBrowser.Model.Drawing; using System; using System.Collections.Generic; -using System.ComponentModel; -using MediaBrowser.Model.Extensions; namespace MediaBrowser.Model.Entities { /// <summary> /// Defines the display preferences for any item that supports them (usually Folders) /// </summary> - public class DisplayPreferences : IHasPropertyChangedEvent + public class DisplayPreferences { /// <summary> - /// Occurs when [property changed]. - /// </summary> - public event PropertyChangedEventHandler PropertyChanged; - - /// <summary> /// The image scale /// </summary> private const double ImageScale = .9; diff --git a/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs b/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs deleted file mode 100644 index c87550620..000000000 --- a/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.ComponentModel; - -namespace MediaBrowser.Model.Extensions -{ - public interface IHasPropertyChangedEvent : INotifyPropertyChanged - { - } -} diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs index 296ead5c2..4d863c6eb 100644 --- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs @@ -1,18 +1,11 @@ using MediaBrowser.Model.Dto; -using MediaBrowser.Model.Extensions; using System; -using System.ComponentModel; namespace MediaBrowser.Model.LiveTv { - public class BaseTimerInfoDto : IHasPropertyChangedEvent, IHasServerId + public class BaseTimerInfoDto : IHasServerId { /// <summary> - /// Occurs when a property value changes. - /// </summary> - public event PropertyChangedEventHandler PropertyChanged; - - /// <summary> /// Id of the recording. /// </summary> public string Id { get; set; } diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs index 91493def8..aa91e3c74 100644 --- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs @@ -1,6 +1,5 @@ using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Extensions; using MediaBrowser.Model.Library; using System.Collections.Generic; using System.ComponentModel; @@ -13,7 +12,7 @@ namespace MediaBrowser.Model.LiveTv /// Class ChannelInfoDto /// </summary> [DebuggerDisplay("Name = {Name}, Number = {Number}")] - public class ChannelInfoDto : IHasPropertyChangedEvent, IItemDto, IHasServerId + public class ChannelInfoDto : IItemDto, IHasServerId { /// <summary> /// Gets or sets the name. @@ -120,7 +119,5 @@ namespace MediaBrowser.Model.LiveTv ImageTags = new Dictionary<ImageType, string>(); MediaSources = new List<MediaSourceInfo>(); } - - public event PropertyChangedEventHandler PropertyChanged; } } diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index e54273b84..931b2ebcb 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -229,7 +229,6 @@ <Compile Include="Entities\SortOrder.cs" /> <Compile Include="Events\GenericEventArgs.cs" /> <Compile Include="Extensions\DoubleHelper.cs" /> - <Compile Include="Extensions\IHasPropertyChangedEvent.cs" /> <Compile Include="Extensions\IntHelper.cs" /> <Compile Include="Extensions\ListHelper.cs" /> <Compile Include="Extensions\StringHelper.cs" /> diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs index da8ab9b8a..5c3c9a79c 100644 --- a/MediaBrowser.Model/Session/SessionInfoDto.cs +++ b/MediaBrowser.Model/Session/SessionInfoDto.cs @@ -1,5 +1,4 @@ using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Extensions; using System; using System.Collections.Generic; using System.ComponentModel; @@ -8,7 +7,7 @@ using System.Diagnostics; namespace MediaBrowser.Model.Session { [DebuggerDisplay("Client = {Client}, Username = {UserName}")] - public class SessionInfoDto : IHasPropertyChangedEvent + public class SessionInfoDto { /// <summary> /// Gets or sets the supported commands. @@ -116,8 +115,6 @@ namespace MediaBrowser.Model.Session public TranscodingInfo TranscodingInfo { get; set; } - public event PropertyChangedEventHandler PropertyChanged; - public SessionInfoDto() { AdditionalUsers = new List<SessionUserInfo>(); |
