Merge pull request orlikoski#45 from Lansatac/bugfix/deployment

Bugfix/deployment

.travis.yml

@@ -6,16 +6,13 @@ env:
 script:
 - xbuild /p:Configuration=Release /p:Platform="Framework $PLATFORM" CyLR.sln
 - mono ./packages/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe CyLRTests/bin/Release/CyLRTests.dll
-- mono ./packages/ILRepack.2.0.12/tools/ILRepack.exe /wildcards /out:./CyLR/bin/$PLATFORM/merged/CyLR.exe CyLR/bin/$PLATFORM/Release/CyLR.exe CyLR/bin/$PLATFORM/Release/*.dll
-- cp ./CyLR/bin/$PLATFORM/merged/CyLR.exe ./CyLR.exe
-- zip ./CyLR/bin/$PLATFORM/merged/CyLR$PLATFORM.zip ./CyLR.exe
-- rm ./CyLR.exe
+- zip -j ./CyLR/bin/merged/CyLR$PLATFORM.zip ./CyLR/bin/merged/CyLR.exe
 deploy:
   provider: releases
   api_key:
     secure: F3vanioKwtxsaSldx+I5mpzeXnAmRu4IK4eun7nk/UXRz+X3eruqhRp1zJoc0zhh34CQ2UqfsQpebjuBTD7ho1wkdlmMLFeuqmV+vFM5Or/qcWiVygI5h/OWXdUJbRCe/XR9fy5BxH8QNWoLQ4qaLzItl4pnMi6DaEvWS4VHP5RNZZ2KvNJq4aAc/5DMONpenyMMJNvgozf0pVXnwN9BF9CiUQIpBTYg71VLOco/4NtMvxgiyKREt/mMS/lbv0v/KizYmrgJDAHincsWqI/Rj5nLaZIZDMcQma+WKldwOy9EPZnWlmXmSwDpQPS+tw+qx6vvOJc0r24rjBUZCpCPeY6pMYnO7VXeHD75HAc7b49Wg+0nHL69EsSY2VdJY6Oka7hGaQB9MmvxSQW9j4/YfoLmXW7Cl++EKm1m6SADVe9BRVnkQ0q5Aw9VD8Q+aJxh75E3yaGW9Uc5kwLHX0kdu5jz+gKd/XswHBqYQp7wO/ziObaCJtFwMiOzK1EpdEdsBqaKiBVKw1HBft1wGusLBAr1oKsowqwan8PhjR2r/3U11MGNECQgbxe6/iLSJ+p7J79kS0M1phsx/HeAuANi3BSmh5i3Dv0FzI9Ny4ViKnAx7eoJXTfIgKSXQx3YmwZwMrUH+djd4RekGRQwzAv744x3HkAz1C0/EYKIGR4xShs=
   file:
-    - ./CyLR/bin/$PLATFORM/merged/CyLR$PLATFORM.zip
+    - ./CyLR/bin/merged/CyLR$PLATFORM.zip
   skip_cleanup: true
   on:
     tags: true

CyLR/CyLR.csproj

@@ -132,7 +132,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <Choose>
@@ -188,4 +187,10 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup Condition=" '$(OS)' != 'Unix' ">
+    <PostBuildEvent>$(SolutionDir)packages\ILRepack.2.0.12\tools\ILRepack.exe /wildcards /out:$(ProjectDir)bin\merged\$(TargetFileName) $(TargetPath) $(TargetDir)*.dll</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Unix' ">
+    <PostBuildEvent>mono $(SolutionDir)packages/ILRepack.2.0.12/tools/ILRepack.exe /wildcards /out:$(ProjectDir)bin/merged/$(TargetFileName) $(TargetPath) $(TargetDir)*.dll</PostBuildEvent>
+  </PropertyGroup>
 </Project>