Skip to content

Commit 4c891bc

Browse files
chuongmepchuongmep
committed
add base code a25
1 parent a761ba5 commit 4c891bc

File tree

11 files changed

+58
-65
lines changed

11 files changed

+58
-65
lines changed

‎CADPythonShell.sln‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -31,49 +31,43 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CADSnoop", "CadLookup\CADSn
3131
EndProject
3232
Global
3333
GlobalSection(SolutionConfigurationPlatforms) = preSolution
34-
Debug A23|Any CPU = Debug A23|Any CPU
34+
Debug A25|Any CPU = Debug A25|Any CPU
3535
Installer|Any CPU = Installer|Any CPU
36-
Release A23|Any CPU = Release A23|Any CPU
36+
Release A25|Any CPU = Release A25|Any CPU
3737
EndGlobalSection
3838
GlobalSection(ProjectConfigurationPlatforms) = postSolution
39-
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
40-
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A23|Any CPU.Build.0 = Debug|Any CPU
4139
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Installer|Any CPU.ActiveCfg = Release|Any CPU
42-
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
43-
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A23|Any CPU.Build.0 = Release|Any CPU
44-
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU
45-
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU
46-
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU
47-
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU
48-
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A23|Any CPU.Build.0 = Release A23|Any CPU
49-
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
50-
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A23|Any CPU.Build.0 = Debug|Any CPU
40+
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU
41+
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A25|Any CPU.ActiveCfg = Release|Any CPU
42+
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Release A25|Any CPU.Build.0 = Release|Any CPU
43+
{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug A25|Any CPU.Build.0 = Debug|Any CPU
5144
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Installer|Any CPU.ActiveCfg = Release|Any CPU
52-
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
53-
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A23|Any CPU.Build.0 = Release|Any CPU
54-
{4729BE21-C6FF-4115-A516-65F5A312574C}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
55-
{4729BE21-C6FF-4115-A516-65F5A312574C}.Debug A23|Any CPU.Build.0 = Debug|Any CPU
45+
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU
46+
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A25|Any CPU.ActiveCfg = Release|Any CPU
47+
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Release A25|Any CPU.Build.0 = Release|Any CPU
48+
{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug A25|Any CPU.Build.0 = Debug|Any CPU
5649
{4729BE21-C6FF-4115-A516-65F5A312574C}.Installer|Any CPU.ActiveCfg = Release|Any CPU
57-
{4729BE21-C6FF-4115-A516-65F5A312574C}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
58-
{4729BE21-C6FF-4115-A516-65F5A312574C}.Release A23|Any CPU.Build.0 = Release|Any CPU
59-
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
60-
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Debug A23|Any CPU.Build.0 = Debug|Any CPU
50+
{4729BE21-C6FF-4115-A516-65F5A312574C}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU
51+
{4729BE21-C6FF-4115-A516-65F5A312574C}.Release A25|Any CPU.ActiveCfg = Release|Any CPU
52+
{4729BE21-C6FF-4115-A516-65F5A312574C}.Installer|Any CPU.Build.0 = Release|Any CPU
6153
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Installer|Any CPU.ActiveCfg = Release|Any CPU
6254
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Installer|Any CPU.Build.0 = Release|Any CPU
63-
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
64-
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Release A23|Any CPU.Build.0 = Release|Any CPU
65-
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
66-
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A23|Any CPU.Build.0 = Debug|Any CPU
55+
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU
56+
{51C417E1-279A-46C2-B3AE-1FDE56FEE5AB}.Release A25|Any CPU.ActiveCfg = Release|Any CPU
6757
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Installer|Any CPU.ActiveCfg = Debug|Any CPU
68-
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Installer|Any CPU.Build.0 = Debug|Any CPU
69-
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A23|Any CPU.ActiveCfg = Debug|Any CPU
70-
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A23|Any CPU.Build.0 = Debug|Any CPU
71-
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
72-
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A23|Any CPU.Build.0 = Debug|Any CPU
58+
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU
59+
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A25|Any CPU.ActiveCfg = Release|Any CPU
60+
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Release A25|Any CPU.Build.0 = Release|Any CPU
61+
{A5639047-58FE-42F3-95D5-4ADC1F51F120}.Debug A25|Any CPU.Build.0 = Debug|Any CPU
7362
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Installer|Any CPU.ActiveCfg = Debug|Any CPU
74-
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Installer|Any CPU.Build.0 = Debug|Any CPU
75-
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A23|Any CPU.ActiveCfg = Debug|Any CPU
76-
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A23|Any CPU.Build.0 = Debug|Any CPU
63+
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A25|Any CPU.ActiveCfg = Debug|Any CPU
64+
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A25|Any CPU.ActiveCfg = Release|Any CPU
65+
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Release A25|Any CPU.Build.0 = Release|Any CPU
66+
{19C935D2-8649-496F-ADD4-3D5E370B441A}.Debug A25|Any CPU.Build.0 = Debug|Any CPU
67+
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A25|Any CPU.ActiveCfg = Debug A25|Any CPU
68+
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug A25|Any CPU.Build.0 = Debug A25|Any CPU
69+
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A25|Any CPU.ActiveCfg = Release A25|Any CPU
70+
{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Release A25|Any CPU.Build.0 = Release A25|Any CPU
7771
EndGlobalSection
7872
GlobalSection(SolutionProperties) = preSolution
7973
HideSolutionNode = FALSE

‎CADPythonShell/CADPythonShell.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
44
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
55
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
66
<LangVersion>latest</LangVersion>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<UseWindowsForms>true</UseWindowsForms>
99
<UseWPF>true</UseWPF>
1010
<PlatformTarget>x64</PlatformTarget>
11-
<Configurations>Debug A23</Configurations>
12-
<Configurations>$(Configurations);Release A23</Configurations>
11+
<Configurations>Debug A25</Configurations>
12+
<Configurations>$(Configurations);Release A25</Configurations>
1313
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
14+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1415
</PropertyGroup>
1516
<!--<PropertyGroup>
1617
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
@@ -27,8 +28,8 @@
2728
<DebugType>none</DebugType>
2829
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
2930
</PropertyGroup>
30-
<PropertyGroup Condition="$(Configuration.Contains('A23'))">
31-
<DefineConstants>$(DefineConstants);A23</DefineConstants>
31+
<PropertyGroup Condition="$(Configuration.Contains('A25'))">
32+
<DefineConstants>$(DefineConstants);A25</DefineConstants>
3233
</PropertyGroup>
3334
<PropertyGroup>
3435
<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>

‎CADPythonShell/PackageContents.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<ApplicationPackage SchemaVersion="1.0"
3-
AutodeskProduct="CADPythonShell"
3+
AutodeskProduct="AutoCAD"
44
ProductType="Application"
55
Name="CADPythonShell">
66
<RuntimeRequirements SeriesMin="15.0"
7-
SeriesMax="25.0"
7+
SeriesMax="29.0"
88
Platform="AutoCAD|AutoCAD*"
99
OS="Win32|Win64" />
1010
<Components>

‎CADPythonShell/Properties/launchSettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"profiles": {
3-
"CAD23": {
3+
"CAD25": {
44
"commandName": "Executable",
5-
"executablePath": "C:\\Program Files\\Autodesk\\AutoCAD 2023\\acad.exe"
5+
"executablePath": "C:\\Program Files\\Autodesk\\AutoCAD 2025\\acad.exe"
66
}
77
}
88
}

‎CADRuntime/CADRuntime.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<UseWindowsForms>true</UseWindowsForms>
77
<UseWPF>true</UseWPF>
88
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
10+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1011
</PropertyGroup>
1112
<PropertyGroup>
1213
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
@@ -17,12 +18,11 @@
1718
<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
1819
</PropertyGroup>
1920
<ItemGroup>
20-
<Reference Include="accoremgd">
21-
<HintPath>..\RefrencedAssemblies\accoremgd.dll</HintPath>
22-
</Reference>
23-
<Reference Include="Acdbmgd">
24-
<HintPath>..\RefrencedAssemblies\acdbmgd.dll</HintPath>
25-
</Reference>
21+
<PackageReference Include="Chuongmep.Acad.Api.accoremgd" Version="2025.0.0"/>
22+
<PackageReference Include="Chuongmep.Acad.Api.acdbmgd" Version="2025.0.0"/>
23+
<!-- <Reference Include="Acdbmgd">-->
24+
<!-- <HintPath>..\RefrencedAssemblies\acdbmgd.dll</HintPath>-->
25+
<!-- </Reference>-->
2626
<Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
2727
<SpecificVersion>False</SpecificVersion>
2828
<HintPath>..\RefrencedAssemblies\IronPython.dll</HintPath>

‎CadLookup/CADSnoop.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<UseWindowsForms>true</UseWindowsForms>
@@ -16,16 +16,8 @@
1616
</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
1717
</PropertyGroup>
1818
<ItemGroup>
19-
<Reference Include="accoremgd">
20-
<HintPath>..\RefrencedAssemblies\accoremgd.dll</HintPath>
21-
</Reference>
22-
<Reference Include="Acdbmgd">
23-
<HintPath>..\RefrencedAssemblies\acdbmgd.dll</HintPath>
24-
</Reference>
25-
</ItemGroup>
26-
<ItemGroup>
27-
<PackageReference Include="Chuongmep.Acad.Api.accoremgd" Version="2023.0.2" />
28-
<PackageReference Include="Chuongmep.Acad.Api.acdbmgd" Version="2023.0.2" />
19+
<PackageReference Include="Chuongmep.Acad.Api.accoremgd" Version="2025.0.0" />
20+
<PackageReference Include="Chuongmep.Acad.Api.acdbmgd" Version="2025.0.0" />
2921
</ItemGroup>
3022
<ProjectExtensions>
3123
<VisualStudio>

‎MgdDbgLibrary/MgdDbg.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
3535
<UseWindowsForms>true</UseWindowsForms>
3636
<UseWPF>true</UseWPF>
37-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
37+
<!-- <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>-->
38+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
3839
</PropertyGroup>
3940
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4041
<BaseAddress>285212672</BaseAddress>

‎PythonConsoleControl/PythonConsole.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,8 @@ private void ExecuteStatements()
387387
else
388388
{
389389
ObjectHandle wrapexception = null;
390-
GetCommandDispatcher()(() => scriptSource.ExecuteAndWrap(commandLine.ScriptScope, out wrapexception));
390+
GetCommandDispatcher()(() => scriptSource.Execute(commandLine.ScriptScope));
391+
// GetCommandDispatcher()(() => scriptSource.ExecuteAndWrap(commandLine.ScriptScope, out wrapexception));
391392
if (wrapexception != null)
392393
{
393394
error = "Exception : " + wrapexception.Unwrap().ToString() + "\n";

‎PythonConsoleControl/PythonConsoleControl.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<UseWPF>true</UseWPF>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

‎build/Build.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
<NoWarn>CS0649;CS0169</NoWarn>
66
<LangVersion>latest</LangVersion>
77
<ImplicitUsings>true</ImplicitUsings>
8-
<TargetFramework>net6.0</TargetFramework>
8+
<TargetFramework>net8.0</TargetFramework>
99
<NukeRootDirectory>..</NukeRootDirectory>
1010
<NukeScriptDirectory>..</NukeScriptDirectory>
1111
<NukeTelemetryVersion>1</NukeTelemetryVersion>
1212
<Configurations>Release;Debug</Configurations>
13+
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
1314
</PropertyGroup>
1415
<ItemGroup>
1516
<PackageReference Include="Nuke.Common" Version="6.0.1" />

0 commit comments

Comments
 (0)