forked from dotnet/runtime
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Drawing: Replace harvested assets with live config
Removing the netcoreapp2.0, netstandard2.0 and net461 configurations of System.Drawing.Common as these aren't built live anymore (harvested). Replace the netstandard2.0 and net461 harvested asset with live builds and stop supporting netcoreapp2.x. Bringing these assets back as the minimum supported set of platforms are ones that support netstandard2.0 and are still in support. Contributes to dotnet#47530
- Loading branch information
1 parent
5902515
commit d870ebc
Showing
6 changed files
with
91 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <Project> | ||
| <Import Project="..\Directory.Build.targets" /> | ||
| <PropertyGroup> | ||
| <AssemblyVersion Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">4.0.1.0</AssemblyVersion> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
src/libraries/System.Drawing.Common/pkg/buildTransitive/System.Drawing.Common.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <Project InitialTargets="_ValidateSystemDrawingCommonNotNetCoreApp2x"> | ||
| <Target Name="_ValidateSystemDrawingCommonNotNetCoreApp2x" | ||
| Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $(TargetFrameworkVersion.StartsWith('v2.'))"> | ||
| <Error Condition="'$(SuppressTfmSupportBuildWarnings)' == ''" | ||
| Code="SYSLIB9001" Text="System.Drawing.Common doesn't support $(TargetFramework). Consider updating your TargetFramework to netcoreapp3.0 or later." /> | ||
| </Target> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
src/libraries/System.Drawing.Common/ref/System.Drawing.Common.netstandard.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // ------------------------------------------------------------------------------ | ||
| // Changes to this file must follow the https://aka.ms/api-review process. | ||
| // ------------------------------------------------------------------------------ | ||
|
|
||
| namespace System.Drawing | ||
| { | ||
| public static partial class ColorTranslator | ||
| { | ||
| public static System.Drawing.Color FromHtml(string htmlColor) { throw null; } | ||
| public static System.Drawing.Color FromOle(int oleColor) { throw null; } | ||
| public static System.Drawing.Color FromWin32(int win32Color) { throw null; } | ||
| public static string ToHtml(System.Drawing.Color c) { throw null; } | ||
| public static int ToOle(System.Drawing.Color c) { throw null; } | ||
| public static int ToWin32(System.Drawing.Color c) { throw null; } | ||
| } | ||
| public static partial class SystemColors | ||
| { | ||
| public static System.Drawing.Color ActiveBorder { get { throw null; } } | ||
| public static System.Drawing.Color ActiveCaption { get { throw null; } } | ||
| public static System.Drawing.Color ActiveCaptionText { get { throw null; } } | ||
| public static System.Drawing.Color AppWorkspace { get { throw null; } } | ||
| public static System.Drawing.Color ButtonFace { get { throw null; } } | ||
| public static System.Drawing.Color ButtonHighlight { get { throw null; } } | ||
| public static System.Drawing.Color ButtonShadow { get { throw null; } } | ||
| public static System.Drawing.Color Control { get { throw null; } } | ||
| public static System.Drawing.Color ControlDark { get { throw null; } } | ||
| public static System.Drawing.Color ControlDarkDark { get { throw null; } } | ||
| public static System.Drawing.Color ControlLight { get { throw null; } } | ||
| public static System.Drawing.Color ControlLightLight { get { throw null; } } | ||
| public static System.Drawing.Color ControlText { get { throw null; } } | ||
| public static System.Drawing.Color Desktop { get { throw null; } } | ||
| public static System.Drawing.Color GradientActiveCaption { get { throw null; } } | ||
| public static System.Drawing.Color GradientInactiveCaption { get { throw null; } } | ||
| public static System.Drawing.Color GrayText { get { throw null; } } | ||
| public static System.Drawing.Color Highlight { get { throw null; } } | ||
| public static System.Drawing.Color HighlightText { get { throw null; } } | ||
| public static System.Drawing.Color HotTrack { get { throw null; } } | ||
| public static System.Drawing.Color InactiveBorder { get { throw null; } } | ||
| public static System.Drawing.Color InactiveCaption { get { throw null; } } | ||
| public static System.Drawing.Color InactiveCaptionText { get { throw null; } } | ||
| public static System.Drawing.Color Info { get { throw null; } } | ||
| public static System.Drawing.Color InfoText { get { throw null; } } | ||
| public static System.Drawing.Color Menu { get { throw null; } } | ||
| public static System.Drawing.Color MenuBar { get { throw null; } } | ||
| public static System.Drawing.Color MenuHighlight { get { throw null; } } | ||
| public static System.Drawing.Color MenuText { get { throw null; } } | ||
| public static System.Drawing.Color ScrollBar { get { throw null; } } | ||
| public static System.Drawing.Color Window { get { throw null; } } | ||
| public static System.Drawing.Color WindowFrame { get { throw null; } } | ||
| public static System.Drawing.Color WindowText { get { throw null; } } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters