Unify DesignSurface and TestConsole into DemoConsole

Fixes #13338

- Renamed files in `DesignSurfaceExt` to match the updated class names
from PR #13433
- Moved all code files from `DesignSurfaceExt` into the `DemoConsole`
project directory
- Integrated all relevant configuration from `DesignSurfaceExt.csproj`
into `DemoConsole.csproj`
- Deleted `DesignSurfaceExt.csproj`
- Merged the contents of `Directory.Build.props` into
`DemoConsole.csproj` to consolidate all settings in one place
- Removed the now redundant `Directory.Build.props` file
- Relocated the `DemoConsole` folder up one level to align with other
integration test projects
- Deleted the now empty `DesignSurfaceExt` folder

- None

- Minimal

- Manual

- 10.0.100-preview.3.25201.16

Author: Ricardo Bossan (BEYONDSOFT CONSULTING INC)

Winforms.sln

@@ -101,16 +101,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Primit
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "interop", "interop", "{A31B1F6F-4880-45DE-9845-EE3EF67C2FCC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DesignSurface", "DesignSurface", "{43E46506-7DF8-4E7A-A579-996CA43041EB}"
-	ProjectSection(SolutionItems) = preProject
-		src\test\integration\DesignSurface\Directory.Build.props = src\test\integration\DesignSurface\Directory.Build.props
-		src\test\integration\DesignSurface\README.md = src\test\integration\DesignSurface\README.md
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DemoConsole", "src\test\integration\DesignSurface\DemoConsole\DemoConsole.csproj", "{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesignSurfaceExt", "src\test\integration\DesignSurface\DesignSurfaceExt\DesignSurfaceExt.csproj", "{E96C74BA-9F74-4289-BF72-45CAD472D3D2}"
-EndProject
 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.VisualBasic.Forms.Tests", "src\Microsoft.VisualBasic.Forms\tests\UnitTests\Microsoft.VisualBasic.Forms.Tests.vbproj", "{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Windows.Core.TestUtilities", "src\Common\tests\TestUtilities\System.Private.Windows.Core.TestUtilities.csproj", "{05FD23CE-60AE-44A8-8DD6-1688F04BE385}"
@@ -679,22 +671,6 @@ Global
 		{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|x64.Build.0 = Release|Any CPU
 		{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|x86.ActiveCfg = Release|Any CPU
 		{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|x86.Build.0 = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x64.Build.0 = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x86.Build.0 = Debug|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|arm64.Build.0 = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x64.ActiveCfg = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x64.Build.0 = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x86.ActiveCfg = Release|Any CPU
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x86.Build.0 = Release|Any CPU
 		{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -1172,9 +1148,7 @@ Global
 		{1976540D-65A6-45D7-95D2-13106DE6D5BB} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 		{6EE57002-9965-46E7-A48B-B449969738BB} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 		{A31B1F6F-4880-45DE-9845-EE3EF67C2FCC} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
-		{43E46506-7DF8-4E7A-A579-996CA43041EB} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
-		{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4} = {43E46506-7DF8-4E7A-A579-996CA43041EB}
-		{E96C74BA-9F74-4289-BF72-45CAD472D3D2} = {43E46506-7DF8-4E7A-A579-996CA43041EB}
+		{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
 		{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 		{05FD23CE-60AE-44A8-8DD6-1688F04BE385} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
 		{3596BDE6-B211-4BE7-810D-DC7A4315E296} = {E4C6C5F5-46E9-4C63-9628-26752B4D9C11}

src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButton.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace TestConsole;
+namespace DemoConsole;
 
 [DesignerCategory("Default")]
 [Designer(typeof(CustomButtonDesigner), typeof(IDesigner))]

src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesigner.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace TestConsole;
+namespace DemoConsole;
 
 public class CustomButtonDesigner : ControlDesigner
 {

src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace TestConsole;
+namespace DemoConsole;
 
 public class CustomButtonDesignerActionList : DesignerActionList
 {

src/test/integration/DesignSurface/DemoConsole/CustomControls/DesignerActionVerbItem.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace TestConsole;
+namespace DemoConsole;
 
 internal class DesignerActionVerbItem : DesignerActionMethodItem
 {

src/test/integration/DesignSurface/DemoConsole/DemoConsole.csproj

@@ -1,20 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyName>DesignSurface</AssemblyName>
-    <RootNamespace>TestConsole</RootNamespace>
+    <AssemblyName>DemoConsole</AssemblyName>
+    <RootNamespace>DemoConsole</RootNamespace>
     <ApplicationIcon>painter.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>
     <StartupObject />
-    <Copyright>Copyright © Paolo Foti 2008</Copyright>
-    <Company />
-    <Authors>Paolo Foti</Authors>
-    <PackageLicenseExpression>CPOL</PackageLicenseExpression>
     <PackageProjectUrl>
       https://www.codeproject.com/Articles/24385/Have-a-Great-DesignTime-Experience-with-a-Powerful</PackageProjectUrl>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
+    <DefaultItemExcludes Condition="'$(TargetFramework)' != 'net481'">
+      $(DefaultItemExcludes);**/Framework/*
+    </DefaultItemExcludes>
+    <EnableXlfLocalization>false</EnableXlfLocalization>
+    <UpdateXlfOnBuild>false</UpdateXlfOnBuild>
+
+    <SuppressLicenseValidation>true</SuppressLicenseValidation>
+    <NoWarn>$(NoWarn);SA1633</NoWarn>
+
+    <!-- Do not build this project when doing a .NET product build. -->
+    <!-- The files for this project have been removed from the .NET product due to licensing issues. -->
+    <ExcludeFromDotNetBuild>true</ExcludeFromDotNetBuild>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
+    <TargetFrameworks>$(NetCurrent)-windows;net481</TargetFrameworks>
+    <!-- Unset TargetFramework as this property gets set in the repo's root. This is necessary to  avoid over-building. -->
+    <TargetFramework />
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' != 'net481'">
+    <!-- Include framework-specific items as 'None' to show them in the Solution Explorer -->
+    <None Include="**/Framework/*" />
+  </ItemGroup>
+
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net481'">
     <NoWarn>$(NoWarn)CS8002;CA1824</NoWarn>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
@@ -27,14 +45,34 @@
     <Compile Update="Properties\Resources.Designer.cs" AutoGen="True" DependentUpon="Resources.resx" DesignTime="True" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DesignSurfaceExt\DesignSurfaceExt.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="painter.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == '$(NetCurrent)-windows'">
+    <ProjectReference Include="..\..\..\..\..\src\System.Design\src\System.Design.Facade.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\System.Drawing.Design\src\System.Drawing.Design.Facade.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\System.Windows.Forms\System.Windows.Forms.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\System.Drawing.Common\src\System.Drawing.Common.csproj" />
+  </ItemGroup>
+
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net481'">
+    <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == '$(NetCurrent)-windows'">
+    <PackageReference Include="System.Runtime.Serialization.Formatters" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Design" />
+  </ItemGroup>
+
+
 </Project>