Migrate System.Drawing.Common from dotnet/runtime into winforms

Directory.Build.targets

@@ -16,7 +16,7 @@
 
   <!-- to prevent using MS.NC.Platforms from SDK, which is lagging behind the version that WinForms gets from the CoreFx packages -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" PrivateAssets="all" />
   </ItemGroup>
 
   <!-- Set code coverage properties that reference properties not available in Directory.Build.props -->
@@ -87,4 +87,29 @@
     <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('$(RedistTargetFrameworkName)'))" />
   </PropertyGroup>
 
+  <Choose>
+    <When Condition="'$(IncludeInternalObsoleteAttribute)' == 'true' and '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+      <ItemGroup>
+        <Compile Include="$(RepoRoot)src\Common\src\ObsoleteAttribute.cs" />
+      </ItemGroup>
+      <PropertyGroup>
+        <!-- Suppress CS0436 to allow ObsoleteAttribute to be internally defined and used in .NET Standard. -->
+        <NoWarn>$(NoWarn);CS0436</NoWarn>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
+  <!-- If a tfm doesn't target .NETCoreApp but uses the platform support attributes, then we include the
+       System.Runtime.Versioning*Platform* annotation attribute classes in the project as internal.
+
+       If a project has specified assembly-level SupportedOSPlatforms or UnsupportedOSPlatforms,
+       we can infer the need without having IncludePlatformAttributes set. -->
+  <PropertyGroup>
+    <IncludePlatformAttributes Condition="'$(IncludePlatformAttributes)' == '' and ('$(SupportedOSPlatforms)' != '' or '$(UnsupportedOSPlatforms)' != '')">true</IncludePlatformAttributes>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(IncludePlatformAttributes)' == 'true' and '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+    <Compile Include="$(RepoRoot)src\Common\src\PlatformAttributes.cs" />
+  </ItemGroup>
+
 </Project>

Winforms.sln

@@ -155,6 +155,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildAssist", "BuildAssist"
 EndProject
 Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "BuildAssist", "src\BuildAssist\BuildAssist.msbuildproj", "{20E7C5E8-CD56-4A1C-9CB2-B7169FD7A5B8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "src\System.Drawing.Common\src\System.Drawing.Common.csproj", "{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common.Tests", "src\System.Drawing.Common\tests\System.Drawing.Common.Tests.csproj", "{7650F24E-7132-42CF-ADCE-830C8DB26EE5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -831,6 +835,38 @@ Global
 		{20E7C5E8-CD56-4A1C-9CB2-B7169FD7A5B8}.Release|x64.Build.0 = Release|Any CPU
 		{20E7C5E8-CD56-4A1C-9CB2-B7169FD7A5B8}.Release|x86.ActiveCfg = Release|Any CPU
 		{20E7C5E8-CD56-4A1C-9CB2-B7169FD7A5B8}.Release|x86.Build.0 = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|arm64.Build.0 = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|x64.Build.0 = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Debug|x86.Build.0 = Debug|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|arm64.Build.0 = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|x64.ActiveCfg = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|x64.Build.0 = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|x86.ActiveCfg = Release|Any CPU
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D}.Release|x86.Build.0 = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|arm64.Build.0 = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|arm64.Build.0 = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|x64.Build.0 = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -888,6 +924,8 @@ Global
 		{93651A99-C9EB-4F83-8A66-DF9D21574550} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
 		{B3CE7FA8-21C5-4CE8-970E-8210D1D89251} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
 		{20E7C5E8-CD56-4A1C-9CB2-B7169FD7A5B8} = {B3CE7FA8-21C5-4CE8-970E-8210D1D89251}
+		{90CC3A84-1087-48A0-8FDC-3A0F6D4D3B4D} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
+		{7650F24E-7132-42CF-ADCE-830C8DB26EE5} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136}

eng/Version.Details.xml

@@ -31,10 +31,6 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>541347cbb4270f3861a8bb5eada9f1547d309b3a</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="8.0.0-preview.3.23162.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>541347cbb4270f3861a8bb5eada9f1547d309b3a</Sha>
-    </Dependency>
     <Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.3.23162.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>541347cbb4270f3861a8bb5eada9f1547d309b3a</Sha>

eng/Versions.props

@@ -35,7 +35,6 @@
     <MicrosoftWin32SystemEventsPackageVersion>8.0.0-preview.3.23162.2</MicrosoftWin32SystemEventsPackageVersion>
     <SystemCodeDomPackageVersion>8.0.0-preview.3.23162.2</SystemCodeDomPackageVersion>
     <SystemConfigurationConfigurationManagerPackageVersion>8.0.0-preview.3.23162.2</SystemConfigurationConfigurationManagerPackageVersion>
-    <SystemDrawingCommonPackageVersion>8.0.0-preview.3.23162.2</SystemDrawingCommonPackageVersion>
     <SystemResourcesExtensionsPackageVersion>8.0.0-preview.3.23162.2</SystemResourcesExtensionsPackageVersion>
     <SystemSecurityPermissionsPackageVersion>8.0.0-preview.3.23162.2</SystemSecurityPermissionsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>8.0.0-preview.3.23162.2</SystemWindowsExtensionsPackageVersion>
@@ -76,6 +75,9 @@
     <!-- This is needed for Verify.Xunit to pull correct version of System.Speech -->
     <MicrosoftWindowsCompatibilityVersion>8.0.0-preview.3.23162.2</MicrosoftWindowsCompatibilityVersion>
     <MoqPackageVersion>4.10.0</MoqPackageVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.23107.1</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>8.0.0-beta.23107.1</SystemDrawingCommonTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23107.1</SystemWindowsExtensionsTestDataVersion>
     <VerifyXunitVersion>14.2.0</VerifyXunitVersion>
   </PropertyGroup>
   <!-- Code Coverage -->

eng/pipelines/build.yml

@@ -90,7 +90,7 @@ jobs:
         $(_OfficialBuildIdArgs)
         $(_InternalRuntimeDownloadArgs)
         /p:Coverage=$(_Coverage)
-        /p:TestRunnerAdditionalArguments='-notrait Category=IgnoreForCI'
+        /p:TestRunnerAdditionalArguments='-notrait Category=IgnoreForCI -notrait Category=failing'
         /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\Test-${{ parameters.targetArchitecture }}.binlog
         /m:1
       displayName: Run Unit Tests
@@ -105,7 +105,7 @@ jobs:
         /p:TargetArchitecture=${{ parameters.targetArchitecture }}
         $(_OfficialBuildIdArgs)
         $(_InternalRuntimeDownloadArgs)
-        /p:TestRunnerAdditionalArguments='-notrait Category=IgnoreForCI'
+        /p:TestRunnerAdditionalArguments='-notrait Category=IgnoreForCI -notrait Category=failing'
         /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\IntegrationTest-${{ parameters.targetArchitecture }}.binlog
         /m:1
       displayName: Run Integration Tests

pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj

@@ -76,6 +76,9 @@
     <!-- Facade for System.Drawing.Design -->
     <ProjectReference Include="..\..\src\System.Drawing.Design\src\System.Drawing.Design.Facade.csproj" />
 
+    <!-- Reference and Source System.Drawing.Common -->
+    <ProjectReference Include="..\..\src\System.Drawing.Common\src\System.Drawing.Common.csproj" />
+
     <!-- Reference and Source System.Windows.Forms -->
     <ProjectReference Include="..\..\src\System.Windows.Forms\src\System.Windows.Forms.csproj" />
 

pkg/Microsoft.Private.Winforms/sdk/dotnet-windowsdesktop/UpdateFileClassification.ps1

@@ -28,10 +28,6 @@ $assemblies = $xmlDoc.package.files.file | `
     Select-Object -Unique @{Name="Path";Expression={Split-Path $_.target -Leaf}} | `
     Select-Object -ExpandProperty Path;
 
-# this isn't explicitly present in the list
-$assemblies += 'System.Drawing.Common.dll';
-
-
 $needGenerate = $null;
 [bool]::TryParse($GenerateManifest, [ref]$needGenerate) | Out-Null;
 $servicingRelease = $null;

src/Common/src/DisableRuntimeMarshalling.cs

@@ -0,0 +1,5 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// Used to indicate that runtime marshalling should be disabled.
+[assembly: System.Runtime.CompilerServices.DisableRuntimeMarshalling]

src/Common/src/HandleRefMarshaller.cs

@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace System.Runtime.InteropServices.Marshalling
+{
+    [CustomMarshaller(typeof(HandleRef), MarshalMode.ManagedToUnmanagedIn, typeof(KeepAliveMarshaller))]
+    internal static class HandleRefMarshaller
+    {
+        internal struct KeepAliveMarshaller
+        {
+            private HandleRef _handle;
+
+            public void FromManaged(HandleRef handle)
+            {
+                _handle = handle;
+            }
+
+            public IntPtr ToUnmanaged() => _handle.Handle;
+
+            public void OnInvoked() => GC.KeepAlive(_handle.Wrapper);
+
+            public void Free() { }
+        }
+    }
+}

src/Common/src/LocalAppContextSwitches.Common.cs

@@ -0,0 +1,63 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// Copied from https://raw.githubusercontent.com/dotnet/runtime/main/src/libraries/Common/src/System/LocalAppContextSwitches.Common.cs
+
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+    // Helper method for local caching of compatibility quirks. Keep this lean and simple - this file is included into
+    // every framework assembly that implements any compatibility quirks.
+    internal static partial class LocalAppContextSwitches
+    {
+        // Returns value of given switch using provided cache.
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool GetSwitchValue(string switchName, ref bool switchValue) =>
+            AppContext.TryGetSwitch(switchName, out switchValue);
+
+        // Returns value of given switch using provided cache.
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool GetCachedSwitchValue(string switchName, ref int cachedSwitchValue)
+        {
+            // The cached switch value has 3 states: 0 - unknown, 1 - true, -1 - false
+            if (cachedSwitchValue < 0) return false;
+            if (cachedSwitchValue > 0) return true;
+
+            return GetCachedSwitchValueInternal(switchName, ref cachedSwitchValue);
+        }
+
+        private static bool GetCachedSwitchValueInternal(string switchName, ref int cachedSwitchValue)
+        {
+            bool hasSwitch = AppContext.TryGetSwitch(switchName, out bool isSwitchEnabled);
+            if (!hasSwitch)
+            {
+                isSwitchEnabled = GetSwitchDefaultValue(switchName);
+            }
+
+            AppContext.TryGetSwitch("TestSwitch.LocalAppContext.DisableCaching", out bool disableCaching);
+            if (!disableCaching)
+            {
+                cachedSwitchValue = isSwitchEnabled ? 1 /*true*/ : -1 /*false*/;
+            }
+
+            return isSwitchEnabled;
+        }
+
+        // Provides default values for switches if they're not always false by default
+        private static bool GetSwitchDefaultValue(string switchName)
+        {
+            if (switchName == "Switch.System.Runtime.Serialization.SerializationGuard")
+            {
+                return true;
+            }
+
+            if (switchName == "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization")
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}