Merge pull request #24 from hudl/FixBuildConfiguration

update build configs
hudl · Jun 9, 2015 · cd86387 · cd86387
2 parents fda864e + 96131cf
commit cd86387
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 18 deletions.
diff --git a/Hudl.Ffmpeg/build_files/project.build → build_files/hudl_ffmpeg.build b/Hudl.Ffmpeg/build_files/project.build → build_files/hudl_ffmpeg.build
@@ -5,15 +5,6 @@
   <property name="compiledDir" value="${codeDir}\Hudl.Ffmpeg\Deploy_HudlFfmpeg" />
 
   <target name="Build" description="Build" depends="">    
-    <msbuild failonerror="true" project="${codeDir}\Hudl.Ffmpeg.Core\Hudl.Ffmpeg.Core.csproj" target="Rebuild">
-      <property name="Configuration" value="Release" />
-      <property name="DeployOnBuild" value="true" />
-      <property name="PublishProfile" value="Local" />
-      <property name="VisualStudioVersion" value="11.0" />
-      <property name="WarningLevel" value="0" />
-	  <arg value="/m" />
-	  <arg value="/nologo" />
-    </msbuild>
     <msbuild failonerror="true" project="${codeDir}\Hudl.Ffprobe\Hudl.Ffprobe.csproj" target="Rebuild">
       <property name="Configuration" value="Release" />
       <property name="DeployOnBuild" value="true" />
@@ -23,15 +14,6 @@
     <arg value="/m" />
     <arg value="/nologo" />
     </msbuild>
-    <msbuild failonerror="true" project="${codeDir}\Hudl.Ffmpeg\Hudl.Ffmpeg.csproj" target="Rebuild">
-      <property name="Configuration" value="Release" />
-      <property name="DeployOnBuild" value="true" />
-      <property name="PublishProfile" value="Local" />
-      <property name="VisualStudioVersion" value="11.0" />
-      <property name="WarningLevel" value="0" />
-    <arg value="/m" />
-    <arg value="/nologo" />
-    </msbuild>
   </target>
 
   <target name="UnitTest" description="Run unit tests" depends="Build">

diff --git a/build_files/hudl_ffmpeg_core.build b/build_files/hudl_ffmpeg_core.build
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project name="Hudl.Ffmpeg.Core">  
+  <property name="teamcity_dotnet_tools_version" value="4.0"/> <!-- force MSBuild 4.0 -->
+  <property name="tempDir" value="${codeDir}\Hudl.Ffmpeg.Core\Temp_HudlFfmpegCore" />
+  <property name="compiledDir" value="${codeDir}\Hudl.Ffmpeg.Core\Deploy_HudlFfmpegCore" />
+
+  <target name="Build" description="Build" depends="">    
+    <msbuild failonerror="true" project="${codeDir}\Hudl.Ffmpeg.Core\Hudl.Ffmpeg.Core.csproj" target="Rebuild">
+      <property name="Configuration" value="Release" />
+      <property name="DeployOnBuild" value="true" />
+      <property name="PublishProfile" value="Local" />
+      <property name="VisualStudioVersion" value="11.0" />
+      <property name="WarningLevel" value="0" />
+	  <arg value="/m" />
+	  <arg value="/nologo" />
+    </msbuild>
+  </target>
+</project>
diff --git a/build_files/hudl_ffprobe.build b/build_files/hudl_ffprobe.build
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project name="Hudl.Ffprobe">  
+  <property name="teamcity_dotnet_tools_version" value="4.0"/> <!-- force MSBuild 4.0 -->
+  <property name="tempDir" value="${codeDir}\Hudl.Ffprobe\Temp_HudlFfprobe" />
+  <property name="compiledDir" value="${codeDir}\Hudl.Ffprobe\Deploy_HudlFfprobe" />
+
+  <target name="Build" description="Build" depends="">    
+    <msbuild failonerror="true" project="${codeDir}\Hudl.Ffprobe\Hudl.Ffprobe.csproj" target="Rebuild">
+      <property name="Configuration" value="Release" />
+      <property name="DeployOnBuild" value="true" />
+      <property name="PublishProfile" value="Local" />
+      <property name="VisualStudioVersion" value="11.0" />
+      <property name="WarningLevel" value="0" />
+    <arg value="/m" />
+    <arg value="/nologo" />
+    </msbuild>
+  </target>
+</project>