Skip to content

Commit 2af11a2

Browse files
chuongmepchuongmep
committed
fix form net
1 parent 4c891bc commit 2af11a2

File tree

9 files changed

+161
-244
lines changed

9 files changed

+161
-244
lines changed

‎CADPythonShell/CADPythonShell.csproj‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -57,63 +57,63 @@
5757
<None Remove="Resources\Settings-16.png" />
5858
<None Remove="Resources\Settings-32.png" />
5959
</ItemGroup>
60-
<ItemGroup>
61-
<Reference Include="accoremgd">
62-
<HintPath>..\RefrencedAssemblies\accoremgd.dll</HintPath>
63-
</Reference>
64-
<Reference Include="Acdbmgd">
65-
<HintPath>..\RefrencedAssemblies\acdbmgd.dll</HintPath>
66-
</Reference>
67-
<Reference Include="AdWindows">
68-
<HintPath>..\RefrencedAssemblies\AdWindows.dll</HintPath>
69-
</Reference>
70-
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\RefrencedAssemblies\ICSharpCode.AvalonEdit.dll</HintPath>
73-
</Reference>
74-
<Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\RefrencedAssemblies\IronPython.dll</HintPath>
77-
</Reference>
78-
<Reference Include="IronPython.Modules, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\RefrencedAssemblies\IronPython.Modules.dll</HintPath>
81-
</Reference>
82-
<Reference Include="IronPython.SQLite, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\RefrencedAssemblies\IronPython.SQLite.dll</HintPath>
85-
</Reference>
86-
<Reference Include="IronPython.Wpf, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
87-
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\RefrencedAssemblies\IronPython.Wpf.dll</HintPath>
89-
</Reference>
90-
<Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
91-
<SpecificVersion>False</SpecificVersion>
92-
<HintPath>..\RefrencedAssemblies\Microsoft.Dynamic.dll</HintPath>
93-
</Reference>
94-
<Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
95-
<SpecificVersion>False</SpecificVersion>
96-
<HintPath>..\RefrencedAssemblies\Microsoft.Scripting.dll</HintPath>
97-
</Reference>
98-
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
99-
<SpecificVersion>False</SpecificVersion>
100-
<HintPath>..\RefrencedAssemblies\Microsoft.Scripting.Metadata.dll</HintPath>
101-
</Reference>
102-
<Reference Update="System.Core">
103-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
104-
</Reference>
105-
<Reference Include="System.Windows.Controls.WpfPropertyGrid, Version=2010.11.10.0, Culture=neutral, PublicKeyToken=be4b71144cd8a3e5, processorArchitecture=MSIL">
106-
<SpecificVersion>False</SpecificVersion>
107-
<HintPath>..\RefrencedAssemblies\System.Windows.Controls.WpfPropertyGrid.dll</HintPath>
108-
</Reference>
109-
<Reference Update="System.Xml.Linq">
110-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
111-
</Reference>
112-
<Reference Include="WPG, Version=2.0.3997.38860, Culture=neutral, processorArchitecture=MSIL">
113-
<SpecificVersion>False</SpecificVersion>
114-
<HintPath>..\RefrencedAssemblies\WPG.dll</HintPath>
115-
</Reference>
116-
</ItemGroup>
60+
<!-- <ItemGroup>-->
61+
<!-- <Reference Include="accoremgd">-->
62+
<!-- <HintPath>..\RefrencedAssemblies\accoremgd.dll</HintPath>-->
63+
<!-- </Reference>-->
64+
<!-- <Reference Include="Acdbmgd">-->
65+
<!-- <HintPath>..\RefrencedAssemblies\acdbmgd.dll</HintPath>-->
66+
<!-- </Reference>-->
67+
<!-- <Reference Include="AdWindows">-->
68+
<!-- <HintPath>..\RefrencedAssemblies\AdWindows.dll</HintPath>-->
69+
<!-- </Reference>-->
70+
<!-- <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">-->
71+
<!-- <SpecificVersion>False</SpecificVersion>-->
72+
<!-- <HintPath>..\RefrencedAssemblies\ICSharpCode.AvalonEdit.dll</HintPath>-->
73+
<!-- </Reference>-->
74+
<!-- <Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">-->
75+
<!-- <SpecificVersion>False</SpecificVersion>-->
76+
<!-- <HintPath>..\RefrencedAssemblies\IronPython.dll</HintPath>-->
77+
<!-- </Reference>-->
78+
<!-- <Reference Include="IronPython.Modules, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">-->
79+
<!-- <SpecificVersion>False</SpecificVersion>-->
80+
<!-- <HintPath>..\RefrencedAssemblies\IronPython.Modules.dll</HintPath>-->
81+
<!-- </Reference>-->
82+
<!-- <Reference Include="IronPython.SQLite, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">-->
83+
<!-- <SpecificVersion>False</SpecificVersion>-->
84+
<!-- <HintPath>..\RefrencedAssemblies\IronPython.SQLite.dll</HintPath>-->
85+
<!-- </Reference>-->
86+
<!-- <Reference Include="IronPython.Wpf, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">-->
87+
<!-- <SpecificVersion>False</SpecificVersion>-->
88+
<!-- <HintPath>..\RefrencedAssemblies\IronPython.Wpf.dll</HintPath>-->
89+
<!-- </Reference>-->
90+
<!-- <Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">-->
91+
<!-- <SpecificVersion>False</SpecificVersion>-->
92+
<!-- <HintPath>..\RefrencedAssemblies\Microsoft.Dynamic.dll</HintPath>-->
93+
<!-- </Reference>-->
94+
<!-- <Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">-->
95+
<!-- <SpecificVersion>False</SpecificVersion>-->
96+
<!-- <HintPath>..\RefrencedAssemblies\Microsoft.Scripting.dll</HintPath>-->
97+
<!-- </Reference>-->
98+
<!-- <Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">-->
99+
<!-- <SpecificVersion>False</SpecificVersion>-->
100+
<!-- <HintPath>..\RefrencedAssemblies\Microsoft.Scripting.Metadata.dll</HintPath>-->
101+
<!-- </Reference>-->
102+
<!-- <Reference Update="System.Core">-->
103+
<!-- <RequiredTargetFramework>3.5</RequiredTargetFramework>-->
104+
<!-- </Reference>-->
105+
<!-- <Reference Include="System.Windows.Controls.WpfPropertyGrid, Version=2010.11.10.0, Culture=neutral, PublicKeyToken=be4b71144cd8a3e5, processorArchitecture=MSIL">-->
106+
<!-- <SpecificVersion>False</SpecificVersion>-->
107+
<!-- <HintPath>..\RefrencedAssemblies\System.Windows.Controls.WpfPropertyGrid.dll</HintPath>-->
108+
<!-- </Reference>-->
109+
<!-- <Reference Update="System.Xml.Linq">-->
110+
<!-- <RequiredTargetFramework>3.5</RequiredTargetFramework>-->
111+
<!-- </Reference>-->
112+
<!-- <Reference Include="WPG, Version=2.0.3997.38860, Culture=neutral, processorArchitecture=MSIL">-->
113+
<!-- <SpecificVersion>False</SpecificVersion>-->
114+
<!-- <HintPath>..\RefrencedAssemblies\WPG.dll</HintPath>-->
115+
<!-- </Reference>-->
116+
<!-- </ItemGroup>-->
117117

118118
<ItemGroup>
119119
<Resource Include="Images\New.png" />
@@ -229,7 +229,7 @@
229229
<ProjectReference Include="..\PythonConsoleControl\PythonConsoleControl.csproj" />
230230
</ItemGroup>
231231
<ItemGroup>
232-
<PackageReference Include="IronPython" Version="3.4.0" />
232+
<PackageReference Include="IronPython" Version="3.4.2" />
233233
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
234234
</ItemGroup>
235235
<PropertyGroup />

‎MgdDbgLibrary/MgdDbg.csproj‎

Lines changed: 6 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
44
<ProjectType>Local</ProjectType>
55
<LangVersion>latest</LangVersion>
6-
<TargetFramework>net48</TargetFramework>
76
<DefaultClientScript>JScript</DefaultClientScript>
87
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
98
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -34,7 +33,6 @@
3433
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
3534
<UseWindowsForms>true</UseWindowsForms>
3635
<UseWPF>true</UseWPF>
37-
<!-- <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>-->
3836
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
3937
</PropertyGroup>
4038
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -49,60 +47,12 @@
4947
<DebugSymbols>true</DebugSymbols>
5048
<DebugType>full</DebugType>
5149
</PropertyGroup>
52-
<PropertyGroup>
53-
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
54-
None
55-
</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
56-
</PropertyGroup>
57-
<ItemGroup>
58-
<Reference Update="System">
59-
<Name>System</Name>
60-
</Reference>
61-
<Reference Update="System.Core">
62-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
63-
</Reference>
64-
<Reference Update="System.Data">
65-
<Name>System.Data</Name>
66-
</Reference>
67-
<Reference Update="System.Drawing">
68-
<Name>System.Drawing</Name>
69-
</Reference>
70-
<Reference Update="System.Xml">
71-
<Name>System.XML</Name>
72-
</Reference>
73-
</ItemGroup>
74-
<ItemGroup>
75-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
76-
<Visible>False</Visible>
77-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
78-
<Install>false</Install>
79-
</BootstrapperPackage>
80-
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
81-
<Visible>False</Visible>
82-
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
83-
<Install>true</Install>
84-
</BootstrapperPackage>
85-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
86-
<Visible>False</Visible>
87-
<ProductName>.NET Framework 3.0 %28x86%29</ProductName>
88-
<Install>false</Install>
89-
</BootstrapperPackage>
90-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
91-
<Visible>False</Visible>
92-
<ProductName>.NET Framework 3.5</ProductName>
93-
<Install>false</Install>
94-
</BootstrapperPackage>
95-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
96-
<Visible>False</Visible>
97-
<ProductName>.NET Framework 3.5 SP1</ProductName>
98-
<Install>false</Install>
99-
</BootstrapperPackage>
100-
</ItemGroup>
50+
10151
<ItemGroup>
102-
<PackageReference Include="Chuongmep.Acad.Api.accoremgd" Version="2023.0.2" />
103-
<PackageReference Include="Chuongmep.Acad.Api.acdbmgd" Version="2023.0.2" />
104-
<PackageReference Include="Chuongmep.Acad.Api.acmgd" Version="2023.0.2" />
105-
<PackageReference Include="Chuongmep.Acad.Api.AdWindows" Version="2023.0.2" />
52+
<PackageReference Include="Chuongmep.Acad.Api.accoremgd" Version="2025.0.0" />
53+
<PackageReference Include="Chuongmep.Acad.Api.acdbmgd" Version="2025.0.0" />
54+
<PackageReference Include="Chuongmep.Acad.Api.acmgd" Version="2025.0.0" />
55+
<PackageReference Include="Chuongmep.Acad.Api.AdWindows" Version="2025.0.0" />
10656
</ItemGroup>
10757
<PropertyGroup />
10858
</Project>

‎MgdDbgLibrary/Snoop/Forms/DBObjects.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ public class DBObjects : System.Windows.Forms.Form
4141
protected System.Windows.Forms.ColumnHeader m_lvCol_label;
4242
protected System.Windows.Forms.ColumnHeader m_lvCol_value;
4343
protected System.Windows.Forms.TreeView m_tvObjs;
44-
protected System.Windows.Forms.ContextMenu m_cntxMenuObjId;
45-
protected System.Windows.Forms.MenuItem m_mnuItemObjectDbInfo;
46-
protected System.Windows.Forms.MenuItem m_mnuItemBrowseReflection;
47-
protected System.Windows.Forms.MenuItem m_mnuItemSeparator1;
48-
protected System.Windows.Forms.MenuItem m_mnuItemAddToSnoopObjSet;
49-
protected System.Windows.Forms.MenuItem m_mnuItemRemoveFromSnoopObjSet;
50-
protected System.Windows.Forms.MenuItem m_mnuItemShowSnoopObjSet;
44+
protected System.Windows.Forms.ContextMenuStrip m_cntxMenuObjId;
45+
protected System.Windows.Forms.ToolStripMenuItem m_mnuItemObjectDbInfo;
46+
protected System.Windows.Forms.ToolStripMenuItem m_mnuItemBrowseReflection;
47+
protected System.Windows.Forms.ToolStripMenuItem m_mnuItemSeparator1;
48+
protected System.Windows.Forms.ToolStripMenuItem m_mnuItemAddToSnoopObjSet;
49+
protected System.Windows.Forms.ToolStripMenuItem m_mnuItemRemoveFromSnoopObjSet;
50+
protected System.Windows.Forms.ToolStripMenuItem m_mnuItemShowSnoopObjSet;
5151

5252
protected Snoop.Collectors.Objects m_snoopCollector = new Snoop.Collectors.Objects();
5353
protected AcDb.ObjectId m_curObjId;
5454
protected TransactionHelper m_trans = null;
5555
private ContextMenuStrip listViewContextMenuStrip;
5656
private ToolStripMenuItem copyToolStripMenuItem;
57-
private MenuItem m_mnuItemCopy;
57+
private ToolStripMenuItem m_mnuItemCopy;
5858
private ToolStrip toolStrip1;
5959
private ToolStripButton toolStripButton1;
6060
private ToolStripButton toolStripButton2;
@@ -132,14 +132,14 @@ protected void
132132
this.components = new System.ComponentModel.Container();
133133
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DBObjects));
134134
this.m_tvObjs = new System.Windows.Forms.TreeView();
135-
this.m_cntxMenuObjId = new System.Windows.Forms.ContextMenu();
136-
this.m_mnuItemCopy = new System.Windows.Forms.MenuItem();
137-
this.m_mnuItemObjectDbInfo = new System.Windows.Forms.MenuItem();
138-
this.m_mnuItemBrowseReflection = new System.Windows.Forms.MenuItem();
139-
this.m_mnuItemSeparator1 = new System.Windows.Forms.MenuItem();
140-
this.m_mnuItemAddToSnoopObjSet = new System.Windows.Forms.MenuItem();
141-
this.m_mnuItemRemoveFromSnoopObjSet = new System.Windows.Forms.MenuItem();
142-
this.m_mnuItemShowSnoopObjSet = new System.Windows.Forms.MenuItem();
135+
this.m_cntxMenuObjId = new System.Windows.Forms.ContextMenuStrip();
136+
this.m_mnuItemCopy = new System.Windows.Forms.ToolStripMenuItem();
137+
this.m_mnuItemObjectDbInfo = new System.Windows.Forms.ToolStripMenuItem();
138+
this.m_mnuItemBrowseReflection = new System.Windows.Forms.ToolStripMenuItem();
139+
this.m_mnuItemSeparator1 = new System.Windows.Forms.ToolStripMenuItem();
140+
this.m_mnuItemAddToSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem();
141+
this.m_mnuItemRemoveFromSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem();
142+
this.m_mnuItemShowSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem();
143143
this.m_lvData = new System.Windows.Forms.ListView();
144144
this.m_lvCol_label = new System.Windows.Forms.ColumnHeader();
145145
this.m_lvCol_value = new System.Windows.Forms.ColumnHeader();
@@ -161,7 +161,7 @@ protected void
161161
//
162162
this.m_tvObjs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
163163
| System.Windows.Forms.AnchorStyles.Left)));
164-
this.m_tvObjs.ContextMenu = this.m_cntxMenuObjId;
164+
this.m_tvObjs.ContextMenuStrip = this.m_cntxMenuObjId;
165165
this.m_tvObjs.HideSelection = false;
166166
this.m_tvObjs.Location = new System.Drawing.Point(20, 41);
167167
this.m_tvObjs.Name = "m_tvObjs";
@@ -173,54 +173,54 @@ protected void
173173
//
174174
// m_cntxMenuObjId
175175
//
176-
this.m_cntxMenuObjId.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
176+
this.m_cntxMenuObjId.Items.AddRange(new System.Windows.Forms.ToolStripMenuItem[] {
177177
this.m_mnuItemCopy,
178178
this.m_mnuItemObjectDbInfo,
179179
this.m_mnuItemBrowseReflection,
180180
this.m_mnuItemSeparator1,
181181
this.m_mnuItemAddToSnoopObjSet,
182182
this.m_mnuItemRemoveFromSnoopObjSet,
183183
this.m_mnuItemShowSnoopObjSet});
184-
this.m_cntxMenuObjId.Popup += new System.EventHandler(this.OnContextMenuPopup);
184+
this.m_cntxMenuObjId.Opened += new System.EventHandler(this.OnContextMenuPopup);
185185
//
186186
// m_mnuItemCopy
187187
//
188-
this.m_mnuItemCopy.Index = 0;
188+
// this.m_mnuItemCopy.Index = 0;
189189
this.m_mnuItemCopy.Text = "Copy";
190190
this.m_mnuItemCopy.Click += new System.EventHandler(this.ContextMenuClick_Copy);
191191
//
192192
// m_mnuItemObjectDbInfo
193193
//
194-
this.m_mnuItemObjectDbInfo.Index = 1;
194+
// this.m_mnuItemObjectDbInfo.Index = 1;
195195
this.m_mnuItemObjectDbInfo.Text = "Show ObjectID Info...";
196196
this.m_mnuItemObjectDbInfo.Click += new System.EventHandler(this.ContextMenuClick_ObjIdInfo);
197197
//
198198
// m_mnuItemBrowseReflection
199199
//
200-
this.m_mnuItemBrowseReflection.Index = 2;
200+
// this.m_mnuItemBrowseReflection.Index = 2;
201201
this.m_mnuItemBrowseReflection.Text = "Browse Using Reflection...";
202202
this.m_mnuItemBrowseReflection.Click += new System.EventHandler(this.ContextMenuClick_BrowseReflection);
203203
//
204204
// m_mnuItemSeparator1
205205
//
206-
this.m_mnuItemSeparator1.Index = 3;
206+
// this.m_mnuItemSeparator1.Index = 3;
207207
this.m_mnuItemSeparator1.Text = "-";
208208
//
209209
// m_mnuItemAddToSnoopObjSet
210210
//
211-
this.m_mnuItemAddToSnoopObjSet.Index = 4;
211+
// this.m_mnuItemAddToSnoopObjSet.Index = 4;
212212
this.m_mnuItemAddToSnoopObjSet.Text = "Add To Snoop Object Set";
213213
this.m_mnuItemAddToSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_AddToSnoopObjSet);
214214
//
215215
// m_mnuItemRemoveFromSnoopObjSet
216216
//
217-
this.m_mnuItemRemoveFromSnoopObjSet.Index = 5;
217+
// this.m_mnuItemRemoveFromSnoopObjSet.Index = 5;
218218
this.m_mnuItemRemoveFromSnoopObjSet.Text = "Remove From Snoop Object Set";
219219
this.m_mnuItemRemoveFromSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_RemoveFromSnoopObjSet);
220220
//
221221
// m_mnuItemShowSnoopObjSet
222222
//
223-
this.m_mnuItemShowSnoopObjSet.Index = 6;
223+
// this.m_mnuItemShowSnoopObjSet.Index = 6;
224224
this.m_mnuItemShowSnoopObjSet.Text = "Show Snoop Object Set...";
225225
this.m_mnuItemShowSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_ShowSnoopObjSet);
226226
//

0 commit comments

Comments
 (0)