Skip to content

Commit e3a74ab

Browse files
author
Ricardo Bossan (BEYONDSOFT CONSULTING INC)
committed
Unify DesignSurface and TestConsole into DemoConsole
Fixes #13338 ## Proposed changes - 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 ## Customer Impact - None ## Risk - Minimal ## Test methodology - Manual ## Test environment(s) - 10.0.100-preview.3.25201.16
1 parent 264f309 commit e3a74ab

32 files changed

+151
-120
lines changed

‎Winforms.sln

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Primit
102102
EndProject
103103
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "interop", "interop", "{A31B1F6F-4880-45DE-9845-EE3EF67C2FCC}"
104104
EndProject
105-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DesignSurface", "DesignSurface", "{43E46506-7DF8-4E7A-A579-996CA43041EB}"
106-
ProjectSection(SolutionItems) = preProject
107-
src\test\integration\DesignSurface\README.md = src\test\integration\DesignSurface\README.md
108-
src\test\integration\DesignSurface\Directory.Build.props = src\test\integration\DesignSurface\Directory.Build.props
109-
EndProjectSection
110-
EndProject
111105
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DemoConsole", "src\test\integration\DesignSurface\DemoConsole\DemoConsole.csproj", "{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}"
112106
EndProject
113-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesignSurfaceExt", "src\test\integration\DesignSurface\DesignSurfaceExt\DesignSurfaceExt.csproj", "{E96C74BA-9F74-4289-BF72-45CAD472D3D2}"
114-
EndProject
115107
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}"
116108
EndProject
117109
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
669661
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|x64.Build.0 = Release|Any CPU
670662
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|x86.ActiveCfg = Release|Any CPU
671663
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4}.Release|x86.Build.0 = Release|Any CPU
672-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
673-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
674-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|arm64.ActiveCfg = Debug|Any CPU
675-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|arm64.Build.0 = Debug|Any CPU
676-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x64.ActiveCfg = Debug|Any CPU
677-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x64.Build.0 = Debug|Any CPU
678-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x86.ActiveCfg = Debug|Any CPU
679-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Debug|x86.Build.0 = Debug|Any CPU
680-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
681-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|Any CPU.Build.0 = Release|Any CPU
682-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|arm64.ActiveCfg = Release|Any CPU
683-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|arm64.Build.0 = Release|Any CPU
684-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x64.ActiveCfg = Release|Any CPU
685-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x64.Build.0 = Release|Any CPU
686-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x86.ActiveCfg = Release|Any CPU
687-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2}.Release|x86.Build.0 = Release|Any CPU
688664
{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
689665
{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D}.Debug|Any CPU.Build.0 = Debug|Any CPU
690666
{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -1162,9 +1138,7 @@ Global
11621138
{1976540D-65A6-45D7-95D2-13106DE6D5BB} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
11631139
{6EE57002-9965-46E7-A48B-B449969738BB} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
11641140
{A31B1F6F-4880-45DE-9845-EE3EF67C2FCC} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
1165-
{43E46506-7DF8-4E7A-A579-996CA43041EB} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
1166-
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4} = {43E46506-7DF8-4E7A-A579-996CA43041EB}
1167-
{E96C74BA-9F74-4289-BF72-45CAD472D3D2} = {43E46506-7DF8-4E7A-A579-996CA43041EB}
1141+
{93310A19-DDCA-4BCD-AEDE-5C5D788DAFB4} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
11681142
{FC75CB54-D8D0-4B41-9A4D-9F862F34A02D} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
11691143
{05FD23CE-60AE-44A8-8DD6-1688F04BE385} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
11701144
{3596BDE6-B211-4BE7-810D-DC7A4315E296} = {E4C6C5F5-46E9-4C63-9628-26752B4D9C11}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
namespace TestConsole;
4+
namespace DemoConsole;
55

66
[DesignerCategory("Default")]
77
[Designer(typeof(CustomButtonDesigner), typeof(IDesigner))]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
namespace TestConsole;
4+
namespace DemoConsole;
55

66
public class CustomButtonDesigner : ControlDesigner
77
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
namespace TestConsole;
4+
namespace DemoConsole;
55

66
public class CustomButtonDesignerActionList : DesignerActionList
77
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
namespace TestConsole;
4+
namespace DemoConsole;
55

66
internal class DesignerActionVerbItem : DesignerActionMethodItem
77
{

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

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<AssemblyName>DesignSurface</AssemblyName>
5-
<RootNamespace>TestConsole</RootNamespace>
4+
<AssemblyName>DemoConsole</AssemblyName>
5+
<RootNamespace>DemoConsole</RootNamespace>
66
<ApplicationIcon>painter.ico</ApplicationIcon>
77
<OutputType>WinExe</OutputType>
88
<StartupObject />
9-
<Copyright>Copyright © Paolo Foti 2008</Copyright>
10-
<Company />
11-
<Authors>Paolo Foti</Authors>
12-
<PackageLicenseExpression>CPOL</PackageLicenseExpression>
139
<PackageProjectUrl>
1410
https://www.codeproject.com/Articles/24385/Have-a-Great-DesignTime-Experience-with-a-Powerful</PackageProjectUrl>
1511
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
12+
<DefaultItemExcludes Condition="'$(TargetFramework)' != 'net481'">
13+
$(DefaultItemExcludes);**/Framework/*
14+
</DefaultItemExcludes>
15+
<EnableXlfLocalization>false</EnableXlfLocalization>
16+
<UpdateXlfOnBuild>false</UpdateXlfOnBuild>
17+
18+
<SuppressLicenseValidation>true</SuppressLicenseValidation>
19+
<NoWarn>$(NoWarn);SA1633</NoWarn>
20+
21+
<!-- Do not build this project when doing a .NET product build. -->
22+
<!-- The files for this project have been removed from the .NET product due to licensing issues. -->
23+
<ExcludeFromDotNetBuild>true</ExcludeFromDotNetBuild>
24+
<IsTestUtilityProject>true</IsTestUtilityProject>
25+
<TargetFrameworks>$(NetCurrent)-windows;net481</TargetFrameworks>
26+
<!-- Unset TargetFramework as this property gets set in the repo's root. This is necessary to avoid over-building. -->
27+
<TargetFramework />
1628
</PropertyGroup>
1729

30+
<ItemGroup Condition="'$(TargetFramework)' != 'net481'">
31+
<!-- Include framework-specific items as 'None' to show them in the Solution Explorer -->
32+
<None Include="**/Framework/*" />
33+
</ItemGroup>
34+
35+
1836
<PropertyGroup Condition="'$(TargetFramework)' == 'net481'">
1937
<NoWarn>$(NoWarn)CS8002;CA1824</NoWarn>
2038
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
@@ -27,14 +45,34 @@
2745
<Compile Update="Properties\Resources.Designer.cs" AutoGen="True" DependentUpon="Resources.resx" DesignTime="True" />
2846
</ItemGroup>
2947

30-
<ItemGroup>
31-
<ProjectReference Include="..\DesignSurfaceExt\DesignSurfaceExt.csproj" />
32-
</ItemGroup>
33-
3448
<ItemGroup>
3549
<None Update="painter.ico">
3650
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3751
</None>
3852
</ItemGroup>
3953

54+
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCurrent)-windows'">
55+
<ProjectReference Include="..\..\..\..\..\src\System.Design\src\System.Design.Facade.csproj" />
56+
<ProjectReference Include="..\..\..\..\..\src\System.Drawing.Design\src\System.Drawing.Design.Facade.csproj" />
57+
<ProjectReference Include="..\..\..\..\..\src\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj" />
58+
<ProjectReference Include="..\..\..\..\..\src\System.Windows.Forms\System.Windows.Forms.csproj" />
59+
<ProjectReference Include="..\..\..\..\..\src\System.Drawing.Common\src\System.Drawing.Common.csproj" />
60+
</ItemGroup>
61+
62+
63+
<PropertyGroup Condition="'$(TargetFramework)' == 'net481'">
64+
<LangVersion>latest</LangVersion>
65+
<ImplicitUsings>enable</ImplicitUsings>
66+
</PropertyGroup>
67+
68+
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCurrent)-windows'">
69+
<PackageReference Include="System.Runtime.Serialization.Formatters" />
70+
</ItemGroup>
71+
<ItemGroup Condition="'$(TargetFramework)' == 'net481'">
72+
<Reference Include="System.Windows.Forms" />
73+
<Reference Include="System.Drawing" />
74+
<Reference Include="System.Design" />
75+
</ItemGroup>
76+
77+
4078
</Project>

‎src/test/integration/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.cs renamed to ‎src/test/integration/DesignSurface/DemoConsole/DesignSurfaceExtended.cs

File renamed without changes.

‎src/test/integration/DesignSurface/DesignSurfaceExt/DesignerOptionServiceExt.cs renamed to ‎src/test/integration/DesignSurface/DemoConsole/DesignerOptionServiceExtended.cs

File renamed without changes.

‎src/test/integration/DesignSurface/DesignSurfaceExt/DesignerSerializationServiceImpl.cs renamed to ‎src/test/integration/DesignSurface/DemoConsole/DesignerSerializationService.cs

File renamed without changes.

‎src/test/integration/DesignSurface/DesignSurfaceExt/Framework/HashHelpers.cs renamed to ‎src/test/integration/DesignSurface/DemoConsole/Framework/HashHelpers.cs

File renamed without changes.

0 commit comments

Comments
 (0)