Fixing up build

Author: Jake Ginnivan

Samples/TestStack.BDDfy.Samples/AsyncExample.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NET35
+using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
@@ -42,4 +43,5 @@ internal class Sut
         {
         }
     }
-}
+}
+#endif

Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -39,7 +39,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NET35
+using System;
 using System.Reflection;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -59,4 +60,5 @@ private class SomeScenario
         {
         }
     }
-}
+}
+#endif

TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

TestStack.BDDfy.build

@@ -43,7 +43,9 @@
    Solution redirects. Every VS project normally knows how to support these targets
     -->
   <Target Name="Build">
-    <MSBuild Projects="$(ProjectName).sln" Targets="Build" Properties="Configuration=$(Configuration)$(BuildFramework);DefineConstants=$(BuildConstants);MSBuildTargets=$(BuildTargets);TargetFrameworkVersion=$(TargetFrameworkVersion);TargetFrameworkProfile=$(TargetFrameworkProfile)"/>
+    <MSBuild Projects="Samples\TestStack.BDDfy.Samples\TestStack.BDDfy.Samples.csproj" Targets="Build" Properties="Configuration=$(Configuration)$(BuildFramework);DefineConstants=$(BuildConstants);MSBuildTargets=$(BuildTargets);nowarn=1685"/>
+    <MSBuild Projects="TestStack.BDDfy.Tests\TestStack.BDDfy.Tests.csproj" Targets="Build" Properties="Configuration=$(Configuration)$(BuildFramework);DefineConstants=$(BuildConstants);MSBuildTargets=$(BuildTargets);nowarn=1685"/>
+    <MSBuild Projects="TestStack.BDDfy\TestStack.BDDfy.csproj" Targets="Build" Properties="Configuration=$(Configuration)$(BuildFramework);DefineConstants=$(BuildConstants);MSBuildTargets=$(BuildTargets);TargetFrameworkVersion=$(TargetFrameworkVersion);TargetFrameworkProfile=$(TargetFrameworkProfile)"/>
   </Target>
 
   <Target Name="Clean">