Skip to content

Commit

Permalink
build: migrate to net8.0 (#26)
Browse files Browse the repository at this point in the history
* build: migrate to net8.0

* chore: update source grid version in nuspec

* chore: code clean up

* chore: update assembly info

* chore: add assembly info for test
  • Loading branch information
Rahul-Siemens authored Jan 24, 2024
1 parent edb90a7 commit 4a461da
Show file tree
Hide file tree
Showing 16 changed files with 167 additions and 584 deletions.
8 changes: 4 additions & 4 deletions .nuget/SourceGrid.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>siemens.sourcegrid</id>
<version>2.0.0</version>
<version>3.0.0</version>
<title>SourceGrid</title>
<authors>Siemens AG</authors>
<owners>SourceGrid contributors</owners>
Expand All @@ -17,13 +17,13 @@
There are a lot of controls of this type available, but often are expensive, difficult to be customize or not compatible with .NET.
SourceGrid allows users to have customizable datasource which is not in DataSet format.
</description>
<copyright>Copyright 2023</copyright>
<copyright>Copyright 2024</copyright>
<tags>Open source grid control tool SOURCEGRID GRID </tags>
<dependencies>
<group targetFramework=".NETFramework4.8" >
<group targetFramework="net8.0" >
</group>
</dependencies>
</metadata>
<files>
<file src="..\Out\net48\Release\SourceGrid.dll" target="lib\net48"/>
<file src="..\Out\net8\Release\net8.0-windows\SourceGrid.dll" target="lib\net8.0"/>
</files></package>
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# SourceGrid

## [3.0.0] - 2024-01-18

### Major Changes

- Migrate to .net 8.0 related to #3
- Deprecated DevAge Serialization

## [2.0.0] - 2023-11-24

### Major Changes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ For more detailed information, Refer article at [CodeProject](https://www.codepr
There only a few preconditions which must be fulfilled.

* Visual Studio 2022
* .Net 4.8
* Net 8.0

# Changes:
1. Enhancement: Smooth horizontal and vertical scrolling
Expand Down
6 changes: 3 additions & 3 deletions SourceGrid.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGrid", "Src\SourceGrid.csproj", "{2A5A1657-DBA8-4117-8E2A-9F1236ACE9E2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGrid", "Src\SourceGrid.csproj", "{2A5A1657-DBA8-4117-8E2A-9F1236ACE9E2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGrid.Tests", "tests\SourceGrid.Tests.csproj", "{E9C1C112-7618-4815-8E4F-BA6D833EB73E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGrid.Tests", "tests\SourceGrid.Tests.csproj", "{E9C1C112-7618-4815-8E4F-BA6D833EB73E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FA4FECFA-5F28-4510-BE5B-80DCDB092491}"
ProjectSection(SolutionItems) = preProject
Expand Down
16 changes: 8 additions & 8 deletions Src/DevAge.Windows.Forms/Windows/Forms/ButtonMultiSelection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -224,17 +224,17 @@ private void btMain_Click(object sender, System.EventArgs e)
}
}

private ContextMenu l_ContextMenu = new ContextMenu();
private ContextMenuStrip l_ContextMenu = new ContextMenuStrip();

private void btArrow_Click(object sender, System.EventArgs e)
{
if (m_ButtonsItems!=null && m_ButtonsItems.Count>0)
{
l_ContextMenu.MenuItems.Clear();
l_ContextMenu.Items.Clear();
foreach(SubButtonItem b in m_ButtonsItems)
{
b.Owner = this;
l_ContextMenu.MenuItems.Add(b.m_MenuItem);
l_ContextMenu.Items.Add(b.m_MenuItem);
}

l_ContextMenu.Show(btMain,new Point(0,btMain.Height));
Expand Down Expand Up @@ -302,10 +302,10 @@ public SubButtonItem(string p_Text, EventHandler p_Event):this(p_Text, p_Event,
public SubButtonItem(string p_Text, EventHandler p_Event, Image p_Image)
{
if (p_Image == null)
m_MenuItem = new MenuItem();
m_MenuItem = new ToolStripMenuItem();
else
{
m_MenuItem = new MenuItem();
m_MenuItem = new ToolStripMenuItem();
//TODO add the image
}

Expand All @@ -315,10 +315,10 @@ public SubButtonItem(string p_Text, EventHandler p_Event, Image p_Image)
public SubButtonItem(string p_Text, EventHandler p_Event, ImageList p_ImageList, int p_ImageIndex)
{
if (p_ImageList == null)
m_MenuItem = new MenuItem();
m_MenuItem = new ToolStripMenuItem();
else
{
m_MenuItem = new MenuItem();
m_MenuItem = new ToolStripMenuItem();
//TODO add the image
}

Expand All @@ -334,7 +334,7 @@ private void DefConstructor(string p_Text, EventHandler p_Event)
Click += p_Event;
}

internal MenuItem m_MenuItem;
internal ToolStripMenuItem m_MenuItem;

private object m_Tag;
public object Tag
Expand Down
2 changes: 1 addition & 1 deletion Src/DevAge.Windows.Forms/Windows/Forms/UIComboBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public bool ReadOnly
{
m_ReadOnlyTextBox.ReadOnly = true;
m_ReadOnlyTextBox.Visible = true;
m_ReadOnlyTextBox.ContextMenu = m_ComboBox.ContextMenu;
m_ReadOnlyTextBox.ContextMenuStrip = m_ComboBox.ContextMenuStrip;
m_ComboBox.SendToBack();
m_ComboBox.Enabled = false;
}
Expand Down
73 changes: 0 additions & 73 deletions Src/DevAgeSourcePack4/Runtime/Serialization/Utilities.cs

This file was deleted.

Loading

0 comments on commit 4a461da

Please sign in to comment.