Skip to content

Commit 5b5ba46

Browse files
committed
Merge branch 'master' of github.com:elastic/elasticsearch-net
2 parents 1897c61 + 1659df8 commit 5b5ba46

File tree

31 files changed

+3700
-100
lines changed

31 files changed

+3700
-100
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ YamlCache
6666

6767
*.DS_Store
6868
*.sln.ide
69+
70+
launchSettings.json

build/scripts/Releasing.fsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,15 @@ type Release() =
122122
let frameworkDirs = (sprintf "%s/lib" unzippedDir |> directoryInfo).GetDirectories()
123123
for frameworkDir in frameworkDirs do
124124
let frameworkPdbDir = sprintf "%s/%s" srcFolder frameworkDir.Name
125-
gitLink frameworkPdbDir
125+
gitLink frameworkPdbDir projectName
126126
let pdb = sprintf "%s.pdb" projectName
127127
let frameworkPdbFile = sprintf "%s/%s" frameworkPdbDir pdb
128128
if fileExists frameworkPdbFile
129129
then CopyFile (sprintf "%s/%s" frameworkDir.FullName pdb) frameworkPdbFile
130130

131131
// re-zip package
132132
ZipHelper.Zip unzippedDir package !!(sprintf "%s/**/*.*" unzippedDir)
133+
DeleteDir unzippedDir
133134

134135
// move to nuget output
135136
MoveFile Paths.NugetOutput package

build/scripts/Signing.fsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,14 @@ type Sign() =
5252
for p in DotNetProject.All do
5353
let name = p.ProjectName.Nuget
5454
let outputFolder = Paths.Output(name)
55-
let dotnet51 = sprintf "%s/dotnet5.1/%s.dll" outputFolder name
56-
let net45dll = sprintf "%s/net45/%s.dll" outputFolder name
5755
match p with
5856
| Project p ->
59-
validate dotnet51 name
60-
validate net45dll name
57+
(outputFolder |> directoryInfo).GetDirectories()
58+
|> Seq.iter(fun frameworkDir ->
59+
let frameworkName = frameworkDir.Name
60+
let dll = sprintf "%s/%s/%s.dll" outputFolder frameworkName name
61+
if fileExists dll then validate dll name
62+
)
6163

6264
static member CreateKeysIfAbsent() =
6365
if not (directoryExists Paths.KeysFolder) then CreateDir Paths.KeysFolder

0 commit comments

Comments
 (0)