Merge pull request #7511 from ellensi/NuGet

Separate package upload to NuGet Gallery and Artifactory
DynamoDS · Jan 16, 2017 · 48879cf · 48879cf
2 parents 98a7bc7 + 1252b61
commit 48879cf
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 36 deletions.
diff --git a/tools/NuGet/BuildAndPostPackages.bat b/tools/NuGet/BuildAndPostPackages.bat
diff --git a/tools/NuGet/BuildPackages.bat b/tools/NuGet/BuildPackages.bat
@@ -1,14 +1,17 @@
+:: 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
 )
 
 :: 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/PostArtifactoryPackages.bat 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
@@ -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/...isualProgramming.DynamoCoreRuntime.nuspec → ...isualProgramming.DynamoCoreRuntime.nuspec b/...isualProgramming.DynamoCoreRuntime.nuspec → ...isualProgramming.DynamoCoreRuntime.nuspec
diff --git a/...plate/DynamoVisualProgramming.Core.nuspec → ...nuget/DynamoVisualProgramming.Core.nuspec b/...plate/DynamoVisualProgramming.Core.nuspec → ...nuget/DynamoVisualProgramming.Core.nuspec
@@ -10,12 +10,16 @@
     <iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Unit and system test infrastructure for Dynamo. It contains the following files:
-1) DynamoCore.dll
-2) ProtoCore.dll
-3) DynamoShapeManager.dll 
-4) DynamoUtilities.dll</description>
+1) DSIronPython.dll
+2) DynamoApplications.dll
+3) DynamoCore.dll
+4) DynamoInstallDetective.dll
+5) DynamoShapeManager.dll 
+6) DynamoUtilities.dll
+7) ProtoCore.dll
+8) VMDataBridge.dll</description>
     <summary>This package contains the core assemblies for Dynamo.</summary>
-    <copyright>Copyright Autodesk 2016</copyright>
+    <copyright>Copyright Autodesk 2017</copyright>
     <dependencies>
       <dependency id="Prism" version="4.1"/>
       <dependency id="NUnit" version="2.6.3"/>

diff --git a/...oVisualProgramming.DynamoCoreNodes.nuspec → ...oVisualProgramming.DynamoCoreNodes.nuspec b/...oVisualProgramming.DynamoCoreNodes.nuspec → ...oVisualProgramming.DynamoCoreNodes.nuspec
@@ -10,9 +10,10 @@
     <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) DSCoreNodes.dll
-2) Display.dll</description>
-    <copyright>Copyright Autodesk 2016</copyright>
+1) Analysis.dll
+2) Display.dll
+3) DSCoreNodes.dll</description>
+    <copyright>Copyright Autodesk 2017</copyright>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
         <dependency id="DynamoVisualProgramming.DynamoServices" version="@VERSION@" />

diff --git a/...moVisualProgramming.DynamoServices.nuspec → ...moVisualProgramming.DynamoServices.nuspec b/...moVisualProgramming.DynamoServices.nuspec → ...moVisualProgramming.DynamoServices.nuspec
@@ -12,7 +12,7 @@
     <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 2016</copyright>
+    <copyright>Copyright Autodesk 2017</copyright>
     <dependencies>
     </dependencies>
   </metadata>

diff --git a/...late/DynamoVisualProgramming.Tests.nuspec → ...uget/DynamoVisualProgramming.Tests.nuspec b/...late/DynamoVisualProgramming.Tests.nuspec → ...uget/DynamoVisualProgramming.Tests.nuspec
@@ -10,10 +10,11 @@
     <iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Unit and system test infrastructure for Dynamo. It contains the following files:
-1) TestServices.dll 
-2) SystemTestServices.dll</description>
+1) DynamoCoreTests.dll
+2) SystemTestServices.dll
+3) TestServices.dll</description>
     <summary>This package contains all that is required to get up and running creating tests for Dynamo libraries.</summary>
-    <copyright>Copyright Autodesk 2016</copyright>
+    <copyright>Copyright Autodesk 2017</copyright>
     <dependencies>
       <dependency id="DynamoVisualProgramming.Core" version="@VERSION@"/>
     </dependencies>

diff --git a/...namoVisualProgramming.WpfUILibrary.nuspec → ...namoVisualProgramming.WpfUILibrary.nuspec b/...namoVisualProgramming.WpfUILibrary.nuspec → ...namoVisualProgramming.WpfUILibrary.nuspec
@@ -14,7 +14,7 @@
 2) CoreNodeModels.dll
 3) CoreNodeModelsWpf.dll</description>
     <summary>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.</summary>
-    <copyright>Copyright Autodesk 2016</copyright>
+    <copyright>Copyright Autodesk 2017</copyright>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Xaml"/>
       <frameworkAssembly assemblyName="WindowsBase"/>

diff --git a/...VisualProgramming.ZeroTouchLibrary.nuspec → ...VisualProgramming.ZeroTouchLibrary.nuspec b/...VisualProgramming.ZeroTouchLibrary.nuspec → ...VisualProgramming.ZeroTouchLibrary.nuspec
@@ -10,10 +10,10 @@
     <iconUrl>https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/logo_square_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Build zero touch node libraries for Dynamo. It contains the following files:
-1) ProtoGeometry.dll
-2) DynamoUnits.dll</description>
+1) DynamoUnits.dll
+2) ProtoGeometry.dll</description>
     <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 2016</copyright>
+    <copyright>Copyright Autodesk 2017</copyright>
   <dependencies>
     <dependency id="DynamoVisualProgramming.DynamoServices" version="@VERSION@"/>
   </dependencies>