Merge branch 'release/1.1.0'

awright18 · Apr 1, 2017 · bcf448d · bcf448d
2 parents be5bac3 + 0563032
commit bcf448d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/build.fsx b/build.fsx
@@ -40,14 +40,19 @@ let nuspec = sprintf "%s.nuspec" projectName
 let projectFileName = sprintf "./source/%s/%s.csproj" projectName projectName
 let artifactsDir = "artifacts"
 let projectGuid = "E8C6B039-E310-41FE-9B83-1E163739CD9A"
-let copyright =  "2016"
+let copyright = DateTime.Now.Year.ToString()
 
+//publish parameters
+let nugetApiKey = getBuildParamOrDefault "apikey" ""
+let publishUrl = getBuildParamOrDefault "packageUrl" ""
+let publish = nugetApiKey <> "" && publishUrl <> ""
+
+//version info
 let mutable assemblyVersion = ""
 let mutable nugetVersion = ""
 let mutable informationalVersion = ""
 let mutable majorMinorVersion = ""
 
-
 //Targets 
 Target "Clean" (fun _ -> 
     CleanDirs [artifactsDir]
@@ -136,6 +141,9 @@ Target "CreatePackage" (fun _ ->
               Copyright = copyright
               OutputPath = nugetOutputDir
               WorkingDir = "."
+              PublishUrl = publishUrl
+              AccessKey = nugetApiKey
+              Publish = publish
          }) 
          "AWright18.PipeTo.nuspec"
 )

diff --git a/ci_build.bat b/ci_build.bat
@@ -8,5 +8,5 @@ if errorlevel 1 (
   exit /b %errorlevel%
 )
 
-"packages\FAKE\tools\Fake.exe" build.fsx target="CreatePackage"
+"packages\FAKE\tools\Fake.exe" build.fsx target="CreatePackage" apikey=%apikey% packageUrl=%packageUrl%
 pause