Change System.Drawing.Common's target to netcoreapp2.0 #22833
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <BuildConfigurations> | ||
| netcoreapp2.0 | ||
| </BuildConfigurations> | ||
| </PropertyGroup> | ||
| </Project> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> | ||
| <PropertyGroup> | ||
| <BinPlaceRef>true</BinPlaceRef> | ||
| <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> | ||
| <NETCoreAppPackageVersion>2.0.0-preview2-25407-01</NETCoreAppPackageVersion> | ||
|
There was a problem hiding this comment. Yeah, we do. I don't know why I only looked on nuget.org for this version. Will fix. |
||
| <TargetFramework>netcoreapp2.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.NETCore.App"> | ||
| <Version>$(NETCoreAppPackageVersion)</Version> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- for all configurations this project provides refs for that configuration --> | ||
| <BinPlaceConfiguration Include="$(Configuration)"> | ||
| <RefPath>$(RefPath)</RefPath> | ||
| </BinPlaceConfiguration> | ||
| <BinPlaceConfiguration Include="$(Configuration)"> | ||
| <!-- copy shims to the testhost as well in order to be able to run the netfx tests --> | ||
|
There was a problem hiding this comment. Why? This seems broken. TestHostRootPath is set to a BuildConfiguration-specific path, not a configuration specific path. There was a problem hiding this comment. Yeah, it seems wrong. It was copy-pasted from another project file (along with the $(RefPath) setting above). The shim part can probably be deleted. |
||
| <RuntimePath>$(TestHostRootPath)</RuntimePath> | ||
| </BinPlaceConfiguration> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> | ||
| </Project> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System.Diagnostics; | ||
| using System.Reflection; | ||
|
|
||
| namespace System.Drawing | ||
| { | ||
| // System.Drawing.Common uses several members on System.Drawing.Common which are implemented in .NET Core 2.0, but | ||
| // not exposed. This is a helper class which allows System.Drawing.Common to access those members through reflection. | ||
| internal static class ColorUtil | ||
| { | ||
| private const short StateKnownColorValid = 0x0001; | ||
| private const short StateNameValid = 0x0008; | ||
| private const long NotDefinedValue = 0; | ||
|
|
||
| private static readonly ConstructorInfo s_ctorKnownColor; // internal Color(KnownColor knownColor) | ||
|
There was a problem hiding this comment. I can't recall the specific differences but I know in the past we avoid caching reflection objects and instead get a delegate (either bound or unbound) so that we can have minimal overhead for the lightup after initial setup. Have a look at There was a problem hiding this comment. Good idea. I believe that also lets us avoid all of the temporary array allocations associated with invoking these reflection objects. There was a problem hiding this comment. Actually, I'm not sure it works in this case. I am storing ConstructorInfo and FieldInfo objects, and you can't create Delegates out of those. Is that right? There was a problem hiding this comment. Yeah, looking back at this code we never did it for fields. For constructors we created a func to Activator.CreateInstance. FWIW, this was the code I was remembering: https://github.com/Microsoft/referencesource/blob/master/Microsoft.Bcl/System.Threading.Tasks.v1.5/System/Lightup/Lightup.cs There was a problem hiding this comment. Hmm, I don't really see much value in that, TBH. Is there some large benefit to calling There was a problem hiding this comment. Yeah I don't expect CreateInstance is any faster. Perhaps is has to do with what remains rooted when you keep these objects around? Honestly I can't remember and its been years since I touched that code. It could have been due to silverlight specifics as well since that was trying to work with SL. I think what you have is fine. |
||
| private static readonly ConstructorInfo s_ctorAllValues; // private Color(long value, short state, string name, KnownColor knownColor) | ||
| private static readonly FieldInfo s_fieldKnownColor; // private readonly short knownColor | ||
| private static readonly FieldInfo s_fieldState; // private readonly short state | ||
|
|
||
| static ColorUtil() | ||
|
There was a problem hiding this comment. Do we think reflection is the best option here? Why not just source sharing and changing the visibility? |
||
| { | ||
| Type colorType = typeof(Color); | ||
| Type knownColorType = colorType.Assembly.GetType("System.Drawing.KnownColor", true); | ||
| Debug.Assert(knownColorType != null); | ||
| const BindingFlags bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance; | ||
| s_ctorKnownColor = colorType.GetConstructor(bindingFlags, null, new Type[] { knownColorType }, null); | ||
| Debug.Assert(s_ctorKnownColor != null); | ||
|
|
||
| s_ctorAllValues = colorType.GetConstructor(bindingFlags, null, new Type[] { typeof(long), typeof(short), typeof(string), knownColorType }, null); | ||
| Debug.Assert(s_ctorAllValues != null); | ||
|
|
||
| s_fieldKnownColor = colorType.GetField("knownColor", bindingFlags); | ||
| Debug.Assert(s_fieldKnownColor != null); | ||
|
|
||
| s_fieldState = colorType.GetField("state", bindingFlags); | ||
| Debug.Assert(s_fieldState != null); | ||
| } | ||
|
|
||
| public static Color FromKnownColor(KnownColor color) | ||
| { | ||
| var value = (int)color; | ||
| if (value < (int)KnownColor.ActiveBorder || value > (int)KnownColor.MenuHighlight) | ||
| { | ||
| return FromName(color.ToString()); | ||
| } | ||
|
|
||
| return (Color)s_ctorKnownColor.Invoke(new object[] { value }); | ||
| } | ||
|
|
||
| public static Color FromName(string name) | ||
| { | ||
| // try to get a known color first | ||
| Color color; | ||
| if (ColorTable.TryGetNamedColor(name, out color)) | ||
| { | ||
| return color; | ||
| } | ||
| // otherwise treat it as a named color | ||
| return (Color)s_ctorAllValues.Invoke(new object[] { NotDefinedValue, StateNameValid, name, 0 }); | ||
| } | ||
|
|
||
| public static bool IsSystemColor(this Color color) | ||
| { | ||
| short knownColor = GetKnownColor(color); | ||
| return GetIsKnownColor(color) && ((((KnownColor)knownColor) <= KnownColor.WindowText) || (((KnownColor)knownColor) > KnownColor.YellowGreen)); | ||
| } | ||
|
|
||
| public static short GetKnownColor(this Color color) | ||
| { | ||
| return (short)s_fieldKnownColor.GetValue(color); | ||
| } | ||
|
|
||
| public static short GetState(this Color color) | ||
| { | ||
| return (short)s_fieldState.GetValue(color); | ||
| } | ||
|
|
||
| public static bool GetIsSystemColor(this Color color) | ||
| { | ||
| short knownColor = color.GetKnownColor(); | ||
| return GetIsKnownColor(color) && ((((KnownColor)knownColor) <= KnownColor.WindowText) || (((KnownColor)knownColor) > KnownColor.YellowGreen)); | ||
| } | ||
|
|
||
| public static bool GetIsKnownColor(this Color color) | ||
| { | ||
| short state = GetState(color); | ||
| return ((state & StateKnownColorValid) != 0); | ||
| } | ||
|
|
||
| public static KnownColor ToKnownColor(this Color c) | ||
| { | ||
| return (KnownColor)GetKnownColor(c); | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System.Diagnostics; | ||
| using System.Reflection; | ||
|
|
||
| namespace System.Drawing | ||
| { | ||
| internal static class ColorUtil | ||
| { | ||
| public static Color FromKnownColor(KnownColor color) => Color.FromKnownColor(color); | ||
| public static bool IsSystemColor(this Color color) => color.IsSystemColor; | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a comment to this project describing its purpose: to download a targeting pack only for a specific NETCoreApp version.