Skip to content

Commit 7765583

Browse files
Fusneica-FlorentinCristianFusneica-FlorentinCristian
committed
feat: add NET100 (net10.0) platform support for Revit 2025
- CS_SDK.props: add NET100 TargetFramework (net10.0-windows), DCoreLibSubFolder (net10.0), REVITAPI net8.0 fallback (RevitAPI 25.x ships net8.0 only), updated output path format to bin\Platform\Config\Revit, added NoWarn for CLS compliance, fixed last REVITAPI fallback to Revit 2025. Keeps NET70/NET80 platforms intact (additive change). - packages.aget: bump DynamoVisualProgramming packages to 3.3.2.11866 (net10.0-compatible build). Remove System.Resources.Extensions (not needed with net10 bcl). - DynamoRevit.All.sln: add Debug|NET100 and Release|NET100 platform configurations for all projects (additive alongside NET80). - restorepackages.bat: update aget -framework from NET80 to NET100.
1 parent 603968e commit 7765583

4 files changed

Lines changed: 73 additions & 16 deletions

File tree

‎src/Config/CS_SDK.props‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project>
22
<Import Project="$(SolutionDir)Config/user_local.props" />
33
<PropertyGroup>
4-
<Platforms>NET70;NET80</Platforms>
4+
<Platforms>NET70;NET80;NET100</Platforms>
55
<PlatformTarget >x64</PlatformTarget>
6+
<TargetFramework Condition="'$(Platform)' == 'NET100'">net10.0-windows</TargetFramework>
67
<TargetFramework Condition="'$(Platform)' == 'NET80'">net8.0-windows</TargetFramework>
78
<TargetFramework Condition="'$(Platform)' == 'NET70'">net7.0-windows</TargetFramework>
89
<TargetFramework Condition="'$(Platform)' == 'NET60'">net6.0-windows</TargetFramework>
@@ -20,22 +21,25 @@
2021

2122
<DYNAMOTESTAPI Condition=" '$(DYNAMOTESTAPI)' == '' ">C:\Program Files\Dynamo 0.7</DYNAMOTESTAPI>
2223

24+
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET100'">net10.0</DCoreLibSubFolder>
2325
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET80'">net8.0</DCoreLibSubFolder>
2426
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET70'">net6.0</DCoreLibSubFolder>
2527
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET60'">net6.0</DCoreLibSubFolder>
2628
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">$(SolutionDir)..\lib\Revit $(RevitVersionNumber)\$(DCoreLibSubFolder)</REVITAPI>
29+
<!-- Fallback: Revit 2025 NuGet package only ships net8.0; use it if net10.0 folder is absent -->
30+
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">$(SolutionDir)..\lib\Revit $(RevitVersionNumber)\net8.0</REVITAPI>
2731
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">C:\Program Files\Autodesk\Revit Architecture $(RevitVersionNumber)</REVITAPI>
2832
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">C:\Program Files\Autodesk\Revit $(RevitVersionNumber)</REVITAPI>
29-
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">C:\Program Files\Autodesk\Revit Preview Release</REVITAPI>
33+
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">C:\Program Files\Autodesk\Revit 2025</REVITAPI>
3034

3135
<BaseIntermediateOutputPath>$(SolutionDir)..\obj\$(Configuration)\$(Platform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
3236
<IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
3337
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
34-
<DefaultOutputPath>$(SolutionDir)..\bin\$(Configuration)\$(Platform)\$(REVIT_VERSION)</DefaultOutputPath>
38+
<DefaultOutputPath>$(SolutionDir)..\bin\$(Platform)\$(Configuration)\Revit</DefaultOutputPath>
3539
<OutputPath Condition=" '$(OutputPath)' == '' ">$(DefaultOutputPath)</OutputPath>
36-
<TestOutputPath Condition=" '$(TestOutputPath)' == '' ">$(SolutionDir)..\bin\$(Configuration)\$(Platform)\$(REVIT_VERSION)</TestOutputPath>
40+
<TestOutputPath Condition=" '$(TestOutputPath)' == '' ">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\Revit</TestOutputPath>
3741

38-
<NoWarn>MSB3539</NoWarn>
42+
<NoWarn>MSB3539;CS3001;CS3002;CS3003;CS3009;CS3016;CS3027</NoWarn>
3943
</PropertyGroup>
4044
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
4145
<DebugSymbols>true</DebugSymbols>

‎src/Config/packages.aget‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22
"nuget": {
33
"references": {
44
"DynamicLanguageRuntime": "1.2.2",
5-
"DynamoVisualProgramming.Core": "3.3.1.7726",
6-
"DynamoVisualProgramming.DynamoCoreNodes": "3.3.1.7726",
7-
"DynamoVisualProgramming.DynamoServices": "3.3.1.7726",
8-
"DynamoVisualProgramming.Tests": "3.3.1.7726",
9-
"DynamoVisualProgramming.WpfUILibrary": "3.3.1.7726",
10-
"DynamoVisualProgramming.ZeroTouchLibrary": "3.3.1.7726",
11-
"DynamoVisualProgramming.DynamoSamples": "3.3.1.7726",
5+
"DynamoVisualProgramming.Core": "3.3.2.11866",
6+
"DynamoVisualProgramming.DynamoCoreNodes": "3.3.2.11866",
7+
"DynamoVisualProgramming.DynamoServices": "3.3.2.11866",
8+
"DynamoVisualProgramming.Tests": "3.3.2.11866",
9+
"DynamoVisualProgramming.WpfUILibrary": "3.3.2.11866",
10+
"DynamoVisualProgramming.ZeroTouchLibrary": "3.3.2.11866",
11+
"DynamoVisualProgramming.DynamoSamples": "3.3.2.11866",
1212
"Greg": "3.0.1.4707",
1313
"GregRevitAuth": "3.0.8935.26399",
1414
"pythonnet_py38_win": "2.5.1",
1515
"Newtonsoft.Json": "13.0.1",
1616
"NUnit": "3.13.3",
1717
"Prism": "4.1.0",
18-
"RestSharp": "112.0.0",
19-
"System.Resources.Extensions": "5.0.0"
18+
"RestSharp": "112.0.0"
2019
}
2120
}
22-
}
21+
}

‎src/DynamoRevit.All.sln‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,58 +78,112 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{956846
7878
EndProject
7979
Global
8080
GlobalSection(SolutionConfigurationPlatforms) = preSolution
81+
Debug|NET100 = Debug|NET100
82+
Release|NET100 = Release|NET100
8183
Debug|NET80 = Debug|NET80
8284
Release|NET80 = Release|NET80
8385
EndGlobalSection
8486
GlobalSection(ProjectConfigurationPlatforms) = postSolution
87+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET100.ActiveCfg = Debug|NET100
88+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET100.Build.0 = Debug|NET100
89+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET100.ActiveCfg = Release|NET100
90+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET100.Build.0 = Release|NET100
8591
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET80.ActiveCfg = Debug|NET80
8692
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET80.Build.0 = Debug|NET80
8793
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET80.ActiveCfg = Release|NET80
8894
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET80.Build.0 = Release|NET80
95+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET100.ActiveCfg = Debug|NET100
96+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET100.Build.0 = Debug|NET100
97+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET100.ActiveCfg = Release|NET100
98+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET100.Build.0 = Release|NET100
8999
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET80.ActiveCfg = Debug|NET80
90100
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET80.Build.0 = Debug|NET80
91101
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET80.ActiveCfg = Release|NET80
92102
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET80.Build.0 = Release|NET80
103+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET100.ActiveCfg = Debug|NET100
104+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET100.Build.0 = Debug|NET100
105+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET100.ActiveCfg = Release|NET100
106+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET100.Build.0 = Release|NET100
93107
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET80.ActiveCfg = Debug|NET80
94108
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET80.Build.0 = Debug|NET80
95109
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET80.ActiveCfg = Release|NET80
96110
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET80.Build.0 = Release|NET80
111+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET100.ActiveCfg = Debug|NET100
112+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET100.Build.0 = Debug|NET100
113+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET100.ActiveCfg = Release|NET100
114+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET100.Build.0 = Release|NET100
97115
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET80.ActiveCfg = Debug|NET80
98116
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET80.Build.0 = Debug|NET80
99117
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET80.ActiveCfg = Release|NET80
100118
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET80.Build.0 = Release|NET80
119+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET100.ActiveCfg = Debug|NET100
120+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET100.Build.0 = Debug|NET100
121+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET100.ActiveCfg = Release|NET100
122+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET100.Build.0 = Release|NET100
101123
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET80.ActiveCfg = Debug|NET80
102124
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET80.Build.0 = Debug|NET80
103125
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET80.ActiveCfg = Release|NET80
104126
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET80.Build.0 = Release|NET80
127+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET100.ActiveCfg = Debug|NET100
128+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET100.Build.0 = Debug|NET100
129+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET100.ActiveCfg = Release|NET100
130+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET100.Build.0 = Release|NET100
105131
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET80.ActiveCfg = Debug|NET80
106132
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET80.Build.0 = Debug|NET80
107133
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET80.ActiveCfg = Release|NET80
108134
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET80.Build.0 = Release|NET80
135+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET100.ActiveCfg = Debug|NET100
136+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET100.Build.0 = Debug|NET100
137+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET100.ActiveCfg = Release|NET100
138+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET100.Build.0 = Release|NET100
109139
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET80.ActiveCfg = Debug|NET80
110140
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET80.Build.0 = Debug|NET80
111141
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET80.ActiveCfg = Release|NET80
112142
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET80.Build.0 = Release|NET80
143+
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET100.ActiveCfg = Debug|NET100
144+
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET100.Build.0 = Debug|NET100
145+
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET100.ActiveCfg = Release|NET100
146+
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET100.Build.0 = Release|NET100
113147
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET80.ActiveCfg = Debug|NET80
114148
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET80.Build.0 = Debug|NET80
115149
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET80.ActiveCfg = Release|NET80
116150
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET80.Build.0 = Release|NET80
151+
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET100.ActiveCfg = Debug|NET100
152+
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET100.Build.0 = Debug|NET100
153+
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET100.ActiveCfg = Release|NET100
154+
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET100.Build.0 = Release|NET100
117155
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET80.ActiveCfg = Debug|NET80
118156
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET80.Build.0 = Debug|NET80
119157
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET80.ActiveCfg = Release|NET80
120158
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET80.Build.0 = Release|NET80
159+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET100.ActiveCfg = Debug|NET100
160+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET100.Build.0 = Debug|NET100
161+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET100.ActiveCfg = Release|NET100
162+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET100.Build.0 = Release|NET100
121163
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET80.ActiveCfg = Debug|NET80
122164
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET80.Build.0 = Debug|NET80
123165
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET80.ActiveCfg = Release|NET80
124166
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET80.Build.0 = Release|NET80
167+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET100.ActiveCfg = Debug|NET100
168+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET100.Build.0 = Debug|NET100
169+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET100.ActiveCfg = Release|NET100
170+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET100.Build.0 = Release|NET100
125171
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET80.ActiveCfg = Debug|NET80
126172
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET80.Build.0 = Debug|NET80
127173
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET80.ActiveCfg = Release|NET80
128174
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET80.Build.0 = Release|NET80
175+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET100.ActiveCfg = Debug|NET100
176+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET100.Build.0 = Debug|NET100
177+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET100.ActiveCfg = Release|NET100
178+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET100.Build.0 = Release|NET100
129179
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET80.ActiveCfg = Debug|NET80
130180
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET80.Build.0 = Debug|NET80
131181
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET80.ActiveCfg = Release|NET80
132182
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET80.Build.0 = Release|NET80
183+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET100.ActiveCfg = Debug|NET100
184+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET100.Build.0 = Debug|NET100
185+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|NET100.ActiveCfg = Release|NET100
186+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|NET100.Build.0 = Release|NET100
133187
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET80.ActiveCfg = Debug|NET80
134188
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET80.Build.0 = Debug|NET80
135189
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|NET80.ActiveCfg = Release|NET80

‎src/restorepackages.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set NugetConfig=%ConfigDir%\dynamo-nuget.config
2727

2828
REM 2. download 3rdParty packages by Aget.exe
2929
echo Running Python script from %AgetFile% using dynamo-nuget.config file
30-
set PythonAget="%AgetFile%" -os win -config release -iset intel64 -toolchain v140 -linkage shared -packagesDir "%DynamoPackages%" -nuget "%NugetExe%" -framework NET80 -nugetConfig "%NugetConfig%"
30+
set PythonAget="%AgetFile%" -os win -config release -iset intel64 -toolchain v140 -linkage shared -packagesDir "%DynamoPackages%" -nuget "%NugetExe%" -framework NET100 -nugetConfig "%NugetConfig%"
3131

3232
call :TrackTime "[Aget] Downloading NuGet packages from the NuGet Gallery and the Artifactory server, might take a while if running for the first time."
3333
echo If any package is not found in the NuGet Gallery, redirect to look up in the Artifactory server...

0 commit comments

Comments
 (0)