diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-17 13:11:59 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-17 13:11:59 -0400 |
| commit | 365b2d82b15bac2d652a57d562c9d9d1175f6179 (patch) | |
| tree | 715c48e7530b3bd242c2b5bd3ae9e26a9525ec8b /MediaBrowser.Model.Portable | |
| parent | 1c72aac1c2d6379127bc3c27eb6f243c22cea0e4 (diff) | |
| parent | dc264a2cf1568f1e439115b4426c1eefb5c46442 (diff) | |
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
Diffstat (limited to 'MediaBrowser.Model.Portable')
| -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 |
3 files changed, 3 insertions, 17 deletions
diff --git a/MediaBrowser.Model.Portable/FodyWeavers.xml b/MediaBrowser.Model.Portable/FodyWeavers.xml index 7369928101..6e2fa02e64 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 0de9fb519c..862d95f7ee 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 cd4eb36a48..0000000000 --- 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 |