diff --git a/tools/NuGet/BuildAndPostPackages.bat b/tools/NuGet/BuildAndPostPackages.bat deleted file mode 100644 index 5a3fa28b85a..00000000000 --- a/tools/NuGet/BuildAndPostPackages.bat +++ /dev/null @@ -1,14 +0,0 @@ -call .\BuildPackages.bat - -SET Artifactory=https://art-bobcat.autodesk.com/artifactory/api/nuget/team-dynamo-nuget - -:: Push these packages to www.nuget.org -nuget push DynamoVisualProgramming.Core.*.nupkg -apikey %1 -nuget push DynamoVisualProgramming.DynamoCoreNodes.*.nupkg -apikey %1 -nuget push DynamoVisualProgramming.DynamoServices.*.nupkg -apikey %1 -nuget push DynamoVisualProgramming.Tests.*.nupkg -apikey %1 -nuget push DynamoVisualProgramming.WpfUILibrary.*.nupkg -apikey %1 -nuget push DynamoVisualProgramming.ZeroTouchLibrary.*.nupkg -apikey %1 - -:: Push Runtime package to Artifactory -nuget push DynamoVisualProgramming.DynamoCoreRuntime.*.nupkg -source %Artifactory% -apikey %2 diff --git a/tools/NuGet/BuildPackages.bat b/tools/NuGet/BuildPackages.bat index e48625ca48b..f7685603e60 100644 --- a/tools/NuGet/BuildPackages.bat +++ b/tools/NuGet/BuildPackages.bat @@ -1,6 +1,9 @@ +:: Argument %1: path to template folder +:: + @echo off -SET base=..\..\src\DynamoInstall\harvest -if not exist %base% ( +set harvestPath=..\..\src\DynamoInstall\harvest +if not exist %harvestPath% ( echo Dynamo\src\DynamoInstall\harvest folder not found. echo Please build Dynamo\src\Install.sln before running this script! exit /b 1 @@ -8,7 +11,7 @@ if not exist %base% ( :: Get version string from "DynamoCore.dll" set count=1 -for /f %%f in ('cscript //Nologo ..\install\GetFileVersion.vbs %base%\DynamoCore.dll') do ( +for /f %%f in ('cscript //Nologo ..\install\GetFileVersion.vbs %harvestPath%\DynamoCore.dll') do ( setlocal EnableDelayedExpansion if !count!==1 set Major=%%f if !count!==2 set Minor=%%f @@ -24,9 +27,9 @@ del *.nupkg if exist nuspec ( rmdir /s /q nuspec ) mkdir nuspec -:: Copy .nuspec files from "template" folder to "nuspec" folder +:: Copy .nuspec files from template folder to "nuspec" folder :: and replace the string "@VERSION@" with the correct value -for %%f in (template\*.nuspec) do ( +for %%f in (%1\*.nuspec) do ( for /f "tokens=* delims=ΒΆ" %%i in ( '"type %%f"') do ( set line=%%i setlocal EnableDelayedExpansion @@ -39,5 +42,5 @@ for %%f in (template\*.nuspec) do ( :: Pack .nupkg files based on each .nuspec in the "nuspec" folder @echo on for %%f in (nuspec\*.nuspec) do ( - nuget pack %%f -basepath %base% + nuget pack %%f -basepath %harvestPath% ) diff --git a/tools/NuGet/DynamoVisualProgramming.Core/Core.nuspec b/tools/NuGet/DynamoVisualProgramming.Core/Core.nuspec deleted file mode 100644 index 1279057f5d7..00000000000 --- a/tools/NuGet/DynamoVisualProgramming.Core/Core.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - DynamoVisualProgramming.Core - 1.2.0 - Autodesk - Autodesk - http://opensource.org/licenses/MIT - https://github.com/DynamoDS/Dynamo - false - Unit and system test infrastructure for Dynamo. It contains the following files: - 1)DynamoCore.dll - 2)ProtoCore.dll - 3)DynamoShapeManager.dll - 4)DynamoUtilities.dll - - This package contains the core assemblies for Dynamo. - Copyright Autodesk 2016 - https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png - - - - - - - \ No newline at end of file diff --git a/tools/NuGet/DynamoVisualProgramming.DynamoServices/DynamoServices.nuspec b/tools/NuGet/DynamoVisualProgramming.DynamoServices/DynamoServices.nuspec deleted file mode 100644 index a42cefeb842..00000000000 --- a/tools/NuGet/DynamoVisualProgramming.DynamoServices/DynamoServices.nuspec +++ /dev/null @@ -1,20 +0,0 @@ - - - - DynamoVisualProgramming.DynamoServices - 1.2.0 - Autodesk - Autodesk - http://opensource.org/licenses/MIT - https://github.com/DynamoDS/Dynamo - false - DynamoServices library for Dynamo.It contains the following files: - 1)DynamoServices.dll - - This package contains DynamoServices assembly that defines interfaces and attribute for Dynamo Zero Touch libraries. - Copyright Autodesk 2016 - https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png - - - - \ No newline at end of file diff --git a/tools/NuGet/DynamoVisualProgramming.Tests/Tests.nuspec b/tools/NuGet/DynamoVisualProgramming.Tests/Tests.nuspec deleted file mode 100644 index fd7e7e70685..00000000000 --- a/tools/NuGet/DynamoVisualProgramming.Tests/Tests.nuspec +++ /dev/null @@ -1,22 +0,0 @@ - - - - DynamoVisualProgramming.Tests - 1.2.0 - Autodesk - Autodesk - http://opensource.org/licenses/MIT - https://github.com/DynamoDS/Dynamo - false - Unit and system test infrastructure for Dynamo. It contains the following files: - 1)TestServices.dll - 2)SystemTestServices.dll - - This package contains all that is required to get up and running creating tests for Dynamo libraries. - Copyright Autodesk 2016 - https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png - - - - - \ No newline at end of file diff --git a/tools/NuGet/DynamoVisualProgramming.WpfUILibrary/WpfUILibrary.nuspec b/tools/NuGet/DynamoVisualProgramming.WpfUILibrary/WpfUILibrary.nuspec deleted file mode 100644 index a7d3229c774..00000000000 --- a/tools/NuGet/DynamoVisualProgramming.WpfUILibrary/WpfUILibrary.nuspec +++ /dev/null @@ -1,29 +0,0 @@ - - - - DynamoVisualProgramming.WpfUILibrary - 1.2.0 - Autodesk - Autodesk - http://opensource.org/licenses/MIT - https://github.com/DynamoDS/Dynamo - false - Build node libraries for Dynamo with custom UI in WPF. It contains the following files: - 1)DynamoCoreWpf.dll - 2)CoreNodeModels.dll - 3)CoreNodeModelsWpf.dll - - This package contains all that is required to get up and running building nodes for the Dynamo Visual Programming language with custom UI in WPF. - Copyright Autodesk 2016 - https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png - - - - - - - - - - - \ No newline at end of file diff --git a/tools/NuGet/DynamoVisualProgramming.ZeroTouchLibrary/ZeroTouchLibrary.nuspec b/tools/NuGet/DynamoVisualProgramming.ZeroTouchLibrary/ZeroTouchLibrary.nuspec deleted file mode 100644 index a70846b463a..00000000000 --- a/tools/NuGet/DynamoVisualProgramming.ZeroTouchLibrary/ZeroTouchLibrary.nuspec +++ /dev/null @@ -1,22 +0,0 @@ - - - - DynamoVisualProgramming.ZeroTouchLibrary - 1.2.0 - Autodesk - Autodesk - http://opensource.org/licenses/MIT - https://github.com/DynamoDS/Dynamo - false - Build zero touch node libraries for Dynamo. It contains the following files: - 1)ProtoGeometry.dll - 2)DynamoUnits.dll - - This package contains all that is required to get up and running building zero touch libraries for the Dynamo Visual Programming language. - Copyright Autodesk 2016 - https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png - - - - - \ No newline at end of file diff --git a/tools/NuGet/PostArtifactoryPackages.bat b/tools/NuGet/PostArtifactoryPackages.bat new file mode 100644 index 00000000000..7d54bd7bf79 --- /dev/null +++ b/tools/NuGet/PostArtifactoryPackages.bat @@ -0,0 +1,7 @@ +call .\BuildPackages.bat "template-artifactory" + +set Artifactory=https://art-bobcat.autodesk.com/artifactory/api/nuget/team-dynamo-nuget + +:: Use credentials in config file for pushing package to Artifactory +set configPath=%~dp0..\..\dynamo-nuget.config +nuget push *.nupkg -source %Artifactory% -configfile %configPath% diff --git a/tools/NuGet/PostNugetPackages.bat b/tools/NuGet/PostNugetPackages.bat new file mode 100644 index 00000000000..49947b2eb15 --- /dev/null +++ b/tools/NuGet/PostNugetPackages.bat @@ -0,0 +1,7 @@ +:: Argument %1: API key to upload packages to www.nuget.org +:: + +call .\BuildPackages.bat "template-nuget" + +:: Push these packages to www.nuget.org +nuget push *.nupkg -apikey %1 diff --git a/tools/NuGet/template/DynamoVisualProgramming.DynamoCoreRuntime.nuspec b/tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreRuntime.nuspec similarity index 100% rename from tools/NuGet/template/DynamoVisualProgramming.DynamoCoreRuntime.nuspec rename to tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreRuntime.nuspec diff --git a/tools/NuGet/template/DynamoVisualProgramming.Core.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec similarity index 86% rename from tools/NuGet/template/DynamoVisualProgramming.Core.nuspec rename to tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec index 50d2e32ccf8..28bb2e4b7f8 100644 --- a/tools/NuGet/template/DynamoVisualProgramming.Core.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec @@ -10,12 +10,16 @@ https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png false Unit and system test infrastructure for Dynamo. It contains the following files: -1) DynamoCore.dll -2) ProtoCore.dll -3) DynamoShapeManager.dll -4) DynamoUtilities.dll +1) DSIronPython.dll +2) DynamoApplications.dll +3) DynamoCore.dll +4) DynamoInstallDetective.dll +5) DynamoShapeManager.dll +6) DynamoUtilities.dll +7) ProtoCore.dll +8) VMDataBridge.dll This package contains the core assemblies for Dynamo. - Copyright Autodesk 2016 + Copyright Autodesk 2017 diff --git a/tools/NuGet/template/DynamoVisualProgramming.DynamoCoreNodes.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec similarity index 91% rename from tools/NuGet/template/DynamoVisualProgramming.DynamoCoreNodes.nuspec rename to tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec index f1c2354f8ef..ad9ce809660 100644 --- a/tools/NuGet/template/DynamoVisualProgramming.DynamoCoreNodes.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec @@ -10,9 +10,10 @@ https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png false Build core nodes for Dynamo. It contains the following files: -1) DSCoreNodes.dll -2) Display.dll - Copyright Autodesk 2016 +1) Analysis.dll +2) Display.dll +3) DSCoreNodes.dll + Copyright Autodesk 2017 diff --git a/tools/NuGet/template/DynamoVisualProgramming.DynamoServices.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoServices.nuspec similarity index 95% rename from tools/NuGet/template/DynamoVisualProgramming.DynamoServices.nuspec rename to tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoServices.nuspec index 8930a208e13..9c3d63b82ba 100644 --- a/tools/NuGet/template/DynamoVisualProgramming.DynamoServices.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoServices.nuspec @@ -12,7 +12,7 @@ DynamoServices library for Dynamo. It contains the following files: 1) DynamoServices.dll This package contains DynamoServices assembly that defines interfaces and attribute for Dynamo Zero Touch libraries. - Copyright Autodesk 2016 + Copyright Autodesk 2017 diff --git a/tools/NuGet/template/DynamoVisualProgramming.Tests.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec similarity index 90% rename from tools/NuGet/template/DynamoVisualProgramming.Tests.nuspec rename to tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec index 2d92aef5dfe..5efe45c8ed2 100644 --- a/tools/NuGet/template/DynamoVisualProgramming.Tests.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec @@ -10,10 +10,11 @@ https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png false Unit and system test infrastructure for Dynamo. It contains the following files: -1) TestServices.dll -2) SystemTestServices.dll +1) DynamoCoreTests.dll +2) SystemTestServices.dll +3) TestServices.dll This package contains all that is required to get up and running creating tests for Dynamo libraries. - Copyright Autodesk 2016 + Copyright Autodesk 2017 diff --git a/tools/NuGet/template/DynamoVisualProgramming.WpfUILibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec similarity index 96% rename from tools/NuGet/template/DynamoVisualProgramming.WpfUILibrary.nuspec rename to tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec index 550fdd1645d..6260e244029 100644 --- a/tools/NuGet/template/DynamoVisualProgramming.WpfUILibrary.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec @@ -14,7 +14,7 @@ 2) CoreNodeModels.dll 3) CoreNodeModelsWpf.dll This package contains all that is required to get up and running building nodes for the Dynamo Visual Programming language with custom UI in WPF. - Copyright Autodesk 2016 + Copyright Autodesk 2017 diff --git a/tools/NuGet/template/DynamoVisualProgramming.ZeroTouchLibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec similarity index 91% rename from tools/NuGet/template/DynamoVisualProgramming.ZeroTouchLibrary.nuspec rename to tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec index ab2035f3de9..66d8d77d666 100644 --- a/tools/NuGet/template/DynamoVisualProgramming.ZeroTouchLibrary.nuspec +++ b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec @@ -10,10 +10,10 @@ https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png false Build zero touch node libraries for Dynamo. It contains the following files: -1) ProtoGeometry.dll -2) DynamoUnits.dll +1) DynamoUnits.dll +2) ProtoGeometry.dll This package contains all that is required to get up and running building zero touch libraries for the Dynamo Visual Programming language. - Copyright Autodesk 2016 + Copyright Autodesk 2017