Skip to content

Unify DesignSurface and TestConsole into DemoConsole #13437

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.

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

Conversation

ricardobossan
Copy link
Member

@ricardobossan ricardobossan commented May 9, 2025

Fixes #13388

Proposed changes

  • Renamed files in DesignSurfaceExt to match the updated class names from PR Unify namespaces and class names under DemoConsole #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
Microsoft Reviewers: Open in CodeFlow

@ricardobossan ricardobossan self-assigned this May 9, 2025
@ricardobossan ricardobossan requested a review from a team as a code owner May 9, 2025 21:19
@ricardobossan ricardobossan added the waiting-review This item is waiting on review by one or more members of team label May 9, 2025
Copy link

codecov bot commented May 9, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.20921%. Comparing base (16058a3) to head (5dc54c8).
Report is 2 commits behind head on main.

❗ There is a different number of reports uploaded between BASE (16058a3) and HEAD (5dc54c8). Click for more details.

HEAD has 2 uploads less than BASE
Flag BASE (16058a3) HEAD (5dc54c8)
Debug 3 2
test 1 0
Additional details and impacted files
@@                 Coverage Diff                  @@
##                main      #13437          +/-   ##
====================================================
- Coverage   76.69388%   51.20921%   -25.48467%     
====================================================
  Files           3255        2063        -1192     
  Lines         641604      287751      -353853     
  Branches       47491       42056        -5435     
====================================================
- Hits          492071      147355      -344716     
+ Misses        145877      137510        -8367     
+ Partials        3656        2886         -770     
Flag Coverage Δ
Debug 51.20921% <ø> (-25.48467%) ⬇️
integration 18.99141% <ø> (-0.00350%) ⬇️
production 51.20921% <ø> (-0.00348%) ⬇️
test ?
unit 48.58854% <ø> (+0.00035%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Tanya-Solyanik Tanya-Solyanik added waiting-author-feedback The team requires more information from the author and removed waiting-review This item is waiting on review by one or more members of team labels May 10, 2025
Copy link
Member

@LeafShi1 LeafShi1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ricardobossan DesignSurfaceExt.csproj has been deleted, dll.ico is no longer used and can be deleted

LeafShi1
LeafShi1 previously approved these changes May 12, 2025
Copy link
Member

@LeafShi1 LeafShi1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with one small suggestion

@LeafShi1 LeafShi1 requested a review from Tanya-Solyanik May 12, 2025 08:01
@LeafShi1 LeafShi1 requested review from Copilot and removed request for Tanya-Solyanik May 21, 2025 01:13
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR unifies the DesignSurface and TestConsole projects into a single DemoConsole project. Key changes include renaming files and updating namespaces to DemoConsole, merging project configuration files and properties into DemoConsole.csproj, and updating the solution file to remove references to the old DesignSurface and DesignSurfaceExt projects.

Reviewed Changes

Copilot reviewed 31 out of 32 changed files in this pull request and generated no comments.

Show a summary per file
File Description
MainForm.cs Updated namespace from TestConsole to DemoConsole and added a Timer using alias.
MainForm.MyUserControl.cs Updated namespace from TestConsole to DemoConsole.
MainForm.MyScrollableControl.cs Updated namespace from TestConsole to DemoConsole.
GlobalUsings.cs Revised global using directives, including additions and removals to align with DemoConsole.
DemoConsole.csproj Renamed AssemblyName and RootNamespace; merged settings from DesignSurfaceExt and Directory.Build.props into DemoConsole.csproj.
CustomControls/* Updated namespaces from TestConsole to DemoConsole.
Winforms.sln Removed project references for DesignSurface and DesignSurfaceExt; updated project GUID mappings accordingly.
Files not reviewed (1)
  • src/test/integration/DesignSurface/DemoConsole/MainForm.Designer.cs: Language not supported

@KlausLoeffelmann KlausLoeffelmann added waiting-author-feedback The team requires more information from the author and removed waiting-author-feedback The team requires more information from the author labels Jun 9, 2025
@KlausLoeffelmann
Copy link
Member

Hey @LeafShi1, @ricardobossan

what are we doing with this one?

It probably would need to be rebased and the requested has not been applied yet (but I only looked so briefly).

Do y'all want to keep this?

@ricardobossan ricardobossan force-pushed the Issue_13388_Unify_DesignSurfaceExt_Into_DemoConsole branch from d0be84a to e89632b Compare June 9, 2025 22:20
@dotnet-policy-service dotnet-policy-service bot removed the waiting-author-feedback The team requires more information from the author label Jun 9, 2025
@ricardobossan
Copy link
Member Author

Hi @KlausLoeffelmann,

Tanya's goal was to unify the DemoConsole and DesignSurface projects. This was structured as a two-step process across two PRs:

  1. Unify namespace and class names across all files (PR Unify namespaces and class names under DemoConsole #13433, already merged)
  2. Rename files and folders (this PR)

Since the first step is already complete, renaming the files and folders is the natural continuation.

I've rebased the branch and resolved the merge conflicts. They were straightforward.

After the rebase, I tested the DemoConsole (now fully unified with DesignSurfaceExt) on both target frameworks (.NET 10 and net481). Everything appears to be working as expected.

I’d recommend moving forward with this PR.

@LeafShi1, what do you think?

@ricardobossan ricardobossan added the waiting-review This item is waiting on review by one or more members of team label Jun 9, 2025
LeafShi1
LeafShi1 previously approved these changes Jun 11, 2025
@LeafShi1
Copy link
Member

@LeafShi1, what do you think?

It will be fine to keep this. Please resolve the conflict.

Copy link
Member

@Epica3055 Epica3055 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please resolve the conflict

@ricardobossan ricardobossan force-pushed the Issue_13388_Unify_DesignSurfaceExt_Into_DemoConsole branch from e89632b to e3a74ab Compare June 11, 2025 19:53
Epica3055
Epica3055 previously approved these changes Jun 12, 2025
@ricardobossan ricardobossan force-pushed the Issue_13388_Unify_DesignSurfaceExt_Into_DemoConsole branch from e3a74ab to 1b06bef Compare June 12, 2025 21:29
LeafShi1
LeafShi1 previously approved these changes Jun 13, 2025
Fixes dotnet#13338

- Renamed files in `DesignSurfaceExt` to match the updated class names
from PR dotnet#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
@ricardobossan ricardobossan force-pushed the Issue_13388_Unify_DesignSurfaceExt_Into_DemoConsole branch from 1b06bef to 5dc54c8 Compare July 1, 2025 22:44
@ricardobossan ricardobossan requested a review from LeafShi1 July 1, 2025 23:34
@ricardobossan ricardobossan merged commit 285f3b4 into dotnet:main Jul 2, 2025
8 checks passed
@dotnet-policy-service dotnet-policy-service bot removed the waiting-review This item is waiting on review by one or more members of team label Jul 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unify DesignSurface and TestConsole into DemoConsole
5 participants