aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Model.Portable/Fody.targets89
-rw-r--r--MediaBrowser.Model.Portable/FodyWeavers.xml2
-rw-r--r--MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj22
-rw-r--r--MediaBrowser.Model.Portable/packages.config4
-rw-r--r--MediaBrowser.Model/Fody.targets89
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj10
-rw-r--r--MediaBrowser.Model/packages.config4
-rw-r--r--MediaBrowser.sln3
8 files changed, 198 insertions, 25 deletions
diff --git a/MediaBrowser.Model.Portable/Fody.targets b/MediaBrowser.Model.Portable/Fody.targets
new file mode 100644
index 000000000..a668a51fc
--- /dev/null
+++ b/MediaBrowser.Model.Portable/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.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 02a4d015c..cea13f86e 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -37,7 +37,6 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<RestorePackages>true</RestorePackages>
- <NuGetPackageImportStamp>07483ba6</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -59,9 +58,16 @@
<ItemGroup>
<!-- A reference to the entire .NET Framework is automatically included -->
<None Include="app.config" />
+ <None Include="Fody.targets" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
+ <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>
+ </ItemGroup>
+ <ItemGroup>
<Compile Include="..\MediaBrowser.Model\Activity\ActivityLogEntry.cs">
<Link>Activity\ActivityLogEntry.cs</Link>
</Compile>
@@ -1243,24 +1249,12 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
- <ItemGroup>
- <Reference Include="PropertyChanged">
- <HintPath>..\packages\PropertyChanged.Fody.1.50.4\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
- <Private>False</Private>
- </Reference>
- </ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<PropertyGroup>
<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. Enable 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>
+ <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.Portable/packages.config b/MediaBrowser.Model.Portable/packages.config
index de5b54f9c..1baa00e28 100644
--- a/MediaBrowser.Model.Portable/packages.config
+++ b/MediaBrowser.Model.Portable/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Fody" version="1.29.2" targetFramework="portable-net45+win+wpa81+wp80" developmentDependency="true" />
- <package id="PropertyChanged.Fody" version="1.50.4" targetFramework="portable-net45+win+wpa81+wp80" developmentDependency="true" />
+ <package id="Fody" version="1.19.1.0" targetFramework="portable-win+net45+sl40+wp71" developmentDependency="true" />
+ <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="portable-net45+sl40+wp71+win" requireReinstallation="True" />
</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 79b29daa4..5466fb493 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -14,7 +14,6 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<ReleaseVersion>
</ReleaseVersion>
- <NuGetPackageImportStamp>e0c2388f</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -442,6 +441,7 @@
<Compile Include="Users\UserAction.cs" />
<Compile Include="Users\UserActionType.cs" />
<Compile Include="Users\UserPolicy.cs" />
+ <None Include="Fody.targets" />
<None Include="FodyWeavers.xml">
<SubType>Designer</SubType>
</None>
@@ -450,9 +450,8 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="PropertyChanged, Version=1.50.4.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\PropertyChanged.Fody.1.50.4\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+ <Reference Include="PropertyChanged, Version=1.41.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\NET35\PropertyChanged.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
@@ -467,14 +466,13 @@
<PropertyGroup>
<PostBuildEvent />
</PropertyGroup>
+ <Import Project="..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\dotnet\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\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
- <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>
- <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')" />
<!-- 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/packages.config b/MediaBrowser.Model/packages.config
index df2ddcf0f..3d7793afb 100644
--- a/MediaBrowser.Model/packages.config
+++ b/MediaBrowser.Model/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Fody" version="1.29.2" targetFramework="net45" developmentDependency="true" />
- <package id="PropertyChanged.Fody" version="1.50.4" targetFramework="net45" developmentDependency="true" />
+ <package id="Fody" version="1.19.1.0" targetFramework="net45" developmentDependency="true" />
+ <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="net45" />
</packages> \ No newline at end of file
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index f0c5ab5ef..a9b5020ec 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -521,4 +521,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(Performance) = preSolution
+ HasPerformanceSessions = true
+ EndGlobalSection
EndGlobal
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-27 14:55:19 +0000