diff options
| author | ScottIsAFool <scottisafool@live.co.uk> | 2013-09-07 13:04:46 +0100 |
|---|---|---|
| committer | ScottIsAFool <scottisafool@live.co.uk> | 2013-09-07 13:04:46 +0100 |
| commit | aff1f7604a4e52b54051b482ee22a5afe35ad636 (patch) | |
| tree | c9e4a04ab8fc134d0095d9bcbf5d7ed69578d44e /MediaBrowser.Model | |
| parent | 0d599415392d1248c6925134fc0da7fa5049ddc8 (diff) | |
Added INotifyPropertyChanged to SessionInfoDto
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Fody.targets | 89 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 11 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/SessionInfoDto.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/packages.config | 3 |
4 files changed, 96 insertions, 8 deletions
diff --git a/MediaBrowser.Model/Fody.targets b/MediaBrowser.Model/Fody.targets new file mode 100644 index 000000000..a668a51fc --- /dev/null +++ b/MediaBrowser.Model/Fody.targets @@ -0,0 +1,89 @@ +<?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/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 280df9fe9..e902029f8 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -13,6 +13,7 @@ <FileAlignment>512</FileAlignment> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <RestorePackages>true</RestorePackages> + <FodyPath>..\packages\Fody.1.17.0.0</FodyPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -151,20 +152,16 @@ <Compile Include="Users\AuthenticationResult.cs" /> <Compile Include="Weather\WeatherUnits.cs" /> <Compile Include="Web\QueryStringDictionary.cs" /> + <None Include="Fody.targets" /> <None Include="FodyWeavers.xml" /> + <None Include="packages.config" /> </ItemGroup> <ItemGroup> <Reference Include="Microsoft.CSharp" /> - <Reference Include="PropertyChanged"> - <HintPath>..\packages\PropertyChanged.Fody.1.32.2.0\lib\portable-net4+sl4+wp7+win8\PropertyChanged.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Runtime.Serialization" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> <PostBuildEvent>if $(ConfigurationName) == Release ( @@ -172,6 +169,7 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\net45\" /y /d /r /i )</PostBuildEvent> </PropertyGroup> <Import Project="$(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"> @@ -179,5 +177,4 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\net45\" /y /d /r /i <Target Name="AfterBuild"> </Target> --> - <Import Project="$(ProjectDir)\..\Tools\Fody\Fody.targets" /> </Project>
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs index 11fc3479b..ada624736 100644 --- a/MediaBrowser.Model/Session/SessionInfoDto.cs +++ b/MediaBrowser.Model/Session/SessionInfoDto.cs @@ -3,6 +3,7 @@ using System; namespace MediaBrowser.Model.Session { + [ImplementPropertyChanged] public class SessionInfoDto { /// <summary> diff --git a/MediaBrowser.Model/packages.config b/MediaBrowser.Model/packages.config index b79466fc4..622e6f72f 100644 --- a/MediaBrowser.Model/packages.config +++ b/MediaBrowser.Model/packages.config @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="PropertyChanged.Fody" version="1.32.2.0" targetFramework="portable-win+net45+sl40+wp" /> + <package id="Fody" version="1.17.0.0" targetFramework="net45" /> + <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="net45" /> </packages>
\ No newline at end of file |
