Skip to content

Commit 8917137

Browse files
committed
Fix building on Linux
There is no ilmerge.exe on Linux, so we use ILRepack.exe instead which also works on Windows.
1 parent a170fdf commit 8917137

File tree

6 files changed

+20
-8
lines changed

6 files changed

+20
-8
lines changed

src/GitVersionExe/GitVersionExe.csproj

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.72\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.72\build\LibGit2Sharp.NativeBinaries.props')" />
44
<PropertyGroup>
@@ -132,7 +132,12 @@
132132
</UsingTask>
133133
<Target Name="AfterBuild" DependsOnTargets="Clean" Condition="$(NCrunch)==''">
134134
<MakeDir Directories="$(TargetDir)ILMergeTemp\" />
135-
<Exec Command="&quot;$(SolutionDir)tools\ilmerge.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
135+
<PropertyGroup>
136+
<Runtime Condition="'$(OS)'=='Unix'">mono</Runtime>
137+
</PropertyGroup>
138+
<!-- Copy target file so that our temporary file gets the correct permissions -->
139+
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(TargetDir)ILMergeTemp\"/>
140+
<Exec Command="$(Runtime) &quot;$(SolutionDir)/packages/ILRepack.2.0.7/tools/ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
136141
<ItemGroup>
137142
<TempFiles Include="$(TargetDir)ILMergeTemp\*.*" />
138143
</ItemGroup>
@@ -208,4 +213,4 @@
208213
</Target>
209214
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
210215
<Import Project="..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
211-
</Project>
216+
</Project>

src/GitVersionExe/packages.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Caseless.Fody" version="1.3.7" targetFramework="net4" developmentDependency="true" />
44
<package id="Fody" version="1.29.3" targetFramework="net4" developmentDependency="true" />
5+
<package id="ILRepack" version="2.0.7" targetFramework="net40" />
56
<package id="GitTools.Core" version="0.4.0-beta0001" targetFramework="net4" />
67
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
78
<package id="LibGit2Sharp" version="0.22.0-pre20150716071016" targetFramework="net4" />
89
<package id="LibGit2Sharp.NativeBinaries" version="1.0.72" targetFramework="net4" />
910
<package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />
1011
<package id="Visualize.Fody" version="0.4.4.0" targetFramework="net4" developmentDependency="true" />
11-
</packages>
12+
</packages>

src/GitVersionTask/GitVersionTask.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,12 @@
105105
</Target>
106106
<Target Name="AfterBuild" DependsOnTargets="Clean" Condition="$(NCrunch)==''">
107107
<MakeDir Directories="$(TargetDir)ILMergeTemp\" />
108-
<Exec Command="&quot;$(SolutionDir)tools\ilmerge.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:library /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
108+
<PropertyGroup>
109+
<Runtime Condition="'$(OS)'=='Unix'">mono</Runtime>
110+
</PropertyGroup>
111+
<!-- Copy target file so that our temporary file gets the correct permissions -->
112+
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(TargetDir)ILMergeTemp\"/>
113+
<Exec Command="$(Runtime) &quot;$(SolutionDir)/packages/ILRepack.2.0.7/tools/ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:library /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
109114
<ItemGroup>
110115
<TempFiles Include="$(TargetDir)ILMergeTemp\*.*" />
111116
</ItemGroup>

src/GitVersionTask/packages.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Caseless.Fody" version="1.3.7" targetFramework="net4" developmentDependency="true" />
44
<package id="Fody" version="1.29.3" targetFramework="net4" developmentDependency="true" />
5+
<package id="ILRepack" version="2.0.7" targetFramework="net40" />
56
<package id="GitTools.Core" version="0.4.0-beta0001" targetFramework="net4" />
67
<package id="LibGit2Sharp" version="0.22.0-pre20150716071016" targetFramework="net4" />
78
<package id="LibGit2Sharp.NativeBinaries" version="1.0.72" targetFramework="net4" />
89
<package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />
910
<package id="YamlDotNet" version="3.6.1" targetFramework="net4" />
10-
</packages>
11+
</packages>

src/tools/ILMerge.doc

-89 KB
Binary file not shown.

src/tools/ILMerge.exe

-727 KB
Binary file not shown.

0 commit comments

Comments
 (0)