Skip to content

Commit

Permalink
DYN-6421: Update nuspec files for net8 (#14643)
Browse files Browse the repository at this point in the history
* First pass

* Use build.xml instead
  • Loading branch information
sm6srw authored Nov 28, 2023
1 parent 6e35547 commit 8f8e28b
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 56 deletions.
11 changes: 9 additions & 2 deletions tools/NuGet/BuildPackages.bat
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ for /f %%f in ('cscript //Nologo ..\install\GetFileVersion.vbs %harvestPath%\Dyn
setlocal DisableDelayedExpansion
set version=%Major%.%Minor%.%Build%-beta%Revision%

:: Get target framework from build.xml
for /f %%f in ('cscript //Nologo .\GetTargetFramework.vbs ..\..\src\build.xml') do (
setlocal EnableDelayedExpansion
set targetFramework=%%f
)
setlocal DisableDelayedExpansion

:: Clean files generated from the previous run
if exist *.nupkg ( del *.nupkg )

Expand All @@ -45,8 +52,8 @@ 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%) else (nuget pack %%f -basepath %releasePath% -properties Version=%version%)
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 not exist %%~nf.%version%.nupkg (
exit /b 1
)
)
)
6 changes: 6 additions & 0 deletions tools/NuGet/GetTargetFramework.vbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Set arguments = WScript.Arguments
Set xmlDoc = CreateObject("Msxml2.DOMDocument")
xmlDoc.load(arguments(0))
Set dotnet = xmlDoc.selectSingleNode("/Project/PropertyGroup/DotNet")
Wscript.Echo dotnet.text
Wscript.Quit
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
Built targeting Windows Net6 with exclusion of test libraries and symbol files. </description>
<copyright>Copyright Autodesk 2023</copyright>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="$TargetFramework$">
</group>
</dependencies>
</metadata>
<!--for now we assume that that the working directory root is dynamo/bin/AnyCPU/Release-->
<files>
<file src="**" target="lib\net6.0" />
<file src="**" target="lib\$TargetFramework$" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<description>This package bundles all symbol files from the Dynamo bin folder.</description>
<copyright>Copyright Autodesk 2023</copyright>
<dependencies>
<group targetFramework="net6.0" />
<group targetFramework="$TargetFramework$" />
</dependencies>
</metadata>
<!--for now we assume that that the working directory root is dynamo/bin/AnyCPU/Release-->
<files>
<file src="*.pdb" target="lib\net6.0" exclude="CefSharp*.pdb;Helix*.pdb;MIConvexHull.NET Standard.pdb;*Test*.pdb;"/>
<file src="nodes\*.pdb" target="lib\net6.0\nodes" />
<file src="*.pdb" target="lib\$TargetFramework$" exclude="CefSharp*.pdb;Helix*.pdb;MIConvexHull.NET Standard.pdb;*Test*.pdb;"/>
<file src="nodes\*.pdb" target="lib\$TargetFramework$\nodes" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
<summary>This package contains all that is required to get up and running creating tests for Dynamo libraries.</summary>
<copyright>Copyright Autodesk 2023</copyright>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="$TargetFramework$">
<dependency id="DynamoVisualProgramming.Core" version="$Version$"/>
</group>
</dependencies>
</metadata>
<files>
<!--These assemblies are referenced from the bin directory since they are not harvested for the installer-->
<file src="..\..\..\bin\AnyCPU\Release\DynamoCoreTests.dll" target="lib\net6.0" />
<file src="..\..\..\bin\AnyCPU\Release\SystemTestServices.dll" target="lib\net6.0" />
<file src="..\..\..\bin\AnyCPU\Release\TestServices.dll" target="lib\net6.0" />
<file src="..\..\..\bin\AnyCPU\Release\DynamoCoreTests.dll" target="lib\$TargetFramework$" />
<file src="..\..\..\bin\AnyCPU\Release\SystemTestServices.dll" target="lib\$TargetFramework$" />
<file src="..\..\..\bin\AnyCPU\Release\TestServices.dll" target="lib\$TargetFramework$" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
38 changes: 19 additions & 19 deletions tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<copyright>Copyright Autodesk 2023</copyright>
<dependencies>
<!--TODO - why do we reference nunit from dynamo core? This is an odd partial collection of dependencies to mark.-->
<group targetFramework="net6.0">
<group targetFramework="$TargetFramework$">
<dependency id="NUnit" version="3.13.3"/>
<dependency id="DynamoVisualProgramming.ZeroTouchLibrary" version="$Version$"/>
<dependency id="Newtonsoft.Json" version="13.0.1"/>
Expand All @@ -36,25 +36,25 @@
</metadata>
<!--for now we assume that that the working directory root is dynamo/bin/AnyCPU/Release-->
<files>
<file src="DynamoApplications.dll" target="lib\net6.0" />
<file src="DynamoApplications.xml" target="lib\net6.0" />
<file src="DynamoCore.dll" target="lib\net6.0" />
<file src="DynamoCore.xml" target="lib\net6.0" />
<file src="DynamoInstallDetective.dll" target="lib\net6.0" />
<file src="DynamoShapeManager.dll" target="lib\net6.0" />
<file src="DynamoShapeManager.xml" target="lib\net6.0" />
<file src="DynamoUtilities.dll" target="lib\net6.0" />
<file src="DynamoUtilities.xml" target="lib\net6.0" />
<file src="ProtoCore.dll" target="lib\net6.0" />
<file src="ProtoCore.xml" target="lib\net6.0" />
<file src="DesignScriptBuiltin.dll" target="lib\net6.0" />
<file src="DesignScriptBuiltin.xml" target="lib\net6.0" />
<file src="VMDataBridge.dll" target="lib\net6.0" />
<file src="VMDataBridge.xml" target="lib\net6.0" />
<file src="DSCPython.dll" target="lib\net6.0" />
<file src="DynamoApplications.dll" target="lib\$TargetFramework$" />
<file src="DynamoApplications.xml" target="lib\$TargetFramework$" />
<file src="DynamoCore.dll" target="lib\$TargetFramework$" />
<file src="DynamoCore.xml" target="lib\$TargetFramework$" />
<file src="DynamoInstallDetective.dll" target="lib\$TargetFramework$" />
<file src="DynamoShapeManager.dll" target="lib\$TargetFramework$" />
<file src="DynamoShapeManager.xml" target="lib\$TargetFramework$" />
<file src="DynamoUtilities.dll" target="lib\$TargetFramework$" />
<file src="DynamoUtilities.xml" target="lib\$TargetFramework$" />
<file src="ProtoCore.dll" target="lib\$TargetFramework$" />
<file src="ProtoCore.xml" target="lib\$TargetFramework$" />
<file src="DesignScriptBuiltin.dll" target="lib\$TargetFramework$" />
<file src="DesignScriptBuiltin.xml" target="lib\$TargetFramework$" />
<file src="VMDataBridge.dll" target="lib\$TargetFramework$" />
<file src="VMDataBridge.xml" target="lib\$TargetFramework$" />
<file src="DSCPython.dll" target="lib\$TargetFramework$" />
<!--TODO - arguable if DynamoPackages should be in this package-->
<file src="DynamoPackages.dll" target="lib\net6.0" />
<file src="DynamoPackages.xml" target="lib\net6.0" />
<file src="DynamoPackages.dll" target="lib\$TargetFramework$" />
<file src="DynamoPackages.xml" target="lib\$TargetFramework$" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@
</description>
<copyright>Copyright Autodesk 2023</copyright>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="$TargetFramework$">
<dependency id="DynamoVisualProgramming.DynamoServices" version="$Version$" />
<dependency id="DynamoVisualProgramming.ZeroTouchLibrary" version="$Version$" />
</group>
</dependencies>
</metadata>
<!--for now we assume that that the working directory root is dynamo/bin/AnyCPU/Release-->
<files>
<file src="Analysis.dll" target="lib\net6.0" />
<file src="Analysis.xml" target="lib\net6.0" />
<file src="GeometryColor.dll" target="lib\net6.0" />
<file src="GeometryColor.xml" target="lib\net6.0" />
<file src="DSCoreNodes.dll" target="lib\net6.0" />
<file src="DSCoreNodes.xml" target="lib\net6.0" />
<file src="nodes\CoreNodeModels.dll" target="lib\net6.0" />
<file src="nodes\CoreNodeModels.xml" target="lib\net6.0" />
<file src="nodes\Watch3DNodeModels.dll" target="lib\net6.0" />
<file src="nodes\Watch3DNodeModels.xml" target="lib\net6.0" />
<file src="nodes\UnitsNodeModels.dll" target="lib\net6.0" />
<file src="nodes\UnitsNodeModels.xml" target="lib\net6.0" />
<file src="Analysis.dll" target="lib\$TargetFramework$" />
<file src="Analysis.xml" target="lib\$TargetFramework$" />
<file src="GeometryColor.dll" target="lib\$TargetFramework$" />
<file src="GeometryColor.xml" target="lib\$TargetFramework$" />
<file src="DSCoreNodes.dll" target="lib\$TargetFramework$" />
<file src="DSCoreNodes.xml" target="lib\$TargetFramework$" />
<file src="nodes\CoreNodeModels.dll" target="lib\$TargetFramework$" />
<file src="nodes\CoreNodeModels.xml" target="lib\$TargetFramework$" />
<file src="nodes\Watch3DNodeModels.dll" target="lib\$TargetFramework$" />
<file src="nodes\Watch3DNodeModels.xml" target="lib\$TargetFramework$" />
<file src="nodes\UnitsNodeModels.dll" target="lib\$TargetFramework$" />
<file src="nodes\UnitsNodeModels.xml" target="lib\$TargetFramework$" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
<summary>This package contains all that is required to get up and running creating tests for Dynamo libraries.</summary>
<copyright>Copyright Autodesk 2023</copyright>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="$TargetFramework$">
<dependency id="DynamoVisualProgramming.Core" version="$Version$"/>
</group>
</dependencies>
</metadata>
<files>
<!--These assemblies are referenced from the bin directory since they are not harvested for the installer-->
<file src="..\..\..\bin\AnyCPU\Release\DynamoCoreTests.dll" target="lib\net6.0" />
<file src="..\..\..\bin\AnyCPU\Release\SystemTestServices.dll" target="lib\net6.0" />
<file src="..\..\..\bin\AnyCPU\Release\TestServices.dll" target="lib\net6.0" />
<file src="..\..\..\bin\AnyCPU\Release\DynamoCoreTests.dll" target="lib\$TargetFramework$" />
<file src="..\..\..\bin\AnyCPU\Release\SystemTestServices.dll" target="lib\$TargetFramework$" />
<file src="..\..\..\bin\AnyCPU\Release\TestServices.dll" target="lib\$TargetFramework$" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
<frameworkAssembly assemblyName="PresentationFramework" targetFramework="net48"/>
</frameworkAssemblies>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="$TargetFramework$">
<dependency id="DynamoVisualProgramming.Core" version="$Version$"/>
<dependency id="DynamoVisualProgramming.DynamoCoreNodes" version="$Version$"/>
</group>
</dependencies>
</metadata>
<!--for now we assume that that the working directory root is dynamo/bin/AnyCPU/Release-->
<files>
<file src="DynamoCoreWpf.dll" target="lib\net6.0" />
<file src="nodes\CoreNodeModelsWpf.dll" target="lib\net6.0" />
<file src="nodes\CoreNodeModelsWpf.xml" target="lib\net6.0" />
<file src="DynamoCoreWpf.dll" target="lib\$TargetFramework$" />
<file src="nodes\CoreNodeModelsWpf.dll" target="lib\$TargetFramework$" />
<file src="nodes\CoreNodeModelsWpf.xml" target="lib\$TargetFramework$" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<summary>This package contains all that is required to get up and running building zero touch libraries for the Dynamo Visual Programming language.</summary>
<copyright>Copyright Autodesk 2023</copyright>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="$TargetFramework$">
<dependency id="DynamoVisualProgramming.DynamoServices" version="$Version$"/>
</group>
</dependencies>
</metadata>
<!--for now we assume that that the working directory root is dynamo/bin/AnyCPU/Release-->
<files>
<file src="DynamoUnits.dll" target="lib\net6.0" />
<file src="DynamoUnits.xml" target="lib\net6.0" />
<file src="ProtoGeometry.dll" target="lib\net6.0" />
<file src="ProtoGeometry.xml" target="lib\net6.0" />
<file src="DynamoUnits.dll" target="lib\$TargetFramework$" />
<file src="DynamoUnits.xml" target="lib\$TargetFramework$" />
<file src="ProtoGeometry.dll" target="lib\$TargetFramework$" />
<file src="ProtoGeometry.xml" target="lib\$TargetFramework$" />

<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
Expand Down

0 comments on commit 8f8e28b

Please sign in to comment.