Skip to content

Commit f2d97c2

Browse files
MikhinjaMikhinja
committed
* update Dynamo Core to 4.0.0-beta2685
* update GregRevitAuth * move some dependencies from aget to nuget method
1 parent 378e5f9 commit f2d97c2

File tree

10 files changed

+53
-33
lines changed

10 files changed

+53
-33
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-beta2675
4+
15
## 0.7.55
26
* Update Dynamo Core to 3.6.1.9895
37

‎src/Config/CS_SDK.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
<Platforms>NET80;NET100</Platforms>
88
<TargetFramework Condition="'$(Platform)' == 'NET80'">net8.0-windows</TargetFramework>
99
<TargetFramework Condition="'$(Platform)' == 'NET100'">net10.0-windows</TargetFramework>
10-
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET80'">net8.0</DCoreLibSubFolder>
11-
<!-- TODO: Temporary, until we have DynamoCore build on net10.0 -->
12-
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET100'">net8.0</DCoreLibSubFolder>
1310
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
1411
<RevitVersionNumber Condition=" '$(RevitVersionNumber)' == '' ">Preview Release</RevitVersionNumber>
1512
<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": "4.0.0-beta2656",
6-
"DynamoVisualProgramming.DynamoCoreNodes": "4.0.0-beta2656",
7-
"DynamoVisualProgramming.DynamoServices": "4.0.0-beta2656",
8-
"DynamoVisualProgramming.Tests": "4.0.0-beta2656",
9-
"DynamoVisualProgramming.WpfUILibrary": "4.0.0-beta2656",
10-
"DynamoVisualProgramming.ZeroTouchLibrary": "4.0.0-beta2656",
11-
"DynamoVisualProgramming.DynamoSamples": "4.0.0-beta2656",
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>4.0.0-beta2656</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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".adsk", ".adsk", "{D6EED31E
8787
..\.adsk\ContinuousLocalization.yml = ..\.adsk\ContinuousLocalization.yml
8888
EndProjectSection
8989
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
9097
Global
9198
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9299
Debug|NET100 = Debug|NET100
@@ -216,8 +223,9 @@ Global
216223
{589F14D7-2937-479C-834A-D44197CB1930} = {0E492D35-2310-4849-9694-A2A53C09F21B}
217224
{9ADADC68-36A3-4A21-9B54-298154A88720} = {0E492D35-2310-4849-9694-A2A53C09F21B}
218225
{92A46535-D870-4E1A-AED0-7492789E9C4A} = {821DE75A-8C7C-4747-B838-BA0354B15592}
219-
{9568462D-249F-4494-856B-5B25751DB361} = {4466E6F6-F644-43AB-96B3-5ECE1622E711}
226+
{9568462D-249F-4494-856B-5B25751DB361} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
220227
{D6EED31E-BD59-4E53-B6C8-574A8C9A61B3} = {4466E6F6-F644-43AB-96B3-5ECE1622E711}
228+
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {4466E6F6-F644-43AB-96B3-5ECE1622E711}
221229
EndGlobalSection
222230
GlobalSection(ExtensibilityGlobals) = postSolution
223231
SolutionGuid = {757AAA40-191F-4673-9B04-8270A3370BCA}

‎src/DynamoRevit/DynamoRevit.csproj‎

Lines changed: 4 additions & 4 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">
110110
<Copy SourceFiles="$(PkgDynamoVisualProgramming_Core)\lib\$(DCoreLibSubFolder)\DynamoInstallDetective.dll" DestinationFolder="$(OutputPath)\.." />
111-
<Copy SourceFiles="$(PkgGregRevitAuth)\lib\$(DCoreLibSubFolder)\GregRevitAuth.dll" DestinationFolder="$(OutputPath)" />
111+
<Copy SourceFiles="$(PkgGregRevitAuth)\lib\$(GregRevitAuthLibSubFolder)\GregRevitAuth.dll" DestinationFolder="$(OutputPath)" />
112112
</Target>
113113
</Project>

‎src/restorepackages.bat‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,29 @@ REM 2. download 3rdParty packages by Aget.exe
2929
echo Running Python script from %AgetFile% using dynamo-nuget.config file
3030
REM TODO: check if this actually works with .NET 10 version of Dynamo
3131
REM Auto-detect default platform from solution file
32-
set Framework=NET100
3332
set SolutionFile=%CurrentDir%\DynamoRevit.All.sln
33+
echo SolutionFile is %SolutionFile%
3434
if exist "%SolutionFile%" (
3535
REM Find the first platform in SolutionConfigurationPlatforms section
36-
for /f "tokens=1 delims=|" %%i in ('findstr /R "Debug|.*=" "%SolutionFile%" ^| findstr /V "ProjectConfigurationPlatforms"') do (
36+
for /f "tokens=1 delims=|" %%i in ('findstr /R "Debug|.*=" "%SolutionFile%" ^| findstr /V "SolutionConfigurationPlatforms"') do (
3737
set Framework=%%i
3838
set FrameworkFound=true
39+
break
3940
)
40-
)
41+
) else echo "%SolutionFile%" does not exist!
42+
echo Found framework: %Framework%
43+
set Framework=NET100
4144
echo Using framework: %Framework%
4245
set PythonAget="%AgetFile%" -os win -config release -iset intel64 -toolchain v140 -linkage shared -packagesDir "%DynamoPackages%" -nuget "%NugetExe%" -framework %Framework% -nugetConfig "%NugetConfig%"
4346

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

4750
:: Symlinks are generated here
51+
echo COMMAND: %PythonAget% -agettable "%ConfigDir%\packages.aget" -refsDir "%SymLinksDir%"
4852
%PythonAget% -agettable "%ConfigDir%\packages.aget" -refsDir "%SymLinksDir%"
49-
if ERRORLEVEL 1 (
50-
echo ERROR: Failed to update Dynamo 3rdParty nuget packages in packages.aget
53+
if not ERRORLEVEL 0 (
54+
echo ERROR %ERRORLEVEL%: Failed to update Dynamo 3rdParty nuget packages in packages.aget
5155
exit /b 1
5256
)
5357
call :TrackTime "%~n0: exiting from batch script"

‎test/Libraries/RevitTestServices/RevitTestServices.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<ItemGroup>
5454
<PackageReference Include="DynamoVisualProgramming.Tests" Version="$(DYNAMOTESTS_VERSION)" ExcludeAssets="runtime" />
5555
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
56-
<PackageReference Include="NUnit" Version="3.13.3" />
57-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
56+
<PackageReference Include="NUnit" Version="$(NUnit_VERSION)" />
57+
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapter_VERSION)" />
5858
<ProjectReference Include="$(SolutionDir)DynamoRevit\DynamoRevit.csproj">
5959
<Private>False</Private>
6060
</ProjectReference>

0 commit comments

Comments
 (0)