Browse Source
Use built-in symbol
refs: https://github.com/RogueException/Discord.Net/pull/1043#issuecomment-385223999pull/1043/head
Acid Chicken (硫酸鶏)
7 years ago
No known key found for this signature in database
GPG Key ID: E292DBE5D23A5846
2 changed files with 2 additions and 3 deletions
Unified View
Diff Options
-
+0 -1src/Discord.Net.Core/Discord.Net.Core.csproj
-
+2 -2src/Discord.Net.Core/Entities/Roles/Color.cs
+ 0
- 1
src/Discord.Net.Core/Discord.Net.Core.csproj
View File
| @@ -6,7 +6,6 @@ | |||||
| <Description>The core components for the Discord.Net library.</Description> | <Description>The core components for the Discord.Net library.</Description> | ||||
| <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net45;netstandard1.1;netstandard1.3;netstandard2.0</TargetFrameworks> | <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net45;netstandard1.1;netstandard1.3;netstandard2.0</TargetFrameworks> | ||||
| <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.1;netstandard1.3;netstandard2.0</TargetFrameworks> | <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.1;netstandard1.3;netstandard2.0</TargetFrameworks> | ||||
| <DefineConstants Condition=" '$(TargetFramework)' == 'netstandard2.0' ">NETSTANDARD2</DefineConstants> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <PackageReference Include="Newtonsoft.Json" Version="10.0.2" /> | <PackageReference Include="Newtonsoft.Json" Version="10.0.2" /> | ||||
+ 2
- 2
src/Discord.Net.Core/Entities/Roles/Color.cs
View File
| @@ -1,6 +1,6 @@ | |||||
| using System; | using System; | ||||
| using System.Diagnostics; | using System.Diagnostics; | ||||
| #if NETSTANDARD2 | |||||
| #if NETSTANDARD2_0 || NET45 | |||||
| using StandardColor = System.Drawing.Color; | using StandardColor = System.Drawing.Color; | ||||
| #endif | #endif | ||||
| @@ -100,7 +100,7 @@ namespace Discord | |||||
| (uint)(b * 255.0f); | (uint)(b * 255.0f); | ||||
| } | } | ||||
| #if NETSTANDARD2 | |||||
| #if NETSTANDARD2_0 || NET45 | |||||
| public static implicit operator StandardColor(Color color) => | public static implicit operator StandardColor(Color color) => | ||||
| StandardColor.FromArgb((int)color.RawValue); | StandardColor.FromArgb((int)color.RawValue); | ||||
| public static explicit operator Color(StandardColor color) => | public static explicit operator Color(StandardColor color) => | ||||