From 77f241d166c5e611bdcc3f2370b9ee4ca93ce5ad Mon Sep 17 00:00:00 2001
From: Simona Avornicesei <simona@avornicesei.com>
Date: Thu, 18 Feb 2021 09:14:26 +0200
Subject: [PATCH 1/2] #302 Build fix on linux

---
 ccnet.build | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ccnet.build b/ccnet.build
index 7f9e5c320..3191dc17f 100644
--- a/ccnet.build
+++ b/ccnet.build
@@ -167,18 +167,19 @@
     <target name="build" depends="init, restore, createAssemblyInfo" description="Compilation of the build project">
         <loadtasks assembly="${nauckit.nant.assembly}" />
 
-        <echo message="Build configuration: ${build.configuration}" />
-        <echo message="Source Directory: ${src.dir}" />
-        <echo message="Build Directory: ${build.dir}" />
-        <echo message="MSBuild path: ${build.dir}" />
-
         <property name="msbuild.file" value="${framework::get-msbuild-path(vswhere.executable)}" />
         <property name="msbuild.exe" value="${msbuild.file}" if="${platform::is-windows()}" />
         <property name="msbuild.exe" value="mono" if="${platform::is-unix()}" />
 
+        <echo message="vswhere located at: ${vswhere.executable}" />
+        <echo message="Build configuration: ${build.configuration}" />
+        <echo message="Source Directory: ${src.dir}" />
+        <echo message="Build Directory: ${build.dir}" />
+        <echo message="MSBuild file: ${msbuild.file}, MSbuild exe: ${msbuild.exe}" />
+
         <!-- build for Linux - msbuild task still uses xbuild that was deprecated starting with mono 5.0 -->
-        <exec program="${msbuild.exe}" basedir="${src.dir}" workingdir="${src.dir}" verbose="${nant.verbosity}">
-            <arg value="msbuild.file" if="${platform::is-unix()}"/>
+        <exec program="${msbuild.exe}" workingdir="${src.dir}" verbose="${nant.verbosity}">
+            <arg value="${msbuild.file}" if="${platform::is-unix()}"/>
             <arg value="${path::combine(src.dir, build.project)}" />
             <arg value="/t:${build.target}" />
             <arg value="/p:TargetFrameworkVersion=${build.target.framework};Configuration=${build.configuration}"/>
@@ -241,7 +242,7 @@
                 </fileset>
             </copy>
             <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(tools.dir, 'NUnit')}" failonempty="true">
+                <fileset basedir="${path::combine(src.dir, 'packages/NUnit.3.12.0/lib/net45')}" failonempty="true">
                     <include name="nunit.framework.dll" />
                 </fileset>
             </copy>

From 1aa9efdd5955f66a6f5cec2fcd4833ea0e5ea47a Mon Sep 17 00:00:00 2001
From: Simona Avornicesei <simona@avornicesei.com>
Date: Sat, 20 Feb 2021 00:36:33 +0200
Subject: [PATCH 2/2] #302 Cleanup since MSBuild can handle unit tests

---
 ccnet.build | 58 +----------------------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/ccnet.build b/ccnet.build
index 3191dc17f..deb56d86c 100644
--- a/ccnet.build
+++ b/ccnet.build
@@ -209,66 +209,10 @@
     <target name="runNUnitTests" depends="build" description="Run the NUnit tests">
         <loadtasks assembly="${nauckit.nant.assembly}" />
 
-        <!-- Hack to copy all required files into the UnitTest dictionary until xbuild on Mono 2.5 is fixed -->
-        <if test="${framework::get-family(nant.settings.currentframework) == 'mono'}">
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(build.dir, 'CCTray')}" failonempty="true">
-                    <include name="*/**" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(build.dir, 'Core')}" failonempty="true">
-                    <include name="*/**" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(build.dir, 'Objection')}" failonempty="true">
-                    <include name="*/**" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(build.dir, 'Remote')}" failonempty="true">
-                    <include name="*/**" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(build.dir, 'Server')}" failonempty="true">
-                    <include name="*/**" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(build.dir, 'WebDashboard')}" failonempty="true">
-                    <include name="*/**" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine(src.dir, 'packages/NUnit.3.12.0/lib/net45')}" failonempty="true">
-                    <include name="nunit.framework.dll" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${tools.dir}" failonempty="true">
-                    <include name="sleeper.exe" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${src.dir}" failonempty="true">
-                    <include name="xsl/**" />
-                </fileset>
-            </copy>
-            <copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
-                <fileset basedir="${path::combine( path::combine(src.dir, 'UnitTests'), 'resources')}" failonempty="true">
-                    <include name="*/**" />
-                </fileset>
-            </copy>
-            <copy file="${path::combine( path::combine(src.dir, 'UnitTests'), 'test.config')}" tofile="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll.config')}" verbose="${nant.verbosity}" />
-        </if>
-
         <exec program="${nunit.executable}" >
                         <arg value="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll')}" />
                         <arg value="--result=${path::combine(build.metrics.dir, 'nunit-result.xml')}" />
-                        <arg value="--where &quot;cat != Integration&quot;" />
-                        
+                        <arg value="--where &quot;cat != Integration&quot;" />                        
         </exec>
     </target>