diff options
| author | Marek Safar <marek.safar@gmail.com> | 2017-11-27 13:54:22 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-11-27 13:54:22 +0300 |
| commit | badb237d220606caf19e149800187d89312f1d62 (patch) | |
| tree | b804eb7a6815403449f9afc66bffffcdedc0aa31 /src/System.Drawing.Primitives | |
| parent | e1f502de7f556407c124e88a4a8bcde962e7ccc7 (diff) | |
| parent | 2d2ecd2da478b9a994b38ddb4d8054449766637a (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/System.Drawing.Primitives')
3 files changed, 3 insertions, 5 deletions
diff --git a/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs b/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs index 3d90a080bf..c4f3334a4a 100644 --- a/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs +++ b/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs @@ -7,8 +7,7 @@ namespace System.Drawing { - [System.SerializableAttribute] - public partial struct Color : System.IEquatable<System.Drawing.Color> + public readonly partial struct Color : System.IEquatable<System.Drawing.Color> { public static readonly System.Drawing.Color Empty; public byte A { get { throw null; } } diff --git a/src/System.Drawing.Primitives/src/System/Drawing/Color.cs b/src/System.Drawing.Primitives/src/System/Drawing/Color.cs index a57c7d2c6b..93eea5f67a 100644 --- a/src/System.Drawing.Primitives/src/System/Drawing/Color.cs +++ b/src/System.Drawing.Primitives/src/System/Drawing/Color.cs @@ -13,7 +13,7 @@ namespace System.Drawing #if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] #endif - public struct Color : IEquatable<Color> + public readonly struct Color : IEquatable<Color> { public static readonly Color Empty = new Color(); diff --git a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj index 3897e8dbac..3349020d86 100644 --- a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -4,7 +4,6 @@ <PropertyGroup> <ProjectGuid>{CF54638C-A382-4A78-9AD6-2304CEEFEB01}</ProjectGuid> </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> @@ -29,4 +28,4 @@ <Compile Include="SizeTests.netcoreapp.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file |