diff --git a/CADPythonShell.sln b/CADPythonShell.sln index 078e858..5651275 100644 --- a/CADPythonShell.sln +++ b/CADPythonShell.sln @@ -31,49 +31,43 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CADSnoop", "CadLookup\CADSn EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug A23|Any CPU = Debug A23|Any CPU + Debug A25|Any CPU = Debug A25|Any CPU Installer|Any CPU = Installer|Any CPU - Release A23|Any CPU = Release A23|Any CPU + Release A25|Any CPU = Release A25|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU - {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A23|Any CPU.Build.0 = Debug|Any CPU {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Installer|Any CPU.ActiveCfg = Release|Any CPU - {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A23|Any CPU.ActiveCfg = Release|Any CPU - {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A23|Any CPU.Build.0 = Release|Any CPU - {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU - {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU - {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU - {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU - {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A23|Any CPU.Build.0 = Release A23|Any CPU - {C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU - {C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A23|Any CPU.Build.0 = Debug|Any CPU + {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU + {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A25|Any CPU.ActiveCfg = Release|Any CPU + {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A25|Any CPU.Build.0 = Release|Any CPU + {F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A25|Any CPU.Build.0 = Debug|Any CPU {C8446636-C663-409F-82D0-72C0D55BBA1C}.Installer|Any CPU.ActiveCfg = Release|Any CPU - {C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A23|Any CPU.ActiveCfg = Release|Any CPU - {C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A23|Any CPU.Build.0 = Release|Any CPU - {4729BE21-C6FF-4115-A516-65F5A312574C}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU - {4729BE21-C6FF-4115-A516-65F5A312574C}.Debug A23|Any CPU.Build.0 = Debug|Any CPU + {C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU + {C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A25|Any CPU.ActiveCfg = Release|Any CPU + {C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A25|Any CPU.Build.0 = Release|Any CPU + {C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A25|Any CPU.Build.0 = Debug|Any CPU {4729BE21-C6FF-4115-A516-65F5A312574C}.Installer|Any CPU.ActiveCfg = Release|Any CPU - {4729BE21-C6FF-4115-A516-65F5A312574C}.Release A23|Any CPU.ActiveCfg = Release|Any CPU - {4729BE21-C6FF-4115-A516-65F5A312574C}.Release A23|Any CPU.Build.0 = Release|Any CPU - {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU - {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Debug A23|Any CPU.Build.0 = Debug|Any CPU + {4729BE21-C6FF-4115-A516-65F5A312574C}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU + {4729BE21-C6FF-4115-A516-65F5A312574C}.Release A25|Any CPU.ActiveCfg = Release|Any CPU + {4729BE21-C6FF-4115-A516-65F5A312574C}.Installer|Any CPU.Build.0 = Release|Any CPU {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Installer|Any CPU.ActiveCfg = Release|Any CPU {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Installer|Any CPU.Build.0 = Release|Any CPU - {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Release A23|Any CPU.ActiveCfg = Release|Any CPU - {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Release A23|Any CPU.Build.0 = Release|Any CPU - {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU - {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A23|Any CPU.Build.0 = Debug|Any CPU + {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU + {51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Release A25|Any CPU.ActiveCfg = Release|Any CPU {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Installer|Any CPU.ActiveCfg = Debug|Any CPU - {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Installer|Any CPU.Build.0 = Debug|Any CPU - {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A23|Any CPU.ActiveCfg = Debug|Any CPU - {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A23|Any CPU.Build.0 = Debug|Any CPU - {19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU - {19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A23|Any CPU.Build.0 = Debug|Any CPU + {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU + {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A25|Any CPU.ActiveCfg = Release|Any CPU + {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A25|Any CPU.Build.0 = Release|Any CPU + {A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A25|Any CPU.Build.0 = Debug|Any CPU {19C935D2-8649-496F-ADD4-3D5E370B441A}.Installer|Any CPU.ActiveCfg = Debug|Any CPU - {19C935D2-8649-496F-ADD4-3D5E370B441A}.Installer|Any CPU.Build.0 = Debug|Any CPU - {19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A23|Any CPU.ActiveCfg = Debug|Any CPU - {19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A23|Any CPU.Build.0 = Debug|Any CPU + {19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU + {19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A25|Any CPU.ActiveCfg = Release|Any CPU + {19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A25|Any CPU.Build.0 = Release|Any CPU + {19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A25|Any CPU.Build.0 = Debug|Any CPU + {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A25|Any CPU.ActiveCfg = Debug A25|Any CPU + {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A25|Any CPU.Build.0 = Debug A25|Any CPU + {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A25|Any CPU.ActiveCfg = Release A25|Any CPU + {7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A25|Any CPU.Build.0 = Release A25|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CADPythonShell/CADPythonShell.csproj b/CADPythonShell/CADPythonShell.csproj index 417a3fb..9f6d514 100644 --- a/CADPythonShell/CADPythonShell.csproj +++ b/CADPythonShell/CADPythonShell.csproj @@ -1,6 +1,6 @@  - net48 + net8.0-windows false false latest @@ -8,9 +8,10 @@ true true x64 - Debug A23 - $(Configurations);Release A23 + Debug A25 + $(Configurations);Release A25 true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -228,7 +229,7 @@ - + diff --git a/CADPythonShell/PackageContents.xml b/CADPythonShell/PackageContents.xml index 77d42fc..534009f 100644 --- a/CADPythonShell/PackageContents.xml +++ b/CADPythonShell/PackageContents.xml @@ -1,10 +1,10 @@  diff --git a/CADPythonShell/Properties/launchSettings.json b/CADPythonShell/Properties/launchSettings.json index 0c8962e..515d3e9 100644 --- a/CADPythonShell/Properties/launchSettings.json +++ b/CADPythonShell/Properties/launchSettings.json @@ -1,8 +1,8 @@ { "profiles": { - "CAD23": { + "CAD25": { "commandName": "Executable", - "executablePath": "C:\\Program Files\\Autodesk\\AutoCAD 2023\\acad.exe" + "executablePath": "C:\\Program Files\\Autodesk\\AutoCAD 2025\\acad.exe" } } } \ No newline at end of file diff --git a/CADRuntime/CADRuntime.csproj b/CADRuntime/CADRuntime.csproj index 227cb22..6881f44 100644 --- a/CADRuntime/CADRuntime.csproj +++ b/CADRuntime/CADRuntime.csproj @@ -1,12 +1,13 @@  - net48 + net8.0-windows latest false true true true false + true @@ -17,12 +18,11 @@ en-US - - ..\RefrencedAssemblies\accoremgd.dll - - - ..\RefrencedAssemblies\acdbmgd.dll - + + + + + False ..\RefrencedAssemblies\IronPython.dll @@ -54,8 +54,8 @@ - - + + @@ -64,8 +64,8 @@ - - + + diff --git a/CADRuntime/Resources/IronPython.StdLib.3.4.2.zip b/CADRuntime/Resources/IronPython.StdLib.3.4.2.zip new file mode 100644 index 0000000..f2eab59 Binary files /dev/null and b/CADRuntime/Resources/IronPython.StdLib.3.4.2.zip differ diff --git a/CADRuntime/ScriptExecutor.cs b/CADRuntime/ScriptExecutor.cs index 3cf9d4d..c34e058 100644 --- a/CADRuntime/ScriptExecutor.cs +++ b/CADRuntime/ScriptExecutor.cs @@ -103,8 +103,9 @@ private void AddEmbeddedLib(ScriptEngine engine) { // use embedded python lib var asm = this.GetType().Assembly; - var resQuery = from name in asm.GetManifestResourceNames() - where name.ToLowerInvariant().EndsWith("ironpython.3.4.0.zip") + string[] resourceNames = asm.GetManifestResourceNames(); + var resQuery = from name in resourceNames + where name.ToLowerInvariant().EndsWith("ironpython.stdlib.3.4.2.zip") select name; var resName = resQuery.Single(); var importer = new IronPython.Modules.ResourceMetaPathImporter(asm, resName); diff --git a/CadLookup/CADSnoop.csproj b/CadLookup/CADSnoop.csproj index f9e49b8..3ebff64 100644 --- a/CadLookup/CADSnoop.csproj +++ b/CadLookup/CADSnoop.csproj @@ -1,6 +1,6 @@  - net48 + net8.0-windows Library false true @@ -16,16 +16,8 @@ - - ..\RefrencedAssemblies\accoremgd.dll - - - ..\RefrencedAssemblies\acdbmgd.dll - - - - - + + diff --git a/MgdDbgLibrary/MgdDbg.csproj b/MgdDbgLibrary/MgdDbg.csproj index c759fd1..fd4ea18 100644 --- a/MgdDbgLibrary/MgdDbg.csproj +++ b/MgdDbgLibrary/MgdDbg.csproj @@ -1,9 +1,8 @@  - net48 + net8.0-windows Local latest - net48 JScript Grid IE50 @@ -34,7 +33,7 @@ false true true - true + true 285212672 @@ -48,60 +47,12 @@ true full - - - None - - - - - System - - - 3.5 - - - System.Data - - - System.Drawing - - - System.XML - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - + - - - - + + + + \ No newline at end of file diff --git a/MgdDbgLibrary/Snoop/Forms/DBObjects.cs b/MgdDbgLibrary/Snoop/Forms/DBObjects.cs index e15e03b..79322bd 100644 --- a/MgdDbgLibrary/Snoop/Forms/DBObjects.cs +++ b/MgdDbgLibrary/Snoop/Forms/DBObjects.cs @@ -41,20 +41,20 @@ public class DBObjects : System.Windows.Forms.Form protected System.Windows.Forms.ColumnHeader m_lvCol_label; protected System.Windows.Forms.ColumnHeader m_lvCol_value; protected System.Windows.Forms.TreeView m_tvObjs; - protected System.Windows.Forms.ContextMenu m_cntxMenuObjId; - protected System.Windows.Forms.MenuItem m_mnuItemObjectDbInfo; - protected System.Windows.Forms.MenuItem m_mnuItemBrowseReflection; - protected System.Windows.Forms.MenuItem m_mnuItemSeparator1; - protected System.Windows.Forms.MenuItem m_mnuItemAddToSnoopObjSet; - protected System.Windows.Forms.MenuItem m_mnuItemRemoveFromSnoopObjSet; - protected System.Windows.Forms.MenuItem m_mnuItemShowSnoopObjSet; + protected System.Windows.Forms.ContextMenuStrip m_cntxMenuObjId; + protected System.Windows.Forms.ToolStripMenuItem m_mnuItemObjectDbInfo; + protected System.Windows.Forms.ToolStripMenuItem m_mnuItemBrowseReflection; + protected System.Windows.Forms.ToolStripMenuItem m_mnuItemSeparator1; + protected System.Windows.Forms.ToolStripMenuItem m_mnuItemAddToSnoopObjSet; + protected System.Windows.Forms.ToolStripMenuItem m_mnuItemRemoveFromSnoopObjSet; + protected System.Windows.Forms.ToolStripMenuItem m_mnuItemShowSnoopObjSet; protected Snoop.Collectors.Objects m_snoopCollector = new Snoop.Collectors.Objects(); protected AcDb.ObjectId m_curObjId; protected TransactionHelper m_trans = null; private ContextMenuStrip listViewContextMenuStrip; private ToolStripMenuItem copyToolStripMenuItem; - private MenuItem m_mnuItemCopy; + private ToolStripMenuItem m_mnuItemCopy; private ToolStrip toolStrip1; private ToolStripButton toolStripButton1; private ToolStripButton toolStripButton2; @@ -132,14 +132,14 @@ protected void this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DBObjects)); this.m_tvObjs = new System.Windows.Forms.TreeView(); - this.m_cntxMenuObjId = new System.Windows.Forms.ContextMenu(); - this.m_mnuItemCopy = new System.Windows.Forms.MenuItem(); - this.m_mnuItemObjectDbInfo = new System.Windows.Forms.MenuItem(); - this.m_mnuItemBrowseReflection = new System.Windows.Forms.MenuItem(); - this.m_mnuItemSeparator1 = new System.Windows.Forms.MenuItem(); - this.m_mnuItemAddToSnoopObjSet = new System.Windows.Forms.MenuItem(); - this.m_mnuItemRemoveFromSnoopObjSet = new System.Windows.Forms.MenuItem(); - this.m_mnuItemShowSnoopObjSet = new System.Windows.Forms.MenuItem(); + this.m_cntxMenuObjId = new System.Windows.Forms.ContextMenuStrip(); + this.m_mnuItemCopy = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemObjectDbInfo = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemBrowseReflection = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemSeparator1 = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemAddToSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemRemoveFromSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemShowSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem(); this.m_lvData = new System.Windows.Forms.ListView(); this.m_lvCol_label = new System.Windows.Forms.ColumnHeader(); this.m_lvCol_value = new System.Windows.Forms.ColumnHeader(); @@ -161,7 +161,7 @@ protected void // this.m_tvObjs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.m_tvObjs.ContextMenu = this.m_cntxMenuObjId; + this.m_tvObjs.ContextMenuStrip = this.m_cntxMenuObjId; this.m_tvObjs.HideSelection = false; this.m_tvObjs.Location = new System.Drawing.Point(20, 41); this.m_tvObjs.Name = "m_tvObjs"; @@ -173,7 +173,7 @@ protected void // // m_cntxMenuObjId // - this.m_cntxMenuObjId.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.m_cntxMenuObjId.Items.AddRange(new System.Windows.Forms.ToolStripMenuItem[] { this.m_mnuItemCopy, this.m_mnuItemObjectDbInfo, this.m_mnuItemBrowseReflection, @@ -181,46 +181,46 @@ protected void this.m_mnuItemAddToSnoopObjSet, this.m_mnuItemRemoveFromSnoopObjSet, this.m_mnuItemShowSnoopObjSet}); - this.m_cntxMenuObjId.Popup += new System.EventHandler(this.OnContextMenuPopup); + this.m_cntxMenuObjId.Opened += new System.EventHandler(this.OnContextMenuPopup); // // m_mnuItemCopy // - this.m_mnuItemCopy.Index = 0; + // this.m_mnuItemCopy.Index = 0; this.m_mnuItemCopy.Text = "Copy"; this.m_mnuItemCopy.Click += new System.EventHandler(this.ContextMenuClick_Copy); // // m_mnuItemObjectDbInfo // - this.m_mnuItemObjectDbInfo.Index = 1; + // this.m_mnuItemObjectDbInfo.Index = 1; this.m_mnuItemObjectDbInfo.Text = "Show ObjectID Info..."; this.m_mnuItemObjectDbInfo.Click += new System.EventHandler(this.ContextMenuClick_ObjIdInfo); // // m_mnuItemBrowseReflection // - this.m_mnuItemBrowseReflection.Index = 2; + // this.m_mnuItemBrowseReflection.Index = 2; this.m_mnuItemBrowseReflection.Text = "Browse Using Reflection..."; this.m_mnuItemBrowseReflection.Click += new System.EventHandler(this.ContextMenuClick_BrowseReflection); // // m_mnuItemSeparator1 // - this.m_mnuItemSeparator1.Index = 3; + // this.m_mnuItemSeparator1.Index = 3; this.m_mnuItemSeparator1.Text = "-"; // // m_mnuItemAddToSnoopObjSet // - this.m_mnuItemAddToSnoopObjSet.Index = 4; + // this.m_mnuItemAddToSnoopObjSet.Index = 4; this.m_mnuItemAddToSnoopObjSet.Text = "Add To Snoop Object Set"; this.m_mnuItemAddToSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_AddToSnoopObjSet); // // m_mnuItemRemoveFromSnoopObjSet // - this.m_mnuItemRemoveFromSnoopObjSet.Index = 5; + // this.m_mnuItemRemoveFromSnoopObjSet.Index = 5; this.m_mnuItemRemoveFromSnoopObjSet.Text = "Remove From Snoop Object Set"; this.m_mnuItemRemoveFromSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_RemoveFromSnoopObjSet); // // m_mnuItemShowSnoopObjSet // - this.m_mnuItemShowSnoopObjSet.Index = 6; + // this.m_mnuItemShowSnoopObjSet.Index = 6; this.m_mnuItemShowSnoopObjSet.Text = "Show Snoop Object Set..."; this.m_mnuItemShowSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_ShowSnoopObjSet); // diff --git a/MgdDbgLibrary/Snoop/Forms/Database.cs b/MgdDbgLibrary/Snoop/Forms/Database.cs index 3dbde29..92146be 100644 --- a/MgdDbgLibrary/Snoop/Forms/Database.cs +++ b/MgdDbgLibrary/Snoop/Forms/Database.cs @@ -54,13 +54,13 @@ public class Database : System.Windows.Forms.Form private System.Windows.Forms.ListView m_lvDb; private System.Windows.Forms.ColumnHeader m_colDbField; private System.Windows.Forms.ColumnHeader m_colDbValue; - private System.Windows.Forms.ContextMenu m_cntxMenuObjId; - private System.Windows.Forms.MenuItem m_mnuItemObjectDbInfo; - private System.Windows.Forms.MenuItem m_mnuItemBrowseReflection; - private System.Windows.Forms.MenuItem m_mnuItemSeparator1; - private System.Windows.Forms.MenuItem m_mnuItemAddToSnoopObjSet; - private System.Windows.Forms.MenuItem m_mnuItemRemoveFromSnoopObjSet; - private System.Windows.Forms.MenuItem m_mnuItemShowSnoopObjSet; + private System.Windows.Forms.ContextMenuStrip m_cntxMenuObjId; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemObjectDbInfo; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemBrowseReflection; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemSeparator1; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemAddToSnoopObjSet; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemRemoveFromSnoopObjSet; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemShowSnoopObjSet; private Snoop.Collectors.Objects m_snoopCollector = new Snoop.Collectors.Objects(); private AcDb.Database m_db = null; @@ -70,7 +70,7 @@ public class Database : System.Windows.Forms.Form private TransactionHelper m_trans = null; private ContextMenuStrip listViewContextMenuStrip; private ToolStripMenuItem copyToolStripMenuItem; - private MenuItem m_mnuItemCopy; + private ToolStripMenuItem m_mnuItemCopy; private ToolStrip toolStrip1; private ToolStripButton toolStripButton1; private ToolStripButton toolStripButton2; @@ -130,14 +130,14 @@ private void InitializeComponent() this.listViewContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.m_tvSymTbls = new System.Windows.Forms.TreeView(); - this.m_cntxMenuObjId = new System.Windows.Forms.ContextMenu(); - this.m_mnuItemCopy = new System.Windows.Forms.MenuItem(); - this.m_mnuItemObjectDbInfo = new System.Windows.Forms.MenuItem(); - this.m_mnuItemBrowseReflection = new System.Windows.Forms.MenuItem(); - this.m_mnuItemSeparator1 = new System.Windows.Forms.MenuItem(); - this.m_mnuItemAddToSnoopObjSet = new System.Windows.Forms.MenuItem(); - this.m_mnuItemRemoveFromSnoopObjSet = new System.Windows.Forms.MenuItem(); - this.m_mnuItemShowSnoopObjSet = new System.Windows.Forms.MenuItem(); + this.m_cntxMenuObjId = new System.Windows.Forms.ContextMenuStrip(); + this.m_mnuItemCopy = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemObjectDbInfo = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemBrowseReflection = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemSeparator1 = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemAddToSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemRemoveFromSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemShowSnoopObjSet = new System.Windows.Forms.ToolStripMenuItem(); this.m_tabDicts = new System.Windows.Forms.TabPage(); this.m_lvDict = new System.Windows.Forms.ListView(); this.m_colDictField = new System.Windows.Forms.ColumnHeader(); @@ -252,7 +252,7 @@ private void InitializeComponent() // this.m_tvSymTbls.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.m_tvSymTbls.ContextMenu = this.m_cntxMenuObjId; + this.m_tvSymTbls.ContextMenuStrip = this.m_cntxMenuObjId; this.m_tvSymTbls.HideSelection = false; this.m_tvSymTbls.Location = new System.Drawing.Point(16, 16); this.m_tvSymTbls.Name = "m_tvSymTbls"; @@ -264,7 +264,7 @@ private void InitializeComponent() // // m_cntxMenuObjId // - this.m_cntxMenuObjId.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.m_cntxMenuObjId.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.m_mnuItemCopy, this.m_mnuItemObjectDbInfo, this.m_mnuItemBrowseReflection, @@ -272,46 +272,46 @@ private void InitializeComponent() this.m_mnuItemAddToSnoopObjSet, this.m_mnuItemRemoveFromSnoopObjSet, this.m_mnuItemShowSnoopObjSet}); - this.m_cntxMenuObjId.Popup += new System.EventHandler(this.OnContextMenuPopup); + this.m_cntxMenuObjId.Opened += new System.EventHandler(this.OnContextMenuPopup); // // m_mnuItemCopy // - this.m_mnuItemCopy.Index = 0; + // this.m_mnuItemCopy.Index = 0; this.m_mnuItemCopy.Text = "Copy"; this.m_mnuItemCopy.Click += new System.EventHandler(this.ContextMenuClick_Copy); // // m_mnuItemObjectDbInfo // - this.m_mnuItemObjectDbInfo.Index = 1; + // this.m_mnuItemObjectDbInfo.Index = 1; this.m_mnuItemObjectDbInfo.Text = "Show ObjectID Info..."; this.m_mnuItemObjectDbInfo.Click += new System.EventHandler(this.ContextMenuClick_ObjIdInfo); // // m_mnuItemBrowseReflection // - this.m_mnuItemBrowseReflection.Index = 2; + // this.m_mnuItemBrowseReflection.Index = 2; this.m_mnuItemBrowseReflection.Text = "Browse Using Reflection..."; this.m_mnuItemBrowseReflection.Click += new System.EventHandler(this.ContextMenuClick_BrowseReflection); // // m_mnuItemSeparator1 // - this.m_mnuItemSeparator1.Index = 3; + // this.m_mnuItemSeparator1.Index = 3; this.m_mnuItemSeparator1.Text = "-"; // // m_mnuItemAddToSnoopObjSet // - this.m_mnuItemAddToSnoopObjSet.Index = 4; + // this.m_mnuItemAddToSnoopObjSet.Index = 4; this.m_mnuItemAddToSnoopObjSet.Text = "Add To Snoop Object Set"; this.m_mnuItemAddToSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_AddToSnoopObjSet); // // m_mnuItemRemoveFromSnoopObjSet // - this.m_mnuItemRemoveFromSnoopObjSet.Index = 5; + // this.m_mnuItemRemoveFromSnoopObjSet.Index = 5; this.m_mnuItemRemoveFromSnoopObjSet.Text = "Remove From Snoop Object Set"; this.m_mnuItemRemoveFromSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_RemoveFromSnoopObjSet); // // m_mnuItemShowSnoopObjSet // - this.m_mnuItemShowSnoopObjSet.Index = 6; + // this.m_mnuItemShowSnoopObjSet.Index = 6; this.m_mnuItemShowSnoopObjSet.Text = "Show Snoop Object Set..."; this.m_mnuItemShowSnoopObjSet.Click += new System.EventHandler(this.ContextMenuClick_ShowSnoopObjSet); // @@ -363,7 +363,7 @@ private void InitializeComponent() // this.m_tvDicts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.m_tvDicts.ContextMenu = this.m_cntxMenuObjId; + this.m_tvDicts.ContextMenuStrip = this.m_cntxMenuObjId; this.m_tvDicts.FullRowSelect = true; this.m_tvDicts.HideSelection = false; this.m_tvDicts.Location = new System.Drawing.Point(16, 16); diff --git a/MgdDbgLibrary/Snoop/Forms/GenericPropGrid.cs b/MgdDbgLibrary/Snoop/Forms/GenericPropGrid.cs index 316cc1f..b35a6ff 100644 --- a/MgdDbgLibrary/Snoop/Forms/GenericPropGrid.cs +++ b/MgdDbgLibrary/Snoop/Forms/GenericPropGrid.cs @@ -39,9 +39,9 @@ public class GenericPropGrid : System.Windows.Forms.Form private System.Windows.Forms.PropertyGrid m_pgProps; private System.Windows.Forms.Button m_bnOK; private System.Windows.Forms.Button m_bnCancel; - private System.Windows.Forms.ContextMenu m_mnuContext; - private System.Windows.Forms.MenuItem m_mnuItemShowObjInfo; - private System.Windows.Forms.MenuItem m_mnuItemShowClassInfo; + private System.Windows.Forms.ContextMenuStrip m_mnuContext; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemShowObjInfo; + private System.Windows.Forms.ToolStripMenuItem m_mnuItemShowClassInfo; /// /// Required designer variable. @@ -79,9 +79,9 @@ protected override void private void InitializeComponent() { this.m_pgProps = new System.Windows.Forms.PropertyGrid(); - this.m_mnuContext = new System.Windows.Forms.ContextMenu(); - this.m_mnuItemShowObjInfo = new System.Windows.Forms.MenuItem(); - this.m_mnuItemShowClassInfo = new System.Windows.Forms.MenuItem(); + this.m_mnuContext = new System.Windows.Forms.ContextMenuStrip(); + this.m_mnuItemShowObjInfo = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemShowClassInfo = new System.Windows.Forms.ToolStripMenuItem(); this.m_bnOK = new System.Windows.Forms.Button(); this.m_bnCancel = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -92,7 +92,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right); this.m_pgProps.CommandsVisibleIfAvailable = true; - this.m_pgProps.ContextMenu = this.m_mnuContext; + this.m_pgProps.ContextMenuStrip = this.m_mnuContext; this.m_pgProps.Cursor = System.Windows.Forms.Cursors.Hand; this.m_pgProps.LargeButtons = false; this.m_pgProps.LineColor = System.Drawing.SystemColors.ScrollBar; @@ -107,20 +107,20 @@ private void InitializeComponent() // // m_mnuContext // - this.m_mnuContext.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.m_mnuContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.m_mnuItemShowObjInfo, this.m_mnuItemShowClassInfo}); - this.m_mnuContext.Popup += new System.EventHandler(this.OnMenuContextPopup); + this.m_mnuContext.Opened += new System.EventHandler(this.OnMenuContextPopup); // // m_mnuItemShowObjInfo // - this.m_mnuItemShowObjInfo.Index = 0; + // this.m_mnuItemShowObjInfo.Index = 0; this.m_mnuItemShowObjInfo.Text = "Show Object Info..."; this.m_mnuItemShowObjInfo.Click += new System.EventHandler(this.OnShowObjInfo); // // m_mnuItemShowClassInfo // - this.m_mnuItemShowClassInfo.Index = 1; + // this.m_mnuItemShowClassInfo.Index = 1; this.m_mnuItemShowClassInfo.Text = "Show Class Info..."; this.m_mnuItemShowClassInfo.Click += new System.EventHandler(this.OnShowClassInfo); // diff --git a/MgdDbgLibrary/Snoop/Forms/Objects.cs b/MgdDbgLibrary/Snoop/Forms/Objects.cs index 33a2b5b..c3c607d 100644 --- a/MgdDbgLibrary/Snoop/Forms/Objects.cs +++ b/MgdDbgLibrary/Snoop/Forms/Objects.cs @@ -39,13 +39,13 @@ public class Objects : System.Windows.Forms.Form protected ColumnHeader m_lvCol_label; protected ColumnHeader m_lvCol_value; protected TreeView m_tvObjs; - protected MenuItem m_mnuItemBrowseReflection; - protected ContextMenu m_cntxMenu; + protected ToolStripMenuItem m_mnuItemBrowseReflection; + protected ContextMenuStrip m_cntxMenu; protected Snoop.Collectors.Objects m_snoopCollector = new Snoop.Collectors.Objects(); protected System.Object m_curObj; private ContextMenuStrip listViewContextMenuStrip; - private MenuItem m_mnuItemCopy; + private ToolStripMenuItem m_mnuItemCopy; private ToolStripMenuItem copyToolStripMenuItem; private ToolStrip toolStrip1; private System.Drawing.Printing.PrintDocument m_printDocument; @@ -114,9 +114,9 @@ protected void this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Objects)); this.m_tvObjs = new System.Windows.Forms.TreeView(); - this.m_cntxMenu = new System.Windows.Forms.ContextMenu(); - this.m_mnuItemCopy = new System.Windows.Forms.MenuItem(); - this.m_mnuItemBrowseReflection = new System.Windows.Forms.MenuItem(); + this.m_cntxMenu = new System.Windows.Forms.ContextMenuStrip(); + this.m_mnuItemCopy = new System.Windows.Forms.ToolStripMenuItem(); + this.m_mnuItemBrowseReflection = new System.Windows.Forms.ToolStripMenuItem(); this.m_lvData = new System.Windows.Forms.ListView(); this.m_lvCol_label = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.m_lvCol_value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -138,7 +138,7 @@ protected void // this.m_tvObjs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.m_tvObjs.ContextMenu = this.m_cntxMenu; + this.m_tvObjs.ContextMenuStrip = this.m_cntxMenu; this.m_tvObjs.HideSelection = false; this.m_tvObjs.Location = new System.Drawing.Point(12, 37); this.m_tvObjs.Name = "m_tvObjs"; @@ -150,19 +150,19 @@ protected void // // m_cntxMenu // - this.m_cntxMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.m_cntxMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.m_mnuItemCopy, this.m_mnuItemBrowseReflection}); // // m_mnuItemCopy // - this.m_mnuItemCopy.Index = 0; + // this.m_mnuItemCopy.Index = 0; this.m_mnuItemCopy.Text = "Copy"; this.m_mnuItemCopy.Click += new System.EventHandler(this.ContextMenuClick_Copy); // // m_mnuItemBrowseReflection // - this.m_mnuItemBrowseReflection.Index = 1; + // this.m_mnuItemBrowseReflection.Index = 1; this.m_mnuItemBrowseReflection.Text = "Browse Using Reflection..."; this.m_mnuItemBrowseReflection.Click += new System.EventHandler(this.ContextMenuClick_BrowseReflection); // diff --git a/MgdDbgLibrary/Snoop/Forms/XrefGraph.cs b/MgdDbgLibrary/Snoop/Forms/XrefGraph.cs index 564b7de..c86022b 100644 --- a/MgdDbgLibrary/Snoop/Forms/XrefGraph.cs +++ b/MgdDbgLibrary/Snoop/Forms/XrefGraph.cs @@ -37,8 +37,8 @@ public class XrefGraph : System.Windows.Forms.Form protected System.Windows.Forms.ColumnHeader m_lvCol_label; protected System.Windows.Forms.ColumnHeader m_lvCol_value; protected System.Windows.Forms.TreeView m_tvObjs; - protected System.Windows.Forms.MenuItem m_mnuItemBrowseReflection; - protected System.Windows.Forms.ContextMenu m_cntxMenuTree; + protected System.Windows.Forms.ToolStripMenuItem m_mnuItemBrowseReflection; + protected System.Windows.Forms.ContextMenuStrip m_cntxMenuTree; protected Snoop.Collectors.Objects m_snoopCollector = new Snoop.Collectors.Objects(); protected AcDb.XrefGraph m_xrefGraph; @@ -95,8 +95,8 @@ protected void InitializeComponent() { this.m_tvObjs = new System.Windows.Forms.TreeView(); - this.m_cntxMenuTree = new System.Windows.Forms.ContextMenu(); - this.m_mnuItemBrowseReflection = new System.Windows.Forms.MenuItem(); + this.m_cntxMenuTree = new System.Windows.Forms.ContextMenuStrip(); + this.m_mnuItemBrowseReflection = new System.Windows.Forms.ToolStripMenuItem(); this.m_lvData = new System.Windows.Forms.ListView(); this.m_lvCol_label = new System.Windows.Forms.ColumnHeader(); this.m_lvCol_value = new System.Windows.Forms.ColumnHeader(); @@ -107,7 +107,7 @@ protected void // this.m_tvObjs.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left); - this.m_tvObjs.ContextMenu = this.m_cntxMenuTree; + this.m_tvObjs.ContextMenuStrip = this.m_cntxMenuTree; this.m_tvObjs.HideSelection = false; this.m_tvObjs.ImageIndex = -1; this.m_tvObjs.Location = new System.Drawing.Point(16, 16); @@ -119,12 +119,12 @@ protected void // // m_cntxMenuTree // - this.m_cntxMenuTree.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.m_cntxMenuTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.m_mnuItemBrowseReflection}); // // m_mnuItemBrowseReflection // - this.m_mnuItemBrowseReflection.Index = 0; + // this.m_mnuItemBrowseReflection.Index = 0; this.m_mnuItemBrowseReflection.Text = "Browse Using Reflection..."; this.m_mnuItemBrowseReflection.Click += new System.EventHandler(this.ContextMenuClick_BrowseReflection); // diff --git a/MgdDbgLibrary/Throwaway/TestTabForm.cs b/MgdDbgLibrary/Throwaway/TestTabForm.cs index 052dc92..f2e009f 100644 --- a/MgdDbgLibrary/Throwaway/TestTabForm.cs +++ b/MgdDbgLibrary/Throwaway/TestTabForm.cs @@ -35,9 +35,9 @@ public class TestTabForm : System.Windows.Forms.Form private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; - private System.Windows.Forms.ContextMenu contextMenu1; - private System.Windows.Forms.MenuItem menuItem1; - private System.Windows.Forms.MenuItem menuItem2; + private System.Windows.Forms.ContextMenuStrip contextMenu1; + private System.Windows.Forms.ToolStripMenuItem menuItem1; + private System.Windows.Forms.ToolStripMenuItem menuItem2; /// /// Required designer variable. /// @@ -82,9 +82,9 @@ private void InitializeComponent() this.button1 = new System.Windows.Forms.Button(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.button2 = new System.Windows.Forms.Button(); - this.contextMenu1 = new System.Windows.Forms.ContextMenu(); - this.menuItem1 = new System.Windows.Forms.MenuItem(); - this.menuItem2 = new System.Windows.Forms.MenuItem(); + this.contextMenu1 = new System.Windows.Forms.ContextMenuStrip(); + this.menuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.menuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.m_tabCtrl.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -106,7 +106,7 @@ private void InitializeComponent() // // tabPage1 // - this.tabPage1.ContextMenu = this.contextMenu1; + this.tabPage1.ContextMenuStrip = this.contextMenu1; this.tabPage1.Controls.AddRange(new System.Windows.Forms.Control[] { this.button1}); this.tabPage1.Location = new System.Drawing.Point(4, 22); @@ -145,20 +145,21 @@ private void InitializeComponent() // // contextMenu1 // - this.contextMenu1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { - this.menuItem1, - this.menuItem2}); - this.contextMenu1.Popup += new System.EventHandler(this.contextMenu1_Popup); + this.contextMenu1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuItem1, + this.menuItem2 + }); + this.contextMenu1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenu1_Popup); // // menuItem1 // - this.menuItem1.Index = 0; + // this.menuItem1.Index = 0; this.menuItem1.Text = "Add to Browse Set"; this.menuItem1.Click += new System.EventHandler(this.menuItem1_Click); // // menuItem2 // - this.menuItem2.Index = 1; + // this.menuItem2.Index = 1; this.menuItem2.Text = "Show Object Id Info..."; this.menuItem2.Click += new System.EventHandler(this.menuItem2_Click); // diff --git a/PythonConsoleControl/PythonConsole.cs b/PythonConsoleControl/PythonConsole.cs index 4cb25fb..c14fe7d 100644 --- a/PythonConsoleControl/PythonConsole.cs +++ b/PythonConsoleControl/PythonConsole.cs @@ -387,7 +387,8 @@ private void ExecuteStatements() else { ObjectHandle wrapexception = null; - GetCommandDispatcher()(() => scriptSource.ExecuteAndWrap(commandLine.ScriptScope, out wrapexception)); + GetCommandDispatcher()(() => scriptSource.Execute(commandLine.ScriptScope)); + // GetCommandDispatcher()(() => scriptSource.ExecuteAndWrap(commandLine.ScriptScope, out wrapexception)); if (wrapexception != null) { error = "Exception : " + wrapexception.Unwrap().ToString() + "\n"; diff --git a/PythonConsoleControl/PythonConsoleControl.csproj b/PythonConsoleControl/PythonConsoleControl.csproj index e680bc3..9ab350f 100644 --- a/PythonConsoleControl/PythonConsoleControl.csproj +++ b/PythonConsoleControl/PythonConsoleControl.csproj @@ -1,6 +1,6 @@  - net48 + net8.0-windows false true false @@ -8,40 +8,6 @@ en-US - - - False - ..\RefrencedAssemblies\ICSharpCode.AvalonEdit.dll - - - False - ..\RefrencedAssemblies\IronPython.dll - - - False - ..\RefrencedAssemblies\IronPython.Modules.dll - - - False - ..\RefrencedAssemblies\IronPython.SQLite.dll - - - False - ..\RefrencedAssemblies\IronPython.Wpf.dll - - - False - ..\RefrencedAssemblies\Microsoft.Dynamic.dll - - - False - ..\RefrencedAssemblies\Microsoft.Scripting.dll - - - False - ..\RefrencedAssemblies\Microsoft.Scripting.Metadata.dll - - @@ -51,8 +17,8 @@ - - + + Project diff --git a/PythonConsoleControl/PythonConsoleHost.cs b/PythonConsoleControl/PythonConsoleHost.cs index 22cbe7b..e0b0f35 100644 --- a/PythonConsoleControl/PythonConsoleHost.cs +++ b/PythonConsoleControl/PythonConsoleHost.cs @@ -126,10 +126,11 @@ protected override ScriptRuntimeSetup CreateRuntimeSetup() langSetup.Options["SearchPaths"] = new string[0]; } } + return srs; } - protected override void ParseHostOptions(string/*!*/[]/*!*/ args) + protected override void ParseHostOptions(string /*!*/[] /*!*/ args) { // Python doesn't want any of the DLR base options. foreach (string s in args) diff --git a/build/Build.csproj b/build/Build.csproj index c769b32..6c9658d 100644 --- a/build/Build.csproj +++ b/build/Build.csproj @@ -5,11 +5,12 @@ CS0649;CS0169 latest true - net6.0 + net8.0 .. .. 1 Release;Debug + true diff --git a/build/Build.csproj.DotSettings b/build/Build.csproj.DotSettings index 95fbce8..575d161 100644 --- a/build/Build.csproj.DotSettings +++ b/build/Build.csproj.DotSettings @@ -17,6 +17,8 @@ False <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy><Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /></Policy> True True True @@ -25,4 +27,5 @@ True True True - True + True + True pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy