aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Model.Portable/FodyWeavers.xml2
-rw-r--r--MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj4
-rw-r--r--MediaBrowser.Model.Portable/packages.config2
-rw-r--r--MediaBrowser.Model.net35/Fody.targets89
-rw-r--r--MediaBrowser.Model.net35/FodyWeavers.xml4
-rw-r--r--MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj11
-rw-r--r--MediaBrowser.Model.net35/packages.config5
-rw-r--r--MediaBrowser.Model/Fody.targets89
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj11
-rw-r--r--MediaBrowser.Model/Session/SessionInfoDto.cs1
-rw-r--r--MediaBrowser.Model/packages.config3
11 files changed, 206 insertions, 15 deletions
diff --git a/MediaBrowser.Model.Portable/FodyWeavers.xml b/MediaBrowser.Model.Portable/FodyWeavers.xml
index bb0f322ee..736992810 100644
--- a/MediaBrowser.Model.Portable/FodyWeavers.xml
+++ b/MediaBrowser.Model.Portable/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?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 5a8bd2097..ca0479cf2 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -47,10 +47,6 @@
<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.40.3\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.Portable/packages.config b/MediaBrowser.Model.Portable/packages.config
index 9fe1f7e4b..23768650a 100644
--- a/MediaBrowser.Model.Portable/packages.config
+++ b/MediaBrowser.Model.Portable/packages.config
@@ -4,5 +4,5 @@
<package id="Microsoft.Bcl" version="1.0.19" targetFramework="portable-win+net45+sl40+wp71" />
<package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="portable-win+net45+sl40+wp71" />
<package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="portable-win+net45+sl40+wp71" />
- <package id="PropertyChanged.Fody" version="1.40.3" targetFramework="portable-net45+sl40+wp71+win" />
+ <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="portable-net45+sl40+wp71+win" />
</packages> \ No newline at end of file
diff --git a/MediaBrowser.Model.net35/Fody.targets b/MediaBrowser.Model.net35/Fody.targets
new file mode 100644
index 000000000..a668a51fc
--- /dev/null
+++ b/MediaBrowser.Model.net35/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.net35/FodyWeavers.xml b/MediaBrowser.Model.net35/FodyWeavers.xml
new file mode 100644
index 000000000..bb0f322ee
--- /dev/null
+++ b/MediaBrowser.Model.net35/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?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 855d65fd5..cedaa6b52 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -12,6 +12,9 @@
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
+ <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>
@@ -367,15 +370,21 @@
<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" />
</ItemGroup>
- <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if $(ConfigurationName) == Release (
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
new file mode 100644
index 000000000..7b0bdb1b6
--- /dev/null
+++ b/MediaBrowser.Model.net35/packages.config
@@ -0,0 +1,5 @@
+<?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/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
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-09 17:58:40 +0000