Skip to content

Commit

Permalink
Targeted netstandard 1.5, fixed nuget package properties
Browse files Browse the repository at this point in the history
  • Loading branch information
aj-r committed Aug 5, 2017
1 parent 2f726bd commit c1cc7ba
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 51 deletions.
2 changes: 1 addition & 1 deletion RiotNet.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F916703D-444A-4210-B26B-F749794FA28D}"
ProjectSection(SolutionItems) = preProject
Expand Down
2 changes: 1 addition & 1 deletion RiotNet/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "RiotNet"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 4.3.0
PROJECT_NUMBER = 4.4.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
19 changes: 0 additions & 19 deletions RiotNet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("RiotNet")]
[assembly: AssemblyDescription("A client for the Riot Games API. This client is very flexible and configurable, has synchronous and asynchronous versions of each method, and has models that can easily be cached in a database with tools like Entity Framework.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("AJ Richardson")]
[assembly: AssemblyProduct("RiotNet")]
[assembly: AssemblyCopyright("Copyright 2016 AJ Richardson")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
[assembly: AssemblyVersion("4.0.0")]
[assembly: AssemblyFileVersion("4.3.0")]
[assembly: AssemblyInformationalVersion("4.3.0")]
24 changes: 10 additions & 14 deletions RiotNet/RiotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>4.3.0</VersionPrefix>
<TargetFrameworks Condition=" '$(Configuration)' != 'ReleaseCoreOnly' ">net45;netstandard1.6</TargetFrameworks>
<TargetFrameworks Condition=" '$(Configuration)' == 'ReleaseCoreOnly' ">netstandard1.6</TargetFrameworks>
<VersionPrefix>4.4.0</VersionPrefix>
<TargetFrameworks Condition=" '$(Configuration)' != 'ReleaseCoreOnly' ">net45;netstandard1.5</TargetFrameworks>
<TargetFrameworks Condition=" '$(Configuration)' == 'ReleaseCoreOnly' ">netstandard1.5</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>RiotNet</AssemblyName>
<PackageId>RiotNet</PackageId>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<Authors>AJ Richardson</Authors>
<Description>A client for the Riot Games API. This client is very flexible and configurable, and is designed for real-life use on a multithreaded server.</Description>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
<IncludeSource>True</IncludeSource>
<IncludeSymbols>True</IncludeSymbols>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
Expand All @@ -33,15 +29,15 @@
<DefineConstants>$(DefineConstants);NET_45;DB_READY</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='ReleaseCoreOnly|net45|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="System.Threading.Thread" Version="4.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.1.0" />
Expand Down
16 changes: 0 additions & 16 deletions RiotNet/RiotNet.nuspec

This file was deleted.

0 comments on commit c1cc7ba

Please sign in to comment.