diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-03 15:07:48 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-03 15:07:48 -0400 |
| commit | 8fd3bf42173e02f3b05c0373072c97e19fb76b9a (patch) | |
| tree | 0bbdb2ba3bbceca88955ceb012c7a07713b95102 /MediaBrowser.Controller | |
| parent | a2dd144d5ccc8a5092f49983df8a030f7df4f82b (diff) | |
change pcl's to .netstandard
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 9 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.nuget.targets | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Properties/AssemblyInfo.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/packages.config | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/project.json | 25 |
5 files changed, 13 insertions, 33 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 0f26ad5ec1..5c48adfe76 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -12,8 +12,10 @@ <FileAlignment>512</FileAlignment> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <TargetFrameworkProfile>Profile7</TargetFrameworkProfile> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkProfile> + </TargetFrameworkProfile> + <TargetFrameworkVersion>v5.0</TargetFrameworkVersion> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -367,9 +369,6 @@ <Name>MediaBrowser.Model</Name> </ProjectReference> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <PropertyGroup> <PostBuildEvent /> diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.nuget.targets b/MediaBrowser.Controller/MediaBrowser.Controller.nuget.targets deleted file mode 100644 index e69ce0e64f..0000000000 --- a/MediaBrowser.Controller/MediaBrowser.Controller.nuget.targets +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="EmitMSBuildWarning" BeforeTargets="Build"> - <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." /> - </Target> -</Project>
\ No newline at end of file diff --git a/MediaBrowser.Controller/Properties/AssemblyInfo.cs b/MediaBrowser.Controller/Properties/AssemblyInfo.cs index a5abf79ee1..844b93f37d 100644 --- a/MediaBrowser.Controller/Properties/AssemblyInfo.cs +++ b/MediaBrowser.Controller/Properties/AssemblyInfo.cs @@ -18,9 +18,6 @@ using System.Runtime.InteropServices; // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("bc09905a-04ed-497d-b39b-27593401e715")] - // Version information for an assembly consists of the following four values: // // Major Version diff --git a/MediaBrowser.Controller/packages.config b/MediaBrowser.Controller/packages.config deleted file mode 100644 index 6b8deb9c96..0000000000 --- a/MediaBrowser.Controller/packages.config +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> -</packages>
\ No newline at end of file diff --git a/MediaBrowser.Controller/project.json b/MediaBrowser.Controller/project.json index fbbe9eaf32..7af946da1a 100644 --- a/MediaBrowser.Controller/project.json +++ b/MediaBrowser.Controller/project.json @@ -1,17 +1,10 @@ -{ - "frameworks":{ - "netstandard1.6":{ - "dependencies":{ - "NETStandard.Library":"1.6.0", - } - }, - ".NETPortable,Version=v4.5,Profile=Profile7":{ - "buildOptions": { - "define": [ ] - }, - "frameworkAssemblies":{ - - } - } - } +{ + "supports": {}, + "dependencies": { + "Microsoft.NETCore.Portable.Compatibility": "1.0.1", + "NETStandard.Library": "1.6.0" + }, + "frameworks": { + "netstandard1.1": {} + } }
\ No newline at end of file |
