Skip to content

Commit 0637331

Browse files
committed
Merge pull request #6 from Danthar/dev
Update build.fsx
2 parents 14a05ab + 93258db commit 0637331

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

build.fsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cd __SOURCE_DIRECTORY__
1919

2020
let product = "Akka.NET"
2121
let authors = [ "Akka.NET Team" ]
22-
let copyright = "Copyright © 2013-2016 Akka.NET Team"
22+
let copyright = "Copyright © 2013-2016 Akka.NET Team"
2323
let company = "Akka.NET Team"
2424
let description = "Akka.NET is a port of the popular Java/Scala framework Akka to .NET"
2525
let tags = ["akka";"actors";"actor";"model";"Akka";"concurrency"]
@@ -162,12 +162,17 @@ let createNugetPackages _ =
162162
DeleteDir dir
163163
not (directoryExists dir)
164164
runWithRetries del 3 |> ignore
165-
165+
166+
let cleanupDir dir =
167+
let cdr _ =
168+
CleanDir dir
169+
runWithRetries cdr 3 |> ignore
170+
166171
ensureDirectory nugetDir
167172
for nuspec in !! "src/**/*.nuspec" do
168173
printfn "Creating nuget packages for %s" nuspec
169174

170-
CleanDir workingDir
175+
cleanupDir workingDir
171176

172177
let project = Path.GetFileNameWithoutExtension nuspec
173178
let projectDir = Path.GetDirectoryName nuspec
@@ -215,12 +220,11 @@ let createNugetPackages _ =
215220
//Remove workingDir/src/obj and workingDir/src/bin
216221
removeDir (nugetSrcDir @@ "obj")
217222
removeDir (nugetSrcDir @@ "bin")
218-
223+
219224
// Create both normal nuget package and symbols nuget package.
220225
// Uses the files we copied to workingDir and outputs to nugetdir
221226
pack nugetDir NugetSymbolPackage.Nuspec
222227

223-
removeDir workingDir
224228

225229
let publishNugetPackages _ =
226230
let rec publishPackage url accessKey trialsLeft packageFile =
@@ -346,10 +350,9 @@ Target "HelpNuget" <| fun _ ->
346350

347351
// nuget dependencies
348352
"CleanNuget" ==> "CreateNuget"
349-
"CleanNuget" ==> "BuildRelease" ==> "Nuget"
353+
"CreateNuget" ==> "BuildRelease"
350354

351355
Target "All" DoNothing
352356
"BuildRelease" ==> "All"
353-
"Nuget" ==> "All"
354357

355-
RunTargetOrDefault "Help"
358+
RunTargetOrDefault "Help"

src/SharedAssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Reflection;
33

44
[assembly: AssemblyCompanyAttribute("Akka.NET Team")]
5-
[assembly: AssemblyCopyrightAttribute("Copyright 2013-2016 Akka.NET Team")]
5+
[assembly: AssemblyCopyrightAttribute("Copyright © 2013-2016 Akka.NET Team")]
66
[assembly: AssemblyTrademarkAttribute("")]
77
[assembly: AssemblyVersionAttribute("1.0.7.0")]
88
[assembly: AssemblyFileVersionAttribute("1.0.7.0")]

0 commit comments

Comments
 (0)