From 8b2aad4f82eede4fb6d4c35e84e6d74ccb3948b4 Mon Sep 17 00:00:00 2001 From: Michael Kirschner <508936+mjkkirschner@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:24:26 -0400 Subject: [PATCH 1/3] create portable symbols https://learn.microsoft.com/en-us/dotnet/core/diagnostics/symbols --- src/Config/CS_SDK.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props index 5ad2265ce79..a6fb16a9643 100644 --- a/src/Config/CS_SDK.props +++ b/src/Config/CS_SDK.props @@ -36,7 +36,7 @@ false - full + portable false From 10dbea88c403db3ec080e21230467402f1ab6292 Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" <508936+mjkkirschner@users.noreply.github.com> Date: Tue, 15 Oct 2024 19:10:03 -0400 Subject: [PATCH 2/3] conditional portable symbols --- src/Config/CS_SDK.props | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props index a6fb16a9643..9eb8d9a18f9 100644 --- a/src/Config/CS_SDK.props +++ b/src/Config/CS_SDK.props @@ -35,8 +35,12 @@ true false - - portable + + + full + + + portable false From 17029d0fa55b95ea66af1b1041432216cf00caf1 Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" <508936+mjkkirschner@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:22:35 -0400 Subject: [PATCH 3/3] bat file update to support single nuspec and add git info --- tools/NuGet/BuildPackages.bat | 13 +++++++++- ...rogramming.ServiceCoreRuntime-debug.nuspec | 25 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime-debug.nuspec diff --git a/tools/NuGet/BuildPackages.bat b/tools/NuGet/BuildPackages.bat index d6ba089a87a..775c93c2dcf 100644 --- a/tools/NuGet/BuildPackages.bat +++ b/tools/NuGet/BuildPackages.bat @@ -1,3 +1,5 @@ +:: PLEASE SOMEONE FIND THE TIME TO REPLACE THIS WITH ANOTHER SCRIPTING LANGUAGE :( + :: Argument %1: path to template folder :: Argument %2: path to dynamo build directory :: @@ -37,6 +39,9 @@ for /f %%f in ('cscript //Nologo ..\install\GetFileVersion.vbs %harvestPath%\Dyn setlocal DisableDelayedExpansion set version=%Major%.%Minor%.%Build%-beta%Revision% +for /f %%i in ('git rev-parse HEAD') do set COMMIT=%%i + +echo %COMMIT% :: Get target framework from build.xml for /f %%f in ('cscript //Nologo .\GetTargetFramework.vbs ..\..\src\build.xml') do ( setlocal EnableDelayedExpansion @@ -47,12 +52,18 @@ setlocal DisableDelayedExpansion :: Clean files generated from the previous run if exist *.nupkg ( del *.nupkg ) +echo %1|find ".nuspec" >nul +if errorlevel 1 (goto :packfolder) else (goto:packsingle_nuspec) + +:packsingle_nuspec +nuget pack %1 -basepath %harvestPath% -properties gitcommitid=%COMMIT%;Version=%version%;TargetFramework=%targetFramework% +:packfolder :: Pack .nupkg files based on each .nuspec in the "nuspec" folder for %%f in (%1\*.nuspec) do ( :: Check if nuspec file name containing "Symbols" echo %%f|find "Symbols" >nul :: When nuget pack symbols, set to release path where the symbol files live - if errorlevel 1 ( nuget pack %%f -basepath %harvestPath% -properties Version=%version%;TargetFramework=%targetFramework%) else (nuget pack %%f -basepath %releasePath% -properties Version=%version%;TargetFramework=%targetFramework%) + if errorlevel 1 ( nuget pack %%f -basepath %harvestPath% -properties gitcommitid=%COMMIT%;Version=%version%;TargetFramework=%targetFramework%) else (nuget pack %%f -basepath %releasePath% -properties Version=%version%;TargetFramework=%targetFramework%) if not exist %%~nf.%version%.nupkg ( exit /b 1 ) diff --git a/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime-debug.nuspec b/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime-debug.nuspec new file mode 100644 index 00000000000..d4611fd0ddf --- /dev/null +++ b/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime-debug.nuspec @@ -0,0 +1,25 @@ + + + + DynamoVisualProgramming.ServiceCoreRuntime-debug + $Version$ + Autodesk + Autodesk + Apache-2.0 + https://github.com/DynamoDS/Dynamo + false + Assemblies required to start a DynamoModel and execute DesignScript code bundled along with their dependencies. + Built targeting linux. + Copyright Autodesk 2023 + + + + + + + + + +