Skip to content

Commit e32907d

Browse files
committed
Clean up Release script
Remove superfluous version patching for project.json - already done in Versioning.fsx
1 parent c4ac208 commit e32907d

File tree

1 file changed

+3
-37
lines changed

1 file changed

+3
-37
lines changed

build/scripts/Releasing.fsx

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#I @"../../packages/build/FAKE/tools"
2-
#I @"../../packages/build/FSharp.Data/lib/net40"
32
#r @"FakeLib.dll"
4-
#r @"FSharp.Data.dll"
53
#load @"Paths.fsx"
64
#load @"Projects.fsx"
75
#load @"Versioning.fsx"
@@ -15,9 +13,6 @@ open Versioning
1513
open Building
1614
open FSharp.Data
1715

18-
// TODO: Use a complete project.json skeleton
19-
type ProjectJson = JsonProvider<"../../src/Nest/project.json">
20-
2116
type Release() =
2217
static let nugetPack = fun (projectName: ProjectName) ->
2318
let name = projectName.Nuget;
@@ -40,36 +35,6 @@ type Release() =
4035
traceFAKE "%s" dir
4136
MoveFile Paths.NugetOutput nugetOutFile
4237

43-
static let updateVersion project =
44-
CreateDir Paths.NugetOutput
45-
use file = File.Open (project, FileMode.Open)
46-
let doc = ProjectJson.Load file
47-
48-
let newDoc = ProjectJson.Root(
49-
doc.Authors,
50-
doc.Owners,
51-
doc.ProjectUrl,
52-
doc.LicenseUrl,
53-
doc.RequireLicenseAcceptance,
54-
doc.IconUrl,
55-
doc.Summary,
56-
doc.Description,
57-
doc.Title,
58-
doc.Tags,
59-
doc.Repository,
60-
doc.Copyright,
61-
Versioning.FileVersion,
62-
doc.CompilationOptions,
63-
doc.Configurations,
64-
doc.Dependencies,
65-
doc.Commands,
66-
doc.Frameworks)
67-
68-
file.Close ()
69-
File.Delete project
70-
use writer = new StreamWriter(File.Open (project, FileMode.Create))
71-
newDoc.JsonValue.WriteTo(writer, JsonSaveOptions.None)
72-
7338
static member PackAll() =
7439
DotNetProject.All
7540
|> Seq.map (fun p -> p.ProjectName)
@@ -80,7 +45,7 @@ type Release() =
8045
++ "src/Elasticsearch.Net/project.json"
8146

8247
// update versions
83-
projects |> Seq.iter updateVersion
48+
Versioning.PatchProjectJsons()
8449

8550
// build nuget packages
8651
projects
@@ -117,7 +82,6 @@ type Release() =
11782
System.Text.Encoding.UTF8
11883
nuspec
11984

120-
12185
// Include PDB for each target framework
12286
let frameworkDirs = (sprintf "%s/lib" unzippedDir |> directoryInfo).GetDirectories()
12387
for frameworkDir in frameworkDirs do
@@ -132,6 +96,8 @@ type Release() =
13296
ZipHelper.Zip unzippedDir package !!(sprintf "%s/**/*.*" unzippedDir)
13397
DeleteDir unzippedDir
13498

99+
if (directoryExists Paths.NugetOutput = false) then CreateDir Paths.NugetOutput
100+
135101
// move to nuget output
136102
MoveFile Paths.NugetOutput package
137103
)

0 commit comments

Comments
 (0)