Skip to content

Port missing designer infra #4860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RussKie merged 18 commits into from
May 14, 2021
Merged

Port missing designer infra #4860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
508f643
Add sample from https://www.codeproject.com/Articles/24385/Have-a-Gre…
RussKie Feb 17, 2021
11718d7
Breakout nested classes
RussKie Apr 15, 2021
7f673d9
Port types verbarim
RussKie Apr 15, 2021
7ccf286
Fix SR errors
RussKie Apr 22, 2021
e87e94d
Remove IMenuEditorService references
RussKie Apr 22, 2021
e26c304
Correctly rethrow exceptions
RussKie Apr 22, 2021
339055e
Compile
RussKie Apr 22, 2021
841bbfe
Set mouse hook
RussKie Apr 21, 2021
a0e7d5e
Remove unused var, was used prior to #2157
RussKie Apr 23, 2021
cc61998
Restore lost functionality
RussKie Apr 22, 2021
d30a842
Selected NRT annotations
RussKie Apr 22, 2021
429adf4
Auto cleanup
RussKie Apr 22, 2021
7c1c197
Manual cleanup
RussKie Apr 28, 2021
c6bf2d7
Suppress SYSLIB0011 BinaryFormatter serialization is obsolete
RussKie Apr 23, 2021
250b0d9
Add more test controls
RussKie Apr 29, 2021
8de4b5a
Use better MoveGlyph
RussKie May 13, 2021
73affb7
Increase debug experience
RussKie May 13, 2021
2d30e86
Fix loc'ble attributes resolution
RussKie May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions Winforms.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiRichTextBoxTests", "src
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\System.Windows.Forms\tests\IntegrationTests\DesignSurface\.editorconfig = src\System.Windows.Forms\tests\IntegrationTests\DesignSurface\.editorconfig
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DemoConsole", "src\System.Windows.Forms\tests\IntegrationTests\DesignSurface\DemoConsole\DemoConsole.csproj", "{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesignSurfaceExt", "src\System.Windows.Forms\tests\IntegrationTests\DesignSurface\DesignSurfaceExt\DesignSurfaceExt.csproj", "{E96C74BA-9F74-4289-BF72-45CAD472D3D2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -812,6 +821,38 @@ Global
{4DC0426D-E4B6-4D83-BB96-38A017A92E47}.Release|x64.Build.0 = Release|Any CPU
{4DC0426D-E4B6-4D83-BB96-38A017A92E47}.Release|x86.ActiveCfg = Release|Any CPU
{4DC0426D-E4B6-4D83-BB96-38A017A92E47}.Release|x86.Build.0 = Release|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|arm64.ActiveCfg = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|arm64.Build.0 = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|x64.ActiveCfg = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|x64.Build.0 = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|x86.ActiveCfg = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Debug|x86.Build.0 = Debug|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|Any CPU.Build.0 = Release|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|arm64.ActiveCfg = Release|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|arm64.Build.0 = Release|Any CPU
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|x64.ActiveCfg = Release|Any CPU
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -865,6 +906,9 @@ Global
{B8FD66E7-BD6F-4E6F-8199-7CE6149FBE48} = {8F20A905-BD37-4D80-B8DF-FA45276FC23F}
{4DC0426D-E4B6-4D83-BB96-38A017A92E47} = {8F20A905-BD37-4D80-B8DF-FA45276FC23F}
{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}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136}
Expand Down
17 changes: 17 additions & 0 deletions src/System.Design/src/System.Design.Forwards.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,27 @@
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ToolStripMenuItemCodeDomSerializer))]

// internal designers
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ButtonBaseDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ComboBoxDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.FormDocumentDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.GroupBoxDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.LabelDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ListBoxDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ListViewDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.MaskedTextBoxDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.PanelDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.PictureBoxDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.RadioButtonDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.RichTextBoxDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.TextBoxBaseDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.TextBoxDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ToolStripDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ToolStripDropDownDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ToolStripDropDownItemDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ToolStripItemDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ToolStripMenuItemDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.TreeViewDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.UpDownBaseDesigner))]
[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.UserControlDocumentDesigner))]

[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.TabOrder))]
9 changes: 9 additions & 0 deletions src/System.Windows.Forms.Design/src/AssemblyRef.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

internal static class AssemblyRef
{
internal const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
internal const string EnvDTE = "EnvDTE, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=" + MicrosoftPublicKey;
}
Loading