Remove old code, see #13

sharparchitecture · Nov 1, 2017 · 6c7c3a4 · 6c7c3a4
1 parent e590c76
commit 6c7c3a4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 244 deletions.
diff --git a/Properties/Global.Imports b/Properties/Global.Imports
@@ -8,7 +8,6 @@
   <Import Project="$(PropertiesPath)\CPUArchitecture.properties" />
 
   <!-- Import Custom MSBuild Tasks -->
-  <Import Project="$(TasksPath)\Microsoft.Sdc.Common.tasks" />
   <Import Project="$(TasksPath)\MSBuild.Community.Tasks.Targets" />
   <Import Project="$(TasksPath)\MSBuild.Extended.tasks" />
 

diff --git a/Targets/CleanSolution.target b/Targets/CleanSolution.target
@@ -5,10 +5,10 @@
   <Target Name="CleanSolution">
 
     <Message Text="Cleaning up temp files prior to build" Importance="High"/>
-    <MakeDir Directories="$(DropsPath)\$(SemanticVersion)\"/>
     <RemoveDir Directories="@(ProjectBuildArtefactFolders)" />
 
-    <CleanFolder Path="$(DropsPath)" Force="True" ContinueOnError="true" />
+    <RemoveDir Directories="$(DropsPath)" ContinueOnError="true" />
+    <MakeDir Directories="$(DropsPath)\$(SemanticVersion)\"/>
 
   </Target>
 

diff --git a/Targets/RunNUnitTests.target b/Targets/RunNUnitTests.target
@@ -10,7 +10,7 @@
 
   <Target Name="RunNUnit3Tests" Condition=" '$(UseNUnit3)' == 'true' ">
     <Error
-      Text="nunit-console shim not found. Install Chocolatey package nunit.portable first."
+      Text="nunit-console shim not found. Install Chocolatey package nunit-console.portable first."
       Condition="!Exists('$(ShimsPath)\nunit3-console.exe')" 
     />
     <Error
@@ -37,10 +37,10 @@
     <Message Condition=" '$(IsDesktopBuild)' != 'true' "
         Text="Skipping HTML report generation non-desktop build." />
     <Error
-      Text="Report Generator was not found. Install Chocolatey package reportgenerator.portable"
-      Condition="'$(IsDesktopBuild)' != 'true' "
+      Text="ReportGenerator shim not found. Install Chocoletey package reportgenerator.portable"
+      Condition=" ('$(IsDesktopBuild)' == 'true') And (!Exists('$(ShimsPath)\ReportGenerator.exe'))"
     />
-    <Exec Condition=" ('$(IsDesktopBuild)' == 'true') And (!Exists('$(ShimsPath)\ReportGenerator.exe')) "
+    <Exec Condition=" '$(IsDesktopBuild)' == 'true' "
       Command="$(ShimsPath)\ReportGenerator.exe -reports:$(NUnitResultsPath)\TestCoverage.xml -reporttypes:Html -targetdir:$(NUnitResultsPath)\CoverageReport"
     />
     <MSBuild.Community.Tasks.WebUpload Condition=" '$(APPVEYOR_JOB_ID)' != '' "
@@ -57,16 +57,8 @@
     />
   </Target>
 
-  <Target Name="RunNUnit2Tests" Condition=" '$(UseNUnit3)' != 'true' ">
-    <NUnit Assemblies="@(AssembliesToTestWithNUnit)"
-           ToolPath="$(ToolsPath)\NUnit.Runners.2.6.4\"
-           OutputXmlFile="$(NUnitResultsPath)\NUnitOutput.xml" />
-
-    <Message Text="##teamcity[importData type='nunit' path='$(NUnitResultsPath)\NUnitOutput.xml']"  />
-  </Target>
-
   <Target Name="RunNUnitTests"
-          DependsOnTargets="CreateDrops;CreateNUnitResultsDir;RunNUnit2Tests;RunNUnit3Tests">
+          DependsOnTargets="CreateDrops;CreateNUnitResultsDir;RunNUnit3Tests">
   </Target>
 
 </Project>