Skip to content

Commit 94bdf81

Browse files
committed
Added Unix guards
Added Unix guards on the `AfterBuild` MSBuild target, so `ilmerge.exe` won't be attempted to run under Mono, where it will fail with an exit code of `126` (whatever that means).
1 parent 094b726 commit 94bdf81

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/GitVersionExe/GitVersionExe.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
]]></Code>
130130
</Task>
131131
</UsingTask>
132-
<Target Name="AfterBuild" DependsOnTargets="Clean" Condition="$(NCrunch)==''">
132+
<Target Name="AfterBuild" DependsOnTargets="Clean" Condition="$(NCrunch)=='' And '$(OS)' != 'Unix'">
133133
<MakeDir Directories="$(TargetDir)ILMergeTemp\" />
134134
<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:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
135135
<ItemGroup>

src/GitVersionTask/GitVersionTask.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</ItemGroup>
100100
<Delete Files="@(FilesToDelete)" />
101101
</Target>
102-
<Target Name="AfterBuild" DependsOnTargets="Clean" Condition="$(NCrunch)==''">
102+
<Target Name="AfterBuild" DependsOnTargets="Clean" Condition="$(NCrunch)=='' And '$(OS)' != 'Unix'">
103103
<MakeDir Directories="$(TargetDir)ILMergeTemp\" />
104104
<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 " />
105105
<ItemGroup>

0 commit comments

Comments
 (0)