add start of linux support

loresoft · Apr 29, 2016 · 08cca96 · 08cca96
1 parent c515363
commit 08cca96
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ Test
 *.msi
 *.chm
 /Tools
+/build.txt
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,10 @@
+language: csharp
+solution: ./Source/MSBuild.Community.Tasks.sln
+
+install:
+  - nuget restore ./Source/MSBuild.Community.Tasks.sln
+  - nuget install MSBuildTasks -OutputDirectory ./Tools/ -ExcludeVersion -NonInteractive
+  - nuget install ILRepack.MSBuild.Task -OutputDirectory ./Tools/ -ExcludeVersion -NonInteractive
+
+script:
+  - xbuild ./Master.proj
diff --git a/Master.proj b/Master.proj
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>
+  <Import Project="$(ToolFolder)\ILRepack.MSBuild.Task\build\ILRepack.MSBuild.Task.targets"/>
 
   <PropertyGroup>
     <BuildNumber Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
@@ -88,12 +89,17 @@
           DestinationFiles="$(BuildFolder)\MSBuild.Temp.dll" />
 
     <!-- Merge together files -->
-    <ILMerge InputAssemblies="$(BuildFolder)\MSBuild.Temp.dll;$(BuildFolder)\Ionic.Zip.Reduced.dll"
-             Internalize="true"
-             OutputFile="$(BuildFolder)\MSBuild.Community.Tasks.dll"
-             KeyFile="$(SourceFolder)\MSBuild.Community.Tasks\MSBuild.Community.Tasks.snk"
-             ToolPath="$(ToolFolder)\ilmerge\tools" />
-
+    <ItemGroup>
+      <InputAssemblies Include="$(BuildFolder)\MSBuild.Temp.dll" />
+      <InputAssemblies Include="$(BuildFolder)\Ionic.Zip.Reduced.dll" />
+    </ItemGroup>
+
+    <ILRepack Internalize="true"
+              InputAssemblies="@(InputAssemblies)"
+              TargetKind="Dll"
+              KeyFile="$(SourceFolder)\MSBuild.Community.Tasks\MSBuild.Community.Tasks.snk"
+              OutputFile="$(BuildFolder)\MSBuild.Community.Tasks.dll" />
+
     <!-- Cleanup unneed files -->
     <ItemGroup>
       <CleanupFiles Include="$(BuildFolder)\*.dll" Exclude="$(BuildFolder)\MSBuild.Community.Tasks.dll" />

diff --git a/bootstrap.cmd b/bootstrap.cmd
@@ -2,4 +2,4 @@
 Nuget.exe restore "Source\MSBuild.Community.Tasks.sln"
 
 NuGet.exe install MSBuildTasks -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive
-NuGet.exe install ilmerge -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive
+NuGet.exe install ILRepack.MSBuild.Task -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive