Skip to content

Commit 6c16877

Browse files
MikhinjaMikhinja
authored
Update D4R to .NET 10 and Dynamo to 4.0.0-beta2685 (#3219) (REVIT-242214)
also moved most dependencies out of aget and restored using nuget
1 parent ffcb826 commit 6c16877

File tree

899 files changed

+2785
-18913
lines changed

Some content is hidden

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

899 files changed

+2785
-18913
lines changed

‎.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.55
1+
0.7.56

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.7.56
2+
* update to .NET 10
3+
* update Dynamo Core to 4.0.0-beta2685
4+
15
## 0.7.55
26
* Update Dynamo Core to 3.6.1.9895
37

‎global.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "10.0.100-preview.5.25277.114",
4+
"rollForward": "minor"
5+
}
6+
}

‎src/Config/CS_SDK.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<PropertyGroup>
55
<PlatformTarget >x64</PlatformTarget>
66
<Prefer32Bit>false</Prefer32Bit>
7-
<Platforms>NET80</Platforms>
8-
<TargetFramework>net8.0-windows</TargetFramework>
9-
<DCoreLibSubFolder>net8.0</DCoreLibSubFolder>
7+
<Platforms>NET80;NET100</Platforms>
8+
<TargetFramework Condition="'$(Platform)' == 'NET80'">net8.0-windows</TargetFramework>
9+
<TargetFramework Condition="'$(Platform)' == 'NET100'">net10.0-windows</TargetFramework>
1010
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
1111
<RevitVersionNumber Condition=" '$(RevitVersionNumber)' == '' ">Preview Release</RevitVersionNumber>
1212
<PACKAGESPATH>$(SolutionDir)packages</PACKAGESPATH>

‎src/Config/packages.aget‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
"nuget": {
33
"references": {
44
"DynamicLanguageRuntime": "1.2.2",
5-
"DynamoVisualProgramming.Core": "3.6.1.9895",
6-
"DynamoVisualProgramming.DynamoCoreNodes": "3.6.1.9895",
7-
"DynamoVisualProgramming.DynamoServices": "3.6.1.9895",
8-
"DynamoVisualProgramming.Tests": "3.6.1.9895",
9-
"DynamoVisualProgramming.WpfUILibrary": "3.6.1.9895",
10-
"DynamoVisualProgramming.ZeroTouchLibrary": "3.6.1.9895",
11-
"DynamoVisualProgramming.DynamoSamples": "3.6.1.9895",
12-
"Greg": "3.0.1.4707",
13-
"GregRevitAuth": "3.0.8935.26399",
14-
"pythonnet_py38_win": "2.5.1",
155
"Newtonsoft.Json": "13.0.1",
166
"NUnit": "3.13.3",
177
"NUnit.Engine": "3.13.2"

‎src/Config/packages_versions.props‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<!-- 3rd party package versions -->
5-
<DYNAMOCORE_VERSION>3.6.1.9895</DYNAMOCORE_VERSION>
3+
<PropertyGroup>
4+
<!-- 3rd party package versions -->
5+
<DYNAMOCORE_VERSION>4.0.0-beta2685</DYNAMOCORE_VERSION>
66

7-
<DYNAMOWPFUI_VERSION Condition="'$(DYNAMOWPFUI_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOWPFUI_VERSION>
8-
<DYNAMOCORENODES_VERSION Condition="'$(DYNAMOCORENODES_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOCORENODES_VERSION>
9-
<DYNAMOTESTS_VERSION Condition="'$(DYNAMOTESTS_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOTESTS_VERSION>
7+
<DYNAMOWPFUI_VERSION Condition="'$(DYNAMOWPFUI_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOWPFUI_VERSION>
8+
<DYNAMOCORENODES_VERSION Condition="'$(DYNAMOCORENODES_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOCORENODES_VERSION>
9+
<DYNAMOTESTS_VERSION Condition="'$(DYNAMOTESTS_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOTESTS_VERSION>
1010

11-
</PropertyGroup>
11+
<!-- These are useful when migrating to a new .NET while not all builds are available -->
12+
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET80'">net8.0</DCoreLibSubFolder>
13+
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET100'">net10.0</DCoreLibSubFolder>
14+
15+
<Greg_VERSION>3.0.1.4707</Greg_VERSION>
16+
<GregRevitAuth_VERSION>4.0.9405.33709</GregRevitAuth_VERSION>
17+
<GregRevitAuthLibSubFolder>net10.0</GregRevitAuthLibSubFolder>
18+
19+
<!-- Keep in sync with DynamoCore & TODO: check if still needed -->
20+
<DynamicLanguageRuntime_VERSION>1.2.2</DynamicLanguageRuntime_VERSION>
21+
<PYTHONNET_PY38_VERSION>2.5.1</PYTHONNET_PY38_VERSION>
22+
<NewtonsoftJson_VERSION>13.0.1</NewtonsoftJson_VERSION> <!-- TODO: is this still needed? -->
23+
<NUnit_VERSION>3.13.3</NUnit_VERSION>
24+
<NUnit_Engine_VERSION>3.13.0</NUnit_Engine_VERSION>
25+
<NUnit3TestAdapter_VERSION>4.2.1</NUnit3TestAdapter_VERSION>
26+
27+
</PropertyGroup>
1228
</Project>

‎src/Config/user_local.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">$(SolutionDir)..\lib\Revit Preview Release\net8.0</REVITAPI>
5+
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">D:\src\git.adsk\Revit\dev2\Debugx64</REVITAPI>
56
</PropertyGroup>
67
</Project>

‎src/DynamoRevit.All.sln‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
5555
..\.version = ..\.version
5656
..\CHANGELOG.md = ..\CHANGELOG.md
5757
..\.adsk\ContinuousLocalization.yml = ..\.adsk\ContinuousLocalization.yml
58+
..\global.json = ..\global.json
5859
..\README.md = ..\README.md
5960
EndProjectSection
6061
EndProject
@@ -86,62 +87,123 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".adsk", ".adsk", "{D6EED31E
8687
..\.adsk\ContinuousLocalization.yml = ..\.adsk\ContinuousLocalization.yml
8788
EndProjectSection
8889
EndProject
90+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
91+
ProjectSection(SolutionItems) = preProject
92+
.editorconfig = .editorconfig
93+
restorepackages.bat = restorepackages.bat
94+
transform_all.bat = transform_all.bat
95+
EndProjectSection
96+
EndProject
8997
Global
9098
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99+
Debug|NET100 = Debug|NET100
91100
Debug|NET80 = Debug|NET80
101+
Release|NET100 = Release|NET100
92102
Release|NET80 = Release|NET80
93103
EndGlobalSection
94104
GlobalSection(ProjectConfigurationPlatforms) = postSolution
105+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET100.ActiveCfg = Debug|NET100
106+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET100.Build.0 = Debug|NET100
95107
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET80.ActiveCfg = Debug|NET80
96108
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|NET80.Build.0 = Debug|NET80
109+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET100.ActiveCfg = Release|NET100
110+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET100.Build.0 = Release|NET100
97111
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET80.ActiveCfg = Release|NET80
98112
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|NET80.Build.0 = Release|NET80
113+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET100.ActiveCfg = Debug|NET100
114+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET100.Build.0 = Debug|NET100
99115
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET80.ActiveCfg = Debug|NET80
100116
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|NET80.Build.0 = Debug|NET80
117+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET100.ActiveCfg = Release|NET100
118+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET100.Build.0 = Release|NET100
101119
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET80.ActiveCfg = Release|NET80
102120
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|NET80.Build.0 = Release|NET80
121+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET100.ActiveCfg = Debug|NET100
122+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET100.Build.0 = Debug|NET100
103123
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET80.ActiveCfg = Debug|NET80
104124
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|NET80.Build.0 = Debug|NET80
125+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET100.ActiveCfg = Release|NET100
126+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET100.Build.0 = Release|NET100
105127
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET80.ActiveCfg = Release|NET80
106128
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|NET80.Build.0 = Release|NET80
129+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET100.ActiveCfg = Debug|NET100
130+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET100.Build.0 = Debug|NET100
107131
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET80.ActiveCfg = Debug|NET80
108132
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|NET80.Build.0 = Debug|NET80
133+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET100.ActiveCfg = Release|NET100
134+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET100.Build.0 = Release|NET100
109135
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET80.ActiveCfg = Release|NET80
110136
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|NET80.Build.0 = Release|NET80
137+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET100.ActiveCfg = Debug|NET100
138+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET100.Build.0 = Debug|NET100
111139
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET80.ActiveCfg = Debug|NET80
112140
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|NET80.Build.0 = Debug|NET80
141+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET100.ActiveCfg = Release|NET100
142+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET100.Build.0 = Release|NET100
113143
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET80.ActiveCfg = Release|NET80
114144
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|NET80.Build.0 = Release|NET80
145+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET100.ActiveCfg = Debug|NET100
146+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET100.Build.0 = Debug|NET100
115147
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET80.ActiveCfg = Debug|NET80
116148
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|NET80.Build.0 = Debug|NET80
149+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET100.ActiveCfg = Release|NET100
150+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET100.Build.0 = Release|NET100
117151
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET80.ActiveCfg = Release|NET80
118152
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|NET80.Build.0 = Release|NET80
153+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET100.ActiveCfg = Debug|NET100
154+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET100.Build.0 = Debug|NET100
119155
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET80.ActiveCfg = Debug|NET80
120156
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET80.Build.0 = Debug|NET80
157+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET100.ActiveCfg = Release|NET100
158+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET100.Build.0 = Release|NET100
121159
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET80.ActiveCfg = Release|NET80
122160
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET80.Build.0 = Release|NET80
161+
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET100.ActiveCfg = Debug|NET100
162+
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET100.Build.0 = Debug|NET100
123163
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET80.ActiveCfg = Debug|NET80
124164
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|NET80.Build.0 = Debug|NET80
165+
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET100.ActiveCfg = Release|NET100
166+
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET100.Build.0 = Release|NET100
125167
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET80.ActiveCfg = Release|NET80
126168
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|NET80.Build.0 = Release|NET80
169+
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET100.ActiveCfg = Debug|NET100
170+
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET100.Build.0 = Debug|NET100
127171
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET80.ActiveCfg = Debug|NET80
128172
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|NET80.Build.0 = Debug|NET80
173+
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET100.ActiveCfg = Release|NET100
174+
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET100.Build.0 = Release|NET100
129175
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET80.ActiveCfg = Release|NET80
130176
{589F14D7-2937-479C-834A-D44197CB1930}.Release|NET80.Build.0 = Release|NET80
177+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET100.ActiveCfg = Debug|NET100
178+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET100.Build.0 = Debug|NET100
131179
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET80.ActiveCfg = Debug|NET80
132180
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET80.Build.0 = Debug|NET80
181+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET100.ActiveCfg = Release|NET100
182+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET100.Build.0 = Release|NET100
133183
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET80.ActiveCfg = Release|NET80
134184
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET80.Build.0 = Release|NET80
185+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET100.ActiveCfg = Debug|NET100
186+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET100.Build.0 = Debug|NET100
135187
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET80.ActiveCfg = Debug|NET80
136188
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|NET80.Build.0 = Debug|NET80
189+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET100.ActiveCfg = Release|NET100
190+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET100.Build.0 = Release|NET100
137191
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET80.ActiveCfg = Release|NET80
138192
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|NET80.Build.0 = Release|NET80
193+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET100.ActiveCfg = Debug|NET100
194+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET100.Build.0 = Debug|NET100
139195
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET80.ActiveCfg = Debug|NET80
140196
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|NET80.Build.0 = Debug|NET80
197+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET100.ActiveCfg = Release|NET100
198+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET100.Build.0 = Release|NET100
141199
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET80.ActiveCfg = Release|NET80
142200
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|NET80.Build.0 = Release|NET80
201+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET100.ActiveCfg = Debug|NET100
202+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET100.Build.0 = Debug|NET100
143203
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET80.ActiveCfg = Debug|NET80
144204
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|NET80.Build.0 = Debug|NET80
205+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|NET100.ActiveCfg = Release|NET100
206+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|NET100.Build.0 = Release|NET100
145207
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|NET80.ActiveCfg = Release|NET80
146208
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|NET80.Build.0 = Release|NET80
147209
EndGlobalSection
@@ -161,8 +223,9 @@ Global
161223
{589F14D7-2937-479C-834A-D44197CB1930} = {0E492D35-2310-4849-9694-A2A53C09F21B}
162224
{9ADADC68-36A3-4A21-9B54-298154A88720} = {0E492D35-2310-4849-9694-A2A53C09F21B}
163225
{92A46535-D870-4E1A-AED0-7492789E9C4A} = {821DE75A-8C7C-4747-B838-BA0354B15592}
164-
{9568462D-249F-4494-856B-5B25751DB361} = {4466E6F6-F644-43AB-96B3-5ECE1622E711}
226+
{9568462D-249F-4494-856B-5B25751DB361} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
165227
{D6EED31E-BD59-4E53-B6C8-574A8C9A61B3} = {4466E6F6-F644-43AB-96B3-5ECE1622E711}
228+
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {4466E6F6-F644-43AB-96B3-5ECE1622E711}
166229
EndGlobalSection
167230
GlobalSection(ExtensibilityGlobals) = postSolution
168231
SolutionGuid = {757AAA40-191F-4673-9B04-8270A3370BCA}

‎src/DynamoRevit/DynamoRevit.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@
101101
<ItemGroup>
102102
<PackageReference Include="DynamoVisualProgramming.Core" Version="$(DYNAMOCORE_VERSION)" ExcludeAssets="runtime" GeneratePathProperty="true" />
103103
<PackageReference Include="DynamoVisualProgramming.WpfUILibrary" Version="$(DYNAMOWPFUI_VERSION)" ExcludeAssets="runtime" />
104-
<PackageReference Include="Greg" Version="3.0.1.4707" ExcludeAssets="runtime" />
104+
<PackageReference Include="Greg" Version="$(Greg_VERSION)" ExcludeAssets="runtime" />
105105
<!--Exclude GregRevitAuth runtime to avoid having the transitive deps copied to the output. PrivateAssets does not work for that. -->
106-
<PackageReference Include="GregRevitAuth" Version="3.0.8935.26399" ExcludeAssets="runtime" GeneratePathProperty="true" />
107-
<PackageReference Include="pythonnet_py38_win" Version="2.5.1" ExcludeAssets="runtime" />
106+
<PackageReference Include="GregRevitAuth" Version="$(GregRevitAuth_VERSION)" ExcludeAssets="runtime" GeneratePathProperty="true" />
107+
<PackageReference Include="pythonnet_py38_win" Version="$(PYTHONNET_PY38_VERSION)" ExcludeAssets="runtime" />
108108
</ItemGroup>
109109
<Target Name="Copy dll" AfterTargets="Build">
110-
<Copy SourceFiles="$(PkgDynamoVisualProgramming_Core)\lib\net8.0\DynamoInstallDetective.dll" DestinationFolder="$(OutputPath)\.." />
111-
<Copy SourceFiles="$(PkgGregRevitAuth)\lib\net8.0\GregRevitAuth.dll" DestinationFolder="$(OutputPath)" />
110+
<Copy SourceFiles="$(PkgDynamoVisualProgramming_Core)\lib\$(DCoreLibSubFolder)\DynamoInstallDetective.dll" DestinationFolder="$(OutputPath)\.." />
111+
<Copy SourceFiles="$(PkgGregRevitAuth)\lib\$(GregRevitAuthLibSubFolder)\GregRevitAuth.dll" DestinationFolder="$(OutputPath)" />
112112
</Target>
113113
</Project>

0 commit comments

Comments
 (0)