Skip to content

Commit ee07c61

Browse files
MadhukarMoogalaMadhukarMoogala
committed
added support for .NET core and migrated to AutoCAD 2025
1 parent 9dd274e commit ee07c61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+461
-275
lines changed

‎ArxAppWiz/Scripts/1033/default.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ function OnFinish(selProj, selObj) {
3737
if (bArxAppType) wizard.AddSymbol("PRJ_TYPE_APP", "arxnet");
3838
else if (bDbxAppType) wizard.AddSymbol("PRJ_TYPE_APP", "dbxnet");
3939
else wizard.AddSymbol("PRJ_TYPE_APP", "crxnet");
40-
wizard.AddSymbol("ARX_CLR_SUPPORT", "true");
40+
wizard.AddSymbol("ARX_CLR_SUPPORT", "NetCore");
4141
} else {
4242
if (bArxAppType) wizard.AddSymbol("PRJ_TYPE_APP", "arx");
4343
else if (bDbxAppType) wizard.AddSymbol("PRJ_TYPE_APP", "dbx");
4444
else wizard.AddSymbol("PRJ_TYPE_APP", "crx");
4545
wizard.AddSymbol("ARX_CLR_SUPPORT", "false");
4646
}
4747
//TOCHANGE Must change for every release.
48-
CopyPropsFile("Autodesk.arx-2024.props", strProjectName);
49-
CopyPropsFile("Autodesk.arx-2024-net.props", strProjectName);
48+
CopyPropsFile("Autodesk.arx-2025.props", strProjectName);
49+
CopyPropsFile("Autodesk.arx-2025-net.props", strProjectName);
5050
//TOCHANGE
5151
CopyPropsFile("crx.props", strProjectName);
5252

ArxAppWiz/Templates/1033/Autodesk.arx-2024-net.props renamed to ArxAppWiz/Templates/1033/Autodesk.arx-2025-net.props

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,36 @@
44

55
<!-- http://msdn.microsoft.com/en-us/library/ms171458.aspx -->
66
<PropertyGroup>
7-
<_ProjectFileVersion>24.3</_ProjectFileVersion>
7+
<_ProjectFileVersion>25.0</_ProjectFileVersion>
88
<_PropertySheetDisplayName>ObjectARX .Net</_PropertySheetDisplayName>
99
<TargetExt>.dll</TargetExt>
1010
</PropertyGroup>
11-
12-
<ImportGroup Label="PropertySheets">
13-
</ImportGroup>
14-
1511
<PropertyGroup Label="Globals">
16-
<!-- For AutoCAD 2022, development requirement -->
17-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
18-
<RootNamespace>$(TargetName)</RootNamespace>
12+
<!-- For AutoCAD 2024, development requirement -->
13+
<!--<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>-->
14+
<!-- For AutoCAD 2025, .NET Core suppor-->
15+
<TargetFramework>net8.0</TargetFramework>
16+
<RootNamespace>$(ProjectName)</RootNamespace>
1917
</PropertyGroup>
20-
2118
<PropertyGroup>
2219
<ReferencePath>$(ArxSdkIncs);$(ReferencePath)</ReferencePath>
2320
</PropertyGroup>
21+
<ItemGroup>
22+
<FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"/>
23+
</ItemGroup>
2424

2525
<ItemDefinitionGroup>
2626
<!-- Copy of Microsoft.Cpp.ManagedExtensions.props (C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0) -->
2727
<ClCompile>
28-
<ExceptionHandling>Async</ExceptionHandling>
29-
<CompileAsManaged>true</CompileAsManaged>
28+
<ExceptionHandling>Async</ExceptionHandling>
3029
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
3130
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
32-
<MinimalRebuild></MinimalRebuild>
33-
<!-- To defeat the arx.props -->
31+
<MinimalRebuild>false</MinimalRebuild>
3432
<SmallerTypeCheck>false</SmallerTypeCheck>
3533
</ClCompile>
3634
<Link>
3735
<FixedBaseAddress>false</FixedBaseAddress>
3836
<AssemblyDebug Condition="'$(UseDebugLibraries)'=='true'">true</AssemblyDebug>
3937
</Link>
4038
</ItemDefinitionGroup>
41-
42-
<ItemGroup>
43-
<Reference Include="System" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Xml" />
46-
</ItemGroup>
47-
4839
</Project>

ArxAppWiz/Templates/1033/Autodesk.arx-2024.props renamed to ArxAppWiz/Templates/1033/Autodesk.arx-2025.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<!-- http://msdn.microsoft.com/en-us/library/ms171458.aspx -->
66
<PropertyGroup>
7-
<_ProjectFileVersion>24.3</_ProjectFileVersion>
8-
<_PropertySheetDisplayName>ObjectARX 2024</_PropertySheetDisplayName>
7+
<_ProjectFileVersion>25.0</_ProjectFileVersion>
8+
<_PropertySheetDisplayName>ObjectARX 2025</_PropertySheetDisplayName>
99
</PropertyGroup>
1010

1111
<!--There is No 32 Bit AutoCAD Starting From AutoCAD 2020-->
1212
<PropertyGroup>
13-
<AcadDir Condition="'$(Platform)'=='x64'">C:\Program Files\Autodesk\AutoCAD 2024\</AcadDir>
13+
<AcadDir Condition="'$(Platform)'=='x64'">C:\Program Files\Autodesk\AutoCAD 2025\</AcadDir>
1414
<AcadExe Condition="'$(ArxAppType)'=='dbx' or '$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'">acad.exe</AcadExe>
1515
<AcadExe Condition="'$(ArxAppType)'=='crx' or '$(ArxAppType)'=='crxnet'">accoreconsole.exe</AcadExe>
1616
<ArxSdkDir>C:\ObjectARX\</ArxSdkDir>
@@ -24,8 +24,8 @@
2424
<ArxAmodelerLibs>$(ArxSdkDir)\utils\amodeler\lib-$(Platform)</ArxAmodelerLibs>
2525
<ArxBrepLibs>$(ArxSdkDir)\utils\brep\lib-$(Platform)</ArxBrepLibs>
2626
<ArxAtilLibs>$(ArxSdkDir)\utils\Atil\Lib-$(Platform)</ArxAtilLibs>
27-
<ArxSDKVersion>24.1</ArxSDKVersion>
28-
<ArxSDKPlatform>v142</ArxSDKPlatform>
27+
<ArxSDKVersion>25.0</ArxSDKVersion>
28+
<ArxSDKPlatform>v143</ArxSDKPlatform>
2929
</PropertyGroup>
3030

3131
<ImportGroup Label="PropertySheets">
@@ -34,7 +34,7 @@
3434
<Import Condition="'$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'" Project="$(ArxSdkDir)\inc\arx.props" />
3535
<Import Condition="'$(Configuration)'=='Release'" Project="$(ArxSdkDir)\inc\rxsdk_Releasecfg.props" />
3636
<Import Condition="'$(Configuration)'=='Debug'" Project="$(ArxSdkDir)\inc\rxsdk_Debugcfg.props" />
37-
<Import Condition="'$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='crxnet' or '$(ArxAppType)'=='arxnet'" Project="Autodesk.arx-2022-net.props" />
37+
<Import Condition="'$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='crxnet' or '$(ArxAppType)'=='arxnet'" Project="Autodesk.arx-2025-net.props" />
3838
</ImportGroup>
3939

4040
<PropertyGroup>

‎ArxAppWiz/Templates/1033/ReadMe.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ ArxAppWizard has created this [!output PROJECT_NAME] application for you.
66
This project uses the ObjectARX SDK .props file from the ObjectARX SDK to set the C++ compiler, MIDL,
77
and Linker options appropriately. The project .props file is located in your project directory and reference
88
the ObjectARX SDK and AutoCAD executable paths.
9-
To create a new configuration and/or change the paths references copy or modify the Autodesk.arx-2013.props
9+
To create a new configuration and/or change the paths references copy or modify the Autodesk.arx-2025.props
1010
File, like this:
1111
#7 <AcadDir Condition="'$(Platform)'=='x64'">[acad.exe path on your x64 windows platform]</AcadDir>
1212
#8 <ArxSdkDir>[the location you installed the ObjectARX SDK]</ArxSdkDir>
1313

14-
Note the Wizards installer also provided an ObjectARX 2022.props file for your convenience as example in
14+
Note the Wizards installer also provided an ObjectARX 2025.props file for your convenience as example in
1515
case you want to have multiple configuration (Checkout the Wizards install directory).
16-
To undestand and use .props file, please visit the Microsoft WEB site at http://msdn.microsoft.com/en-us/library/a4xbdz1e.aspx
16+
To undestand and use .props file, please visit the Microsoft WEB site at https://learn.microsoft.com/en-us/previous-versions/669zx6zc(v=vs.140)
1717
and http://blogs.msdn.com/b/visualstudio/archive/2010/05/14/a-guide-to-vcxproj-and-props-file-structure.aspx
1818
In Visual Studio 2022, the .props editor is in -> View -> Other Windows -> Property Manager
1919

‎ArxAppWiz/Templates/1033/StdAfx.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
#pragma once
2828
#define [!output UPPER_CASE_PROJECT_NAME]_MODULE
2929

30-
/*#ifndef
30+
/*
31+
#ifndef _ALLOW_RTCc_IN_STL
3132
#define _ALLOW_RTCc_IN_STL
32-
#endif*/
33+
#endif
34+
*/
3335

3436
[!if IMPL_DEBUG]
3537
//-----------------------------------------------------------------------------

‎ArxAppWiz/Templates/1033/root.idl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ library [!output RDS_SYMB][!output SAFE_PROJECT_NAME]Lib
2929
//----- tab and finally typing the full path at the Executable files section.
3030

3131
//----- Importing english is ok here. Autodesk doesn't localize this idl/tlb.
32-
//----- axdb24enu.tlb is guaranteed to be available in all locales.
32+
//----- axdb25enu.tlb is guaranteed to be available in all locales.
3333
//----- If you want to provide localized typelib then you must import
3434
//----- localized tlb here.
35-
importlib("axdb24enu.tlb");
35+
importlib("axdb25enu.tlb");
3636
[!endif]
3737
};

‎ArxAppWiz/Templates/1033/x64win32.vcxproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</ImportGroup>
4646
<ImportGroup Label="PropertySheets">
4747
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48-
<Import Project="Autodesk.arx-2024.props" />
48+
<Import Project="Autodesk.arx-2025.props" />
4949
</ImportGroup>
5050
<PropertyGroup Label="Configuration">
5151
<PlatformToolset Condition="'$(ArxSDKPlatform)'=='v143'">v143</PlatformToolset>
@@ -62,10 +62,6 @@
6262
<Link>
6363
</Link>
6464
</ItemDefinitionGroup>
65-
<ItemGroup>
66-
<Reference Include="System" />
67-
<Reference Include="System.Core" />
68-
</ItemGroup>
6965
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
7066
<ImportGroup Label="ExtensionTargets">
7167
</ImportGroup>

‎ArxAppWiz182/Scripts/1033/default.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,6 @@ function MakeOmfResourceProject(selProj, strProjectPath, strProjectName) {
259259
//-----------------------------------------------------------------------------
260260
//- See arxCommon.js for details
261261
function FindAutoCAD() {
262-
var szPath = "c:\\Program Files\\Autodesk\\AutoCAD 2024\\";
262+
var szPath = "C:\\Program Files\\Autodesk\\AutoCAD 2025\\";
263263
return (szPath);
264264
}

‎ArxWizCommon/arxCommon.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//- by Cyrille Fauvel - Autodesk Developer Technical Services
33
var szWizardsVersion ="20, 0, 1, 0 - December 5th, 2013" ;
44

5-
var szArzWizApplicationTitle ="ObjectARX/DBX Application Wizard for AutoCAD 2015" ;
5+
var szArzWizApplicationTitle ="ObjectARX/DBX Application Wizard for AutoCAD 2025" ;
66
var szArxWizCOMWrapperTitle ="AutoCAD COM Wrapper Object" ;
77
var szArxWizDynPropTitle ="AutoCAD Object Dynamic Property" ;
88
var szArxWizObjectTitle ="ObjectDBX Custom Object Class Wizard" ;
@@ -16,7 +16,7 @@ var szArxMemVariableWizTitle ="Add Member Variable Wizard" ;
1616

1717
//- Get an AutoCAD release
1818
function FindAutoCAD() {
19-
var szPath = FindAutoCADUsingWMI("c:\\Program Files\\Autodesk\\AutoCAD 2015\\");
19+
var szPath = FindAutoCADUsingWMI("C:\\Program Files\\Autodesk\\AutoCAD 2025\\");
2020
return (szPath);
2121
}
2222

‎ArxWizCustomAction/ArxWizCustomAction.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ArxWizCustomAction</RootNamespace>
1212
<AssemblyName>ArxWizCustomAction</AssemblyName>
13-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>
@@ -35,6 +35,7 @@
3535
<ItemGroup>
3636
<Reference Include="System" />
3737
<Reference Include="System.Core" />
38+
<Reference Include="System.Windows.Forms" />
3839
<Reference Include="System.Xml.Linq" />
3940
<Reference Include="Microsoft.CSharp" />
4041
<Reference Include="System.Xml" />

0 commit comments

Comments
 (0)