Cherry-pick cfdcb96: Added DataGrid definitions (from legacy/master)#6
Open
alamin0313 wants to merge 1 commit intomasterfrom
Open
Cherry-pick cfdcb96: Added DataGrid definitions (from legacy/master)#6alamin0313 wants to merge 1 commit intomasterfrom
alamin0313 wants to merge 1 commit intomasterfrom
Conversation
Original commit: cfdcb96a7 - 'Added datagrid definitions' Source: WiseTechGlobal/CargoWise.Controls.WinForms.Legacy (legacy/master) What was cherry-picked: - Added 20 DataGrid-related source files under src/System.Windows.Forms/System/Windows/Forms/: DataGrid.cs, DataGridAddNewRow.cs, DataGridBoolColumn.cs, DataGridCaption.cs, DataGridCell.cs, DataGridColumnStyle.cs, DataGridLineStyle.cs, DataGridParentRows.cs, DataGridParentRowsLabelStyle.cs, DataGridPreferredColumnWidthTypeConverter.cs, DataGridRelationshipRow.cs, DataGridRow.cs, DataGridState.cs, DataGridTableStyle.cs, DataGridTextBox.cs, DataGridTextBoxColumn.cs, DataGridToolTip.cs, GridColumnStylesCollection.cs, GridTableStylesCollection.cs, IDataGridEditingService.cs, SimpleDataGrid.cs - Added DataGrid resource strings to SR.resx and all 13 XLF translation files - Added ClientUtils.cs changes (DataGrid-related utility support) Conflicts resolved: - .editorconfig: Legacy added RS0016 suppression rule already present in our .NET 10 migration commit - kept our version (no duplicate needed). - global.json: Legacy specified dotnet 8.0.100 and an 'sdk' block targeting .NET 8 - kept our .NET 10.0.101 versions, discarded legacy's .NET 8 entries. - src/System.Windows.Forms/Resources/SR.resx: Both sides added new resource strings after the common base - kept HEAD additions (new .NET 10 FolderBrowser and FormScreenCaptureMode strings) AND legacy's DataGrid resource strings, merging both sets into the file. - File location conflicts: Legacy files added under old path src/System.Windows.Forms/src/... which was renamed in .NET 10 to src/System.Windows.Forms/System/... - accepted the new correct paths.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Original commit: cfdcb96a7 - 'Added datagrid definitions'
Source: WiseTechGlobal/CargoWise.Controls.WinForms.Legacy (legacy/master)
What was cherry-picked:
Conflicts resolved: