Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to nuspec files to work with 4.8 .Net Framework #10732

Merged
merged 7 commits into from
Jun 8, 2020
Merged

Changes to nuspec files to work with 4.8 .Net Framework #10732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea5af46
Merge pull request #2 from DynamoDS/master
alfredo-pozo Apr 16, 2020
43aa0a0
Merge pull request #4 from DynamoDS/master
alfredo-pozo Apr 24, 2020
3e3af00
Merge pull request #5 from DynamoDS/master
alfredo-pozo May 13, 2020
d6374cd
Merge pull request #6 from DynamoDS/master
alfredo-pozo May 15, 2020
f2c7269
Update forked master branch
alfredo-pozo Jun 3, 2020
bdebbbc
Changes to the nuspec files to work with .Net 4.8 and remove of depre…
alfredo-pozo Jun 3, 2020
b0a27a9
Changes to the copyright text
alfredo-pozo Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreRuntime.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>DynamoVisualProgramming.DynamoCoreRuntime</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles all files from the Dynamo bin folder except for test libraries and symbol files.</description>
<copyright>Copyright Autodesk 2019</copyright>
</metadata>
<files>
<file src="**" target="lib\net47" />
</files>
<metadata>
<id>DynamoVisualProgramming.DynamoCoreRuntime</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<icon>content\images\logo.png</icon>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles all files from the Dynamo bin folder except for test libraries and symbol files.</description>
<copyright>Copyright Autodesk 2020</copyright>
<dependencies>
<group targetFramework=".NETFramework4.8" />
</dependencies>
</metadata>
<files>
<file src="**" target="lib\net48" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
36 changes: 20 additions & 16 deletions tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreSymbols.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>DynamoVisualProgramming.DynamoCoreSymbols</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles all symbol files from the Dynamo bin folder.</description>
<copyright>Copyright Autodesk 2019</copyright>
</metadata>
<files>
<file src="*.pdb" target="lib\net47" exclude="CefSharp*.pdb;Helix*.pdb;MIConvexHull.NET Standard.pdb;*Test*.pdb;"/>
<file src="nodes\*.pdb" target="lib\net47\nodes" />
</files>
<metadata>
<id>DynamoVisualProgramming.DynamoCoreSymbols</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<icon>content\images\logo.png</icon>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles all symbol files from the Dynamo bin folder.</description>
<copyright>Copyright Autodesk 2020</copyright>
<dependencies>
<group targetFramework=".NETFramework4.8" />
</dependencies>
</metadata>
<files>
<file src="*.pdb" target="lib\net48" exclude="CefSharp*.pdb;Helix*.pdb;MIConvexHull.NET Standard.pdb;*Test*.pdb;"/>
<file src="nodes\*.pdb" target="lib\net48\nodes" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
42 changes: 23 additions & 19 deletions tools/NuGet/template-artifactory/DynamoVisualProgramming.SignDynamo.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>DynamoVisualProgramming.SignDynamo</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles executables to generate sig file for Dynamo installers.</description>
<copyright>Copyright Autodesk 2019</copyright>
</metadata>
<files>
<!--These assemblies are referenced from the bin directory since they are not harvested for the installer-->
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\Dynamo.cer" target="lib\net47" />
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\DynamoCrypto.dll" target="lib\net47" />
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\NDesk.Options.dll" target="lib\net47" />
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\SignDynamo.exe" target="lib\net47" />
</files>
<metadata>
<id>DynamoVisualProgramming.SignDynamo</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<icon>content\images\logo.png</icon>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles executables to generate sig file for Dynamo installers.</description>
<copyright>Copyright Autodesk 2020</copyright>
<dependencies>
<group targetFramework=".NETFramework4.8" />
</dependencies>
</metadata>
<files>
<!--These assemblies are referenced from the bin directory since they are not harvested for the installer-->
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\Dynamo.cer" target="lib\net48" />
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\DynamoCrypto.dll" target="lib\net48" />
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\NDesk.Options.dll" target="lib\net48" />
<file src="..\..\..\src\Tools\SignDynamo\bin\Release\SignDynamo.exe" target="lib\net48" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
83 changes: 43 additions & 40 deletions tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,46 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>DynamoVisualProgramming.Core</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Assemblies required to start a DynamoModel and execute DesignScript code. Contains the following files:
1) DSIronPython.dll
2) DynamoApplications.dll
3) DynamoCore.dll
4) DynamoInstallDetective.dll
5) DynamoShapeManager.dll
6) DynamoUtilities.dll
7) ProtoCore.dll
8) DesignScriptBuiltin.dll
9) VMDataBridge.dll</description>
<summary>This package contains the core assemblies for Dynamo.</summary>
<copyright>Copyright Autodesk 2019</copyright>
<dependencies>
<dependency id="Prism" version="4.1"/>
<dependency id="NUnit" version="2.6.3"/>
<dependency id="DynamoVisualProgramming.ZeroTouchLibrary" version="$Version$"/>
<dependency id="Newtonsoft.Json" version="8.0.3"/>
</dependencies>
</metadata>
<files>
<file src="DSIronPython.dll" target="lib\net47" />
<file src="DynamoApplications.dll" target="lib\net47" />
<file src="DynamoCore.dll" target="lib\net47" />
<file src="DynamoCore.xml" target="build\net47" />
<file src="DynamoInstallDetective.dll" target="lib\net47" />
<file src="DynamoShapeManager.dll" target="lib\net47" />
<file src="DynamoUtilities.dll" target="lib\net47" />
<file src="ProtoCore.dll" target="lib\net47" />
<file src="DesignScriptBuiltin.dll" target="lib\net47" />
<file src="VMDataBridge.dll" target="lib\net47" />
</files>
<metadata>
<id>DynamoVisualProgramming.Core</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<icon>content\images\logo.png</icon>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Assemblies required to start a DynamoModel and execute DesignScript code. Contains the following files:
1) DSIronPython.dll
2) DynamoApplications.dll
3) DynamoCore.dll
4) DynamoInstallDetective.dll
5) DynamoShapeManager.dll
6) DynamoUtilities.dll
7) ProtoCore.dll
8) DesignScriptBuiltin.dll
9) VMDataBridge.dll</description>
<summary>This package contains the core assemblies for Dynamo.</summary>
<copyright>Copyright Autodesk 2020</copyright>
<dependencies>
<group targetFramework=".NETFramework4.8">
<dependency id="Prism" version="4.1"/>
<dependency id="NUnit" version="2.6.3"/>
<dependency id="DynamoVisualProgramming.ZeroTouchLibrary" version="$Version$"/>
<dependency id="Newtonsoft.Json" version="8.0.3"/>
</group>
</dependencies>
</metadata>
<files>
<file src="DSIronPython.dll" target="lib\net48" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mjkkirschner Do you recall why we include IronPython in nuget? Do we need to include CPython now?

<file src="DynamoApplications.dll" target="lib\net48" />
<file src="DynamoCore.dll" target="lib\net48" />
<file src="DynamoCore.xml" target="build\net48" />
<file src="DynamoInstallDetective.dll" target="lib\net48" />
<file src="DynamoShapeManager.dll" target="lib\net48" />
<file src="DynamoUtilities.dll" target="lib\net48" />
<file src="ProtoCore.dll" target="lib\net48" />
<file src="DesignScriptBuiltin.dll" target="lib\net48" />
<file src="VMDataBridge.dll" target="lib\net48" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
59 changes: 30 additions & 29 deletions tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>DynamoVisualProgramming.DynamoCoreNodes</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Build core nodes for Dynamo. It contains the following files:
1) Analysis.dll
2) GeometryColor.dll
3) DSCoreNodes.dll</description>
<copyright>Copyright Autodesk 2019</copyright>
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="DynamoVisualProgramming.DynamoServices" version="$Version$" />
<dependency id="DynamoVisualProgramming.ZeroTouchLibrary" version="$Version$" />
</group>
</dependencies>
</metadata>
<files>
<file src="Analysis.dll" target="lib\net47" />
<file src="Analysis.xml" target="build\net47" />
<file src="GeometryColor.dll" target="lib\net47" />
<file src="GeometryColor.xml" target="build\net47" />
<file src="DSCoreNodes.dll" target="lib\net47" />
<file src="DSCoreNodes.xml" target="build\net47" />
</files>
<metadata>
<id>DynamoVisualProgramming.DynamoCoreNodes</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<icon>content\images\logo.png</icon>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Build core nodes for Dynamo. It contains the following files:
1) Analysis.dll
2) GeometryColor.dll
3) DSCoreNodes.dll</description>
<copyright>Copyright Autodesk 2020</copyright>
<dependencies>
<group targetFramework=".NETFramework4.8">
<dependency id="DynamoVisualProgramming.DynamoServices" version="$Version$" />
<dependency id="DynamoVisualProgramming.ZeroTouchLibrary" version="$Version$" />
</group>
</dependencies>
</metadata>
<files>
<file src="Analysis.dll" target="lib\net48" />
<file src="Analysis.xml" target="build\net48" />
<file src="GeometryColor.dll" target="lib\net48" />
<file src="GeometryColor.xml" target="build\net48" />
<file src="DSCoreNodes.dll" target="lib\net48" />
<file src="DSCoreNodes.xml" target="build\net48" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
33 changes: 17 additions & 16 deletions tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoSamples.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>DynamoVisualProgramming.DynamoSamples</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles all localized Sample files from the Dynamo bin Release folder.</description>
<copyright>Copyright Autodesk 2019</copyright>
</metadata>
<files>
<file src="..\..\..\bin\AnyCPU\Release\samples\**" target="Samples" />
<file src="..\..\..\bin\AnyCPU\Release\gallery\**" target="gallery" />
</files>
<metadata>
<id>DynamoVisualProgramming.DynamoSamples</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<icon>content\images\logo.png</icon>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package bundles all localized Sample files from the Dynamo bin Release folder.</description>
<copyright>Copyright Autodesk 2020</copyright>
</metadata>
<files>
<file src="..\..\..\bin\AnyCPU\Release\samples\**" target="Samples" />
<file src="..\..\..\bin\AnyCPU\Release\gallery\**" target="gallery" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
42 changes: 22 additions & 20 deletions tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoServices.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>DynamoVisualProgramming.DynamoServices</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>DynamoServices library for Dynamo. It contains the following files:
1) DynamoServices.dll</description>
<summary>This package contains DynamoServices assembly that defines interfaces and attribute for Dynamo Zero Touch libraries.</summary>
<copyright>Copyright Autodesk 2019</copyright>
<dependencies>
</dependencies>
</metadata>
<files>
<file src="DynamoServices.dll" target="lib\net47" />
<file src="DynamoServices.xml" target="build\net47" />
</files>
<metadata>
<id>DynamoVisualProgramming.DynamoServices</id>
<version>$Version$</version>
<authors>Autodesk</authors>
<owners>Autodesk</owners>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/DynamoDS/Dynamo</projectUrl>
<icon>content\images\logo.png</icon>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>DynamoServices library for Dynamo. It contains the following files:
1) DynamoServices.dll</description>
<summary>This package contains DynamoServices assembly that defines interfaces and attribute for Dynamo Zero Touch libraries.</summary>
<copyright>Copyright Autodesk 2020</copyright>
<dependencies>
<group targetFramework=".NETFramework4.8" />
</dependencies>
</metadata>
<files>
<file src="DynamoServices.dll" target="lib\net48" />
<file src="DynamoServices.xml" target="build\net48" />
<file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
</files>
</package>
Loading