Skip to content

Commit cabbc68

Browse files
committed
Update ilmerge path
1 parent 46f7219 commit cabbc68

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

build/build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<Version Condition=" '$(bamboo_GitVersion_NuGetVersion)' != '' ">$(bamboo_GitVersion_NuGetVersion)</Version>
88
<Version Condition=" '$(bamboo_GitVersion_NuGetVersion)' == '' ">0.0.0-dev</Version>
99

10-
<ILMerge>$(MSBuildThisFileDirectory.Replace('build\','src'))\packages\ILMerge.2.14.1208\tools\ILMerge.exe</ILMerge>
1110
<PaketVersion>2.66.9</PaketVersion>
1211
<PaketBootstrapper>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe</PaketBootstrapper>
1312
<Paket>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe</Paket>
@@ -16,6 +15,7 @@
1615
<MSBuild>&quot;$(MSBuildToolsPath)\MSBuild.exe&quot;</MSBuild>
1716
<XUnit>$(PackagesFolder)\xunit.runner.console\tools\xunit.console.exe</XUnit>
1817
<XUnitXslt>$(PackagesFolder)\xunit.runner.console\tools\NUnitXml.xslt</XUnitXslt>
18+
<ILMerge>$(PackagesFolder)\ILMerge\tools\ILMerge.exe</ILMerge>
1919
</PropertyGroup>
2020

2121
<Target Name="CI">
@@ -57,7 +57,7 @@
5757
<Exec Command="@powershell -NoProfile -ExecutionPolicy unrestricted -Command &quot;$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://github.com/fsprojects/Paket/releases/download/$(PaketVersion)/paket.bootstrapper.exe' -OutFile '$(PaketBootstrapper)'&quot;" />
5858
<Exec Command="..\.paket\paket.bootstrapper.exe $(PaketVersion)" />
5959
</Target>
60-
60+
6161
<Target Name="UnitTest" DependsOnTargets="Build">
6262
<PropertyGroup>
6363
<MSTest Condition=" '$(VS140COMNTOOLS)' != '' ">&quot;$(VS140COMNTOOLS)..\IDE\MSTest.exe&quot;</MSTest>

0 commit comments

Comments
 (0)