Skip to content

Commit abfd768

Browse files
MpdreamzMpdreamz
committed
fixed the build to generate proper signed libs for the *.Signed nugets
1 parent 89762fb commit abfd768

File tree

5 files changed

+28
-17
lines changed

5 files changed

+28
-17
lines changed

‎build/NEST.Signed.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<tags>elasticsearch elastic search lucene nest</tags>
1919
</metadata>
2020
<files>
21-
<file src="lib\**\Nest.Signed.dll" target="lib"/>
22-
<file src="lib\**\Nest.Signed.pdb" target="lib"/>
23-
<file src="lib\**\Nest.Signed.XML" target="lib"/>
21+
<file src="lib\**\Nest.dll" target="lib"/>
22+
<file src="lib\**\Nest.pdb" target="lib"/>
23+
<file src="lib\**\Nest.XML" target="lib"/>
2424
</files>
2525
</package>

‎build/NESTBuild.proj‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656

5757
<!-- First copy the nuspec template files to the build dir -->
5858
<Copy SourceFiles="..\build\NEST.nuspec" DestinationFolder="$(BuildDir)" />
59-
<Copy SourceFiles="..\build\NEST.Signed.nuspec" DestinationFolder="$(BuildDir)" />
60-
<Copy SourceFiles="..\build\Nest.Connection.Thrift.nuspec" DestinationFolder="$(BuildDirSigned)" />
59+
<Copy SourceFiles="..\build\NEST.Signed.nuspec" DestinationFolder="$(BuildDirSigned)" />
60+
<Copy SourceFiles="..\build\Nest.Connection.Thrift.nuspec" DestinationFolder="$(BuildDir)" />
6161
<Copy SourceFiles="..\build\Nest.Connection.Thrift.Signed.nuspec" DestinationFolder="$(BuildDirSigned)" />
6262
<!-- Copy the source files to the package dir -->
6363
<Copy SourceFiles="@(MainBinaries)" DestinationFolder="$(BuildDir)\lib\NET4\" />
@@ -73,10 +73,21 @@
7373

7474
<!-- Create signed copies -->
7575
<Exec WorkingDirectory="$(BuildDirSigned)"
76-
Command='$(MSBuildProjectDirectory)\tools\ilmerge.exe $(<BuildDirSigned>)\lib\NET4\Nest.dll /keyfile:$(MSBuildProjectDirectory)\keys\keypair.snk /out:$(<BuildDirSigned>)\lib\NET4\Nest.dll /targetplatform:v4,"%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0"' />
77-
<Exec WorkingDirectory="$(BuildDirSigned)"
78-
Command='$(MSBuildProjectDirectory)\tools\ilmerge.exe $(<BuildDirSigned>)\lib\NET4\Nest.Connection.Thrift.dll /keyfile:$(MSBuildProjectDirectory)\keys\keypair.snk /out:$(<BuildDirSigned>)\lib\NET4\Nest.Connection.Thrift.dll /targetplatform:v4,"%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0"' />
76+
Command='$(MSBuildProjectDirectory)\tools\ilmerge.exe $(BuildDirSigned)\lib\NET4\Nest.dll /keyfile:$(MSBuildProjectDirectory)\keys\keypair.snk /out:$(BuildDirSigned)\lib\Nest.dll /targetplatform:v4,"%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0"' />
77+
<ItemGroup>
78+
<TmpSignedNestBinary Include="$(BuildDirSigned)\lib\Nest.*" />
79+
</ItemGroup>
80+
<Copy SourceFiles="@(TmpSignedNestBinary)" DestinationFolder="$(BuildDirSigned)\lib\NET4\" />
81+
<Delete Files="@(TmpSignedNestBinary)" />
7982

83+
<Exec WorkingDirectory="$(BuildDirSigned)"
84+
Command='$(MSBuildProjectDirectory)\tools\ilmerge.exe $(BuildDirSigned)\lib\NET4\Nest.Connection.Thrift.dll /keyfile:$(MSBuildProjectDirectory)\keys\keypair.snk /out:$(BuildDirSigned)\lib\Nest.Connection.Thrift.dll /targetplatform:v4,"%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0"' />
85+
<ItemGroup>
86+
<TmpSignedNestThriftBinary Include="$(BuildDirSigned)\lib\Nest.*" />
87+
</ItemGroup>
88+
<Copy SourceFiles="@(TmpSignedNestThriftBinary)" DestinationFolder="$(BuildDirSigned)\lib\NET4\" />
89+
<Delete Files="@(TmpSignedNestThriftBinary)" />
90+
8091
<!-- insert the version number into the nuspec files -->
8192
<XmlUpdate
8293
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
@@ -91,7 +102,7 @@
91102
<XmlUpdate
92103
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
93104
Prefix="n"
94-
XmlFileName="$(BuildDir)\NEST.Signed.nuspec"
105+
XmlFileName="$(BuildDirSigned)\NEST.Signed.nuspec"
95106
XPath="/n:package/n:metadata/n:version"
96107
Value="%(AsmInfo.Version)" />
97108

@@ -111,7 +122,7 @@
111122
<XmlUpdate
112123
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
113124
Prefix="n"
114-
XmlFileName="$(BuildDir)\Nest.Connection.Thrift.Signed.nuspec"
125+
XmlFileName="$(BuildDirSigned)\Nest.Connection.Thrift.Signed.nuspec"
115126
XPath="/n:package/n:metadata/n:version"
116127
Value="%(AsmInfo.Version)" />
117128

‎build/Nest.Connection.Thrift.Signed.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<tags>elasticsearch elastic search lucene nest</tags>
2121
</metadata>
2222
<files>
23-
<file src="lib\**\Nest.Connection.Thrift.Signed.dll" target="lib"/>
24-
<file src="lib\**\Nest.Connection.Thrift.Signed.pdb" target="lib"/>
25-
<file src="lib\**\Nest.Connection.Thrift.Signed.XML" target="lib"/>
23+
<file src="lib\**\Nest.Connection.Thrift.dll" target="lib"/>
24+
<file src="lib\**\Nest.Connection.Thrift.pdb" target="lib"/>
25+
<file src="lib\**\Nest.Connection.Thrift.XML" target="lib"/>
2626
</files>
2727
</package>

‎src/Nest.Connection.Thrift/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[assembly: System.Runtime.InteropServices.ComVisible(false)]
1616
[assembly: System.CLSCompliant(true)]
1717
[assembly: System.Runtime.InteropServices.Guid("4d165338-2060-4641-8be6-b7aacbdee52d")]
18-
[assembly: System.Reflection.AssemblyVersion("0.11.7.0")]
19-
[assembly: System.Reflection.AssemblyFileVersion("0.11.7.0")]
18+
[assembly: System.Reflection.AssemblyVersion("0.11.7.1")]
19+
[assembly: System.Reflection.AssemblyFileVersion("0.11.7.1")]
2020

2121

‎src/Nest/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[assembly: System.Runtime.InteropServices.ComVisible(false)]
1616
[assembly: System.CLSCompliant(true)]
1717
[assembly: System.Runtime.InteropServices.Guid("07E5CFA3-CF5F-4D17-874C-8D5CC6FA3E73")]
18-
[assembly: System.Reflection.AssemblyVersion("0.11.7.0")]
19-
[assembly: System.Reflection.AssemblyFileVersion("0.11.7.0")]
18+
[assembly: System.Reflection.AssemblyVersion("0.11.7.1")]
19+
[assembly: System.Reflection.AssemblyFileVersion("0.11.7.1")]
2020

2121

0 commit comments

Comments
 (0)