Skip to content

Commit 1bc9584

Browse files
authored
REVIT-245589 (#3271)
* add new family * remove unnecessary dependencies from packages.aget
1 parent 3dc9c08 commit 1bc9584

File tree

10 files changed

+10
-75
lines changed

10 files changed

+10
-75
lines changed

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.68
1+
0.7.69

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.7.69
2+
* Add Diagnostic Tripod-1 point.rfa
3+
* remove dependency on aget
4+
15
## 0.7.68
26
* Update one sample to PythonNet3
37
* renamed samples on all languages to allow better samples filenames' translation
432 KB
Binary file not shown.

src/AssemblySharedInfoGenerator/AssemblyInfoGenerator.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<PropertyGroup>
1818
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
1919
</PropertyGroup>
20-
<Target Name="BeforeBuildMigrated" BeforeTargets="PreBuildEvent">
21-
<Exec Command="&quot;$(SolutionDir)restorepackages.bat&quot;" ContinueOnError="true" />
22-
</Target>
2320
<ItemGroup>
2421
<None Update="AssemblySharedInfo.tt">
2522
<Generator>TextTemplatingFileGenerator</Generator>

src/Config/packages.aget

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"nuget": {
33
"references": {
4-
"DynamicLanguageRuntime": "1.2.2",
5-
"Newtonsoft.Json": "13.0.1",
6-
"NUnit": "3.13.3",
7-
"NUnit.Engine": "3.13.2"
4+
85
}
96
}
107
}

src/Config/packages_versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PYTHONNET_PY38_VERSION>2.5.1</PYTHONNET_PY38_VERSION>
2222
<NewtonsoftJson_VERSION>13.0.1</NewtonsoftJson_VERSION> <!-- TODO: is this still needed? -->
2323
<NUnit_VERSION>3.13.3</NUnit_VERSION>
24-
<NUnit_Engine_VERSION>3.13.0</NUnit_Engine_VERSION>
24+
<NUnit_Engine_VERSION>3.13.2</NUnit_Engine_VERSION>
2525
<NUnit3TestAdapter_VERSION>4.2.1</NUnit3TestAdapter_VERSION>
2626

2727
</PropertyGroup>

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\net10.0</REVITAPI>
5+
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">D:\src\git.adsk\Revit\dev1\revit\Debugx64</REVITAPI>
56
</PropertyGroup>
67
</Project>

src/DynamoRevit.All.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{956846
7676
Config.xml = Config.xml
7777
Config\CS_SDK.props = Config\CS_SDK.props
7878
Config\dynamo-nuget.config = Config\dynamo-nuget.config
79-
Config\packages-template.aget = Config\packages-template.aget
80-
Config\packages.aget = Config\packages.aget
8179
Config\packages_versions.props = Config\packages_versions.props
8280
Config\user_local.props = Config\user_local.props
8381
EndProjectSection
@@ -90,7 +88,6 @@ EndProject
9088
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
9189
ProjectSection(SolutionItems) = preProject
9290
.editorconfig = .editorconfig
93-
restorepackages.bat = restorepackages.bat
9491
transform_all.bat = transform_all.bat
9592
EndProjectSection
9693
EndProject

src/restorepackages.bat

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,2 @@
11
@echo off
2-
REM ***********************************************************************
3-
REM This bat file uses Aget: https://git.autodesk.com/Dynamo/Aget to
4-
REM download the nuget packages from NuGet server or closest Artifactory server for
5-
REM
6-
REM NuGet Server: https://www.nuget.org
7-
REM Santa Clara: https://art-bobcat.autodesk.com
8-
REM
9-
REM ***********************************************************************
10-
11-
setlocal EnableDelayedExpansion
12-
setlocal EnableExtensions
13-
14-
REM 1. set variable values
15-
set DynamoPackages=%~dp0\packages\_packages
16-
echo %DynamoPackages%
17-
set CurrentDir=%~dp0
18-
if %CurrentDir:~-1%==\ (
19-
set CurrentDir=%CurrentDir:~0,-1%
20-
)
21-
set ConfigDir=%CurrentDir%\Config
22-
set SymLinksDir=%CurrentDir%\packages
23-
24-
set NugetExe=%CurrentDir%\Tools\NugetCLI\nuget.exe
25-
set AgetFile=%CurrentDir%\Tools\Aget\aget.exe
26-
set NugetConfig=%ConfigDir%\dynamo-nuget.config
27-
28-
REM 2. download 3rdParty packages by Aget.exe
29-
echo Running Python script from %AgetFile% using dynamo-nuget.config file
30-
REM TODO: check if this actually works with .NET 10 version of Dynamo
31-
REM Auto-detect default platform from solution file
32-
set SolutionFile=%CurrentDir%\DynamoRevit.All.sln
33-
echo SolutionFile is %SolutionFile%
34-
if exist "%SolutionFile%" (
35-
REM Find the first platform in SolutionConfigurationPlatforms section
36-
for /f "tokens=1 delims=|" %%i in ('findstr /R "Debug|.*=" "%SolutionFile%" ^| findstr /V "SolutionConfigurationPlatforms"') do (
37-
set Framework=%%i
38-
set FrameworkFound=true
39-
break
40-
)
41-
) else echo "%SolutionFile%" does not exist!
42-
echo Found framework: %Framework%
43-
set Framework=NET100
44-
echo Using framework: %Framework%
45-
set PythonAget="%AgetFile%" -os win -config release -iset intel64 -toolchain v140 -linkage shared -packagesDir "%DynamoPackages%" -nuget "%NugetExe%" -framework %Framework% -nugetConfig "%NugetConfig%"
46-
47-
call :TrackTime "[Aget] Downloading NuGet packages from the NuGet Gallery and the Artifactory server, might take a while if running for the first time."
48-
echo If any package is not found in the NuGet Gallery, redirect to look up in the Artifactory server...
49-
50-
:: Symlinks are generated here
51-
echo COMMAND: %PythonAget% -agettable "%ConfigDir%\packages.aget" -refsDir "%SymLinksDir%"
52-
%PythonAget% -agettable "%ConfigDir%\packages.aget" -refsDir "%SymLinksDir%"
53-
if not ERRORLEVEL 0 (
54-
echo ERROR %ERRORLEVEL%: Failed to update Dynamo 3rdParty nuget packages in packages.aget
55-
exit /b 1
56-
)
57-
call :TrackTime "%~n0: exiting from batch script"
58-
endlocal
59-
exit /b 0
60-
:TrackTime
61-
echo ========================================================
62-
echo %~1
63-
time /t
64-
echo ========================================================
2+
echo skipping Restoring packages with aget (for testing)...

test/Libraries/RevitTestServices/RevitTestServices.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<PackageReference Include="DynamoVisualProgramming.Tests" Version="$(DYNAMOTESTS_VERSION)" ExcludeAssets="runtime" />
5555
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
5656
<PackageReference Include="NUnit" Version="$(NUnit_VERSION)" />
57+
<PackageReference Include="NUnit.Engine" Version="$(NUnit_Engine_VERSION)" />
5758
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapter_VERSION)" />
5859
<ProjectReference Include="$(SolutionDir)DynamoRevit\DynamoRevit.csproj">
5960
<Private>False</Private>

0 commit comments

Comments
 (0)