diff --git a/Winforms.sln b/Winforms.sln index c1f2af710c0..7d70414d156 100644 --- a/Winforms.sln +++ b/Winforms.sln @@ -102,16 +102,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\README.md = src\test\integration\DesignSurface\README.md - src\test\integration\DesignSurface\Directory.Build.props = src\test\integration\DesignSurface\Directory.Build.props - 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}" @@ -669,22 +661,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 @@ -1162,9 +1138,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} diff --git a/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButton.cs b/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButton.cs index e1a5247f42d..bc954230b46 100644 --- a/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButton.cs +++ b/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))] diff --git a/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesigner.cs b/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesigner.cs index bbb881f0fd0..8edf30f832b 100644 --- a/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesigner.cs +++ b/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 { diff --git a/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs b/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs index 39963d84a56..9d398a42818 100644 --- a/src/test/integration/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs +++ b/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 { diff --git a/src/test/integration/DesignSurface/DemoConsole/CustomControls/DesignerActionVerbItem.cs b/src/test/integration/DesignSurface/DemoConsole/CustomControls/DesignerActionVerbItem.cs index 07d3ed9c465..deada274949 100644 --- a/src/test/integration/DesignSurface/DemoConsole/CustomControls/DesignerActionVerbItem.cs +++ b/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 { diff --git a/src/test/integration/DesignSurface/DemoConsole/DemoConsole.csproj b/src/test/integration/DesignSurface/DemoConsole/DemoConsole.csproj index ec6e9c6f72d..7ef5ab6e312 100644 --- a/src/test/integration/DesignSurface/DemoConsole/DemoConsole.csproj +++ b/src/test/integration/DesignSurface/DemoConsole/DemoConsole.csproj @@ -1,20 +1,38 @@  - DesignSurface - TestConsole + DemoConsole + DemoConsole painter.ico WinExe - Copyright © Paolo Foti 2008 - - Paolo Foti - CPOL https://www.codeproject.com/Articles/24385/Have-a-Great-DesignTime-Experience-with-a-Powerful true + + $(DefaultItemExcludes);**/Framework/* + + false + false + + true + $(NoWarn);SA1633 + + + + true + true + $(NetCurrent)-windows;net481 + + + + + + + + $(NoWarn)CS8002;CA1824 true @@ -27,14 +45,34 @@ - - - - PreserveNewest + + + + + + + + + + + latest + enable + + + + + + + + + + + + diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.cs b/src/test/integration/DesignSurface/DemoConsole/DesignSurfaceExtended.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.cs rename to src/test/integration/DesignSurface/DemoConsole/DesignSurfaceExtended.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/DesignerOptionServiceExt.cs b/src/test/integration/DesignSurface/DemoConsole/DesignerOptionServiceExtended.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/DesignerOptionServiceExt.cs rename to src/test/integration/DesignSurface/DemoConsole/DesignerOptionServiceExtended.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/DesignerSerializationServiceImpl.cs b/src/test/integration/DesignSurface/DemoConsole/DesignerSerializationService.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/DesignerSerializationServiceImpl.cs rename to src/test/integration/DesignSurface/DemoConsole/DesignerSerializationService.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/Framework/HashHelpers.cs b/src/test/integration/DesignSurface/DemoConsole/Framework/HashHelpers.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/Framework/HashHelpers.cs rename to src/test/integration/DesignSurface/DemoConsole/Framework/HashHelpers.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/Framework/Index.cs b/src/test/integration/DesignSurface/DemoConsole/Framework/Index.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/Framework/Index.cs rename to src/test/integration/DesignSurface/DemoConsole/Framework/Index.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/Framework/NotNullWhenAttribute.cs b/src/test/integration/DesignSurface/DemoConsole/Framework/NotNullWhenAttribute.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/Framework/NotNullWhenAttribute.cs rename to src/test/integration/DesignSurface/DemoConsole/Framework/NotNullWhenAttribute.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/Framework/Range.cs b/src/test/integration/DesignSurface/DemoConsole/Framework/Range.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/Framework/Range.cs rename to src/test/integration/DesignSurface/DemoConsole/Framework/Range.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/Framework/readme.txt b/src/test/integration/DesignSurface/DemoConsole/Framework/readme.txt similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/Framework/readme.txt rename to src/test/integration/DesignSurface/DemoConsole/Framework/readme.txt diff --git a/src/test/integration/DesignSurface/DemoConsole/GlobalUsings.cs b/src/test/integration/DesignSurface/DemoConsole/GlobalUsings.cs index aa73c0c3be9..7207bc4ca4c 100644 --- a/src/test/integration/DesignSurface/DemoConsole/GlobalUsings.cs +++ b/src/test/integration/DesignSurface/DemoConsole/GlobalUsings.cs @@ -1,11 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +global using System.Diagnostics; global using System.Windows.Forms; global using System.Drawing; -global using System.Diagnostics; global using System.ComponentModel; global using System.ComponentModel.Design; +global using System.ComponentModel.Design.Serialization; global using System.Windows.Forms.Design; -global using DemoConsole; -global using Timer = System.Windows.Forms.Timer; +global using System.Reflection; +global using System.Collections; +global using System.Collections.Concurrent; +global using System.Collections.Immutable; diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/IDesignSurfaceExt.cs b/src/test/integration/DesignSurface/DemoConsole/IDesignSurfaceExtended.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/IDesignSurfaceExt.cs rename to src/test/integration/DesignSurface/DemoConsole/IDesignSurfaceExtended.cs diff --git a/src/test/integration/DesignSurface/DemoConsole/MainForm.Designer.cs b/src/test/integration/DesignSurface/DemoConsole/MainForm.Designer.cs index 9051b8de3f7..b2a8478d2b4 100644 --- a/src/test/integration/DesignSurface/DemoConsole/MainForm.Designer.cs +++ b/src/test/integration/DesignSurface/DemoConsole/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace TestConsole; +namespace DemoConsole; partial class MainForm { diff --git a/src/test/integration/DesignSurface/DemoConsole/MainForm.MyScrollableControl.cs b/src/test/integration/DesignSurface/DemoConsole/MainForm.MyScrollableControl.cs index f2ca39cfcc0..562bc9ed495 100644 --- a/src/test/integration/DesignSurface/DemoConsole/MainForm.MyScrollableControl.cs +++ b/src/test/integration/DesignSurface/DemoConsole/MainForm.MyScrollableControl.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 partial class MainForm { diff --git a/src/test/integration/DesignSurface/DemoConsole/MainForm.MyUserControl.cs b/src/test/integration/DesignSurface/DemoConsole/MainForm.MyUserControl.cs index 1473cb9bc0c..9b4d634850c 100644 --- a/src/test/integration/DesignSurface/DemoConsole/MainForm.MyUserControl.cs +++ b/src/test/integration/DesignSurface/DemoConsole/MainForm.MyUserControl.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 partial class MainForm { diff --git a/src/test/integration/DesignSurface/DemoConsole/MainForm.cs b/src/test/integration/DesignSurface/DemoConsole/MainForm.cs index e2c427b0e1e..87a0caf1463 100644 --- a/src/test/integration/DesignSurface/DemoConsole/MainForm.cs +++ b/src/test/integration/DesignSurface/DemoConsole/MainForm.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace TestConsole; +using Timer = System.Windows.Forms.Timer; + +namespace DemoConsole; [DesignerCategory("Default")] public partial class MainForm : Form diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/NameCreationServiceImp.cs b/src/test/integration/DesignSurface/DemoConsole/NameCreationService.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/NameCreationServiceImp.cs rename to src/test/integration/DesignSurface/DemoConsole/NameCreationService.cs diff --git a/src/test/integration/DesignSurface/DemoConsole/Program.cs b/src/test/integration/DesignSurface/DemoConsole/Program.cs index 186442691ca..b4dabc1a488 100644 --- a/src/test/integration/DesignSurface/DemoConsole/Program.cs +++ b/src/test/integration/DesignSurface/DemoConsole/Program.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 Program { diff --git a/src/test/integration/DesignSurface/DemoConsole/Properties/Resources.Designer.cs b/src/test/integration/DesignSurface/DemoConsole/Properties/Resources.Designer.cs index 4d8a6f0595e..725bf7ea907 100644 --- a/src/test/integration/DesignSurface/DemoConsole/Properties/Resources.Designer.cs +++ b/src/test/integration/DesignSurface/DemoConsole/Properties/Resources.Designer.cs @@ -8,12 +8,12 @@ // //------------------------------------------------------------------------------ -namespace TestConsole.Properties { +namespace DemoConsole.Properties { using System; /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. @@ -33,13 +33,13 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TestConsole.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DemoConsole.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/PropertyGridExt.cs b/src/test/integration/DesignSurface/DemoConsole/PropertyGridExtended.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/PropertyGridExt.cs rename to src/test/integration/DesignSurface/DemoConsole/PropertyGridExtended.cs diff --git a/src/test/integration/DesignSurface/DemoConsole/README.md b/src/test/integration/DesignSurface/DemoConsole/README.md new file mode 100644 index 00000000000..868cf9c0687 --- /dev/null +++ b/src/test/integration/DesignSurface/DemoConsole/README.md @@ -0,0 +1,79 @@ +# DesignSurface (DemoConsole) + +- [Debugging Native Code in This Project](#debugging-native-code-in-this-project) + - [1. Enable Native Code Debugging](#1.-enable-native-code-debugging) + - [2. Configure Symbol Server for Native Debugging (Symweb)](<#2.-configure-symbol-server-for-native-debugging-(symweb)>) +- [Running the Project Against .NET Framework](#running-the-project-against-.net-framework) + +## Debugging Native Code in This Project + +To fully enable debugging in this project (including native code and symbol resolution), perform the following two steps: + +### 1. Enable Native Code Debugging + +This allows Visual Studio to step into native code + +**Option A – Using Visual Studio GUI:** + +1. Right-click the project in Solution Explorer and select **Properties**. +2. Go to the **Debug** then **Open debug launch profiles UI**. +3. Check the box **Enable native code debugging**. +4. Save and rebuild the project. + +> This setting is saved in a user-specific `.csproj.user` file. + +**Option B – Editing `launchSettings.json`:** + +1. Open the file `Properties\launchSettings.json`. +2. Under the `"profiles"` section, locate the profile matching your project name. +3. Add or update the property `"nativeDebugging": true`. + +Example: + +```json +{ + "profiles": { + "YourProjectName": { + "commandName": "Project", + "nativeDebugging": true + } + } +} +``` + +--- + +### 2. Configure Symbol Server for Native Debugging (Symweb) + +To resolve native symbols when stepping through native code, configure the Symweb server: + +1. Go to **Debug > Options** from the Visual Studio toolbar. +2. In the left pane, select **Debugging > Symbols**. +3. Under **Symbol file (.pdb) locations**, click the **➕** (plus) button. +4. Enter the following URL: + +``` +https://symweb +``` + +5. Press **Enter** or click **OK** to save. + +--- + +After completing both steps above, Visual Studio will be able to debug both managed and native parts of the application, using symbols downloaded from Symweb as needed. + +## Running the Project Against .NET Framework + +This project targets multiple frameworks, including .NET Framework 4.8.1. To run or debug it against the .NET Framework instead of .NET (e.g., net10.0-windows), follow the steps below: + +1. In Visual Studio, locate the Debug dropdown on the top toolbar (next to the green **Start** button). +2. Click the small downward arrow next to the active configuration. You will see the currently selected framework (typically something like `Framework (net10.0-windows)`). +3. Click the displayed framework name to open a submenu showing all target frameworks for this project. +4. Select **net481** from the list. +5. Build and run the project using any of the usual commands: + - **Build**: `Ctrl + Shift + B` + - **Start Without Debugging**: `Ctrl + F5` + - **Start With Debugging**: `F5` + +This configuration change ensures that Visual Studio builds and runs the project using the .NET Framework target. + diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/TabOrderHooker.cs b/src/test/integration/DesignSurface/DemoConsole/TabOrderHooker.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/TabOrderHooker.cs rename to src/test/integration/DesignSurface/DemoConsole/TabOrderHooker.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/TypeDiscoveryService.cs b/src/test/integration/DesignSurface/DemoConsole/TypeDiscoveryService.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/TypeDiscoveryService.cs rename to src/test/integration/DesignSurface/DemoConsole/TypeDiscoveryService.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/UndoEngineExt.cs b/src/test/integration/DesignSurface/DemoConsole/UndoEngineExtended.cs similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/UndoEngineExt.cs rename to src/test/integration/DesignSurface/DemoConsole/UndoEngineExtended.cs diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/dll.ico b/src/test/integration/DesignSurface/DemoConsole/dll.ico similarity index 100% rename from src/test/integration/DesignSurface/DesignSurfaceExt/dll.ico rename to src/test/integration/DesignSurface/DemoConsole/dll.ico diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.csproj b/src/test/integration/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.csproj index 5ef997c3739..15c831038b8 100644 --- a/src/test/integration/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.csproj +++ b/src/test/integration/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.csproj @@ -3,7 +3,6 @@ DesignSurfaceExt DesignSurfaceExt - dll.ico Copyright © Paolo Foti 2008 @@ -12,9 +11,6 @@ https://www.codeproject.com/Articles/24385/Have-a-Great-DesignTime-Experience-with-a-Powerful - - $(DefaultItemExcludes);**/Framework/* - @@ -22,9 +18,5 @@ false - - - - diff --git a/src/test/integration/DesignSurface/DesignSurfaceExt/GlobalUsings.cs b/src/test/integration/DesignSurface/DesignSurfaceExt/GlobalUsings.cs deleted file mode 100644 index 3fffd7bcea1..00000000000 --- a/src/test/integration/DesignSurface/DesignSurfaceExt/GlobalUsings.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -global using System.Windows.Forms; -global using System.Drawing; -global using System.ComponentModel; -global using System.ComponentModel.Design; -global using System.ComponentModel.Design.Serialization; -global using System.Windows.Forms.Design; -global using System.Reflection; -global using System.Collections; -global using System.Collections.Concurrent; -global using System.Collections.Immutable; diff --git a/src/test/integration/DesignSurface/Directory.Build.props b/src/test/integration/DesignSurface/Directory.Build.props deleted file mode 100644 index 71b9577353c..00000000000 --- a/src/test/integration/DesignSurface/Directory.Build.props +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - false - false - - true - $(NoWarn);SA1633 - - - - true - true - $(NetCurrent)-windows;net481 - - - - - - latest - enable - - - - - - - - - - - - - - - - - - - - -