File tree Expand file tree Collapse file tree 2 files changed +3
-9
lines changed Expand file tree Collapse file tree 2 files changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -52,13 +52,12 @@ module Projects =
5252
5353 member this.MergeDependencies =
5454 match this with
55- | Project Nest -> [ Project Project.Nest; DepencyProject DependencyProject.JsonNet ]
55+ | Project Nest -> [ Project Project.Nest; ]
5656 | _ -> []
5757
5858 member this.VersionedMergeDependencies =
5959 match this with
60- | Project Nest -> [ Project Project.Nest; Project Project.ElasticsearchNet; DepencyProject DependencyProject.JsonNet]
61- | Project NestJsonNetSerializer -> [ Project NestJsonNetSerializer; Project Project.Nest; Project Project.ElasticsearchNet ]
60+ | Project Nest -> [ Project Project.Nest; Project Project.ElasticsearchNet; ]
6261 | Project ElasticsearchNet -> [ Project ElasticsearchNet]
6362 | _ -> []
6463
@@ -72,7 +71,7 @@ module Projects =
7271
7372 member this.NugetId = match this with | Project Nest -> " NEST" | _ -> this.Name
7473
75- member this.NeedsMerge = match this with | Project NestJsonNetSerializer -> false | _ -> true
74+ member this.NeedsMerge = true
7675
7776 member this.Versioned name version =
7877 match version with
Original file line number Diff line number Diff line change @@ -119,11 +119,6 @@ module Release =
119119 | Project ElasticsearchNet ->
120120 rewriteDllFile p.Name
121121 ignore()
122- | Project NestJsonNetSerializer ->
123- let nestDep = doc.XPathSelectElement( " /x:package/x:metadata//x:dependency[@id='NEST']" , nsManager);
124- let idAtt = nestDep.Attribute( xName " id" );
125- idAtt.Value <- sprintf " NEST.v%s " currentMajorVersion
126- rewriteDllFile p.Name
127122 | _ -> traceError ( sprintf " %s still needs special canary handling" p.Name)
128123 doc.Save( nuspecVersioned)
129124
You can’t perform that action at this time.
0 commit comments