Revert "Test project should just be net40"

This reverts commit 2ec62e7.
shouldly · Mar 13, 2015 · 401e5c2 · 401e5c2
1 parent 2ec62e7
commit 401e5c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build/rakelib/build.rake b/build/rakelib/build.rake
@@ -6,7 +6,7 @@ assemblyinfo :version_assemblies => [:get_build_number] do |asm|
     asm.product_name = PROJECT_NAME
     asm.title = PROJECT_NAME
     asm.description = PROJECT_TAGLINE
-    asm.copyright = "Copyright (c) 2010 #{PROJECT_NAME}"
+    asm.copyright = "Copyright (c) 2015 #{PROJECT_NAME}"
     asm.output_file = "#{SOURCE_PATH}/Shouldly/Properties/AssemblyInfo.cs"
 end
 

diff --git a/src/Shouldly.Tests/Shouldly.Tests.csproj b/src/Shouldly.Tests/Shouldly.Tests.csproj
@@ -8,29 +8,31 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Shouldly.Tests</RootNamespace>
     <AssemblyName>Shouldly.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.0</TargetFrameworkVersion>
+    <NuGetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == 'v4.0'">net40</NuGetFrameworkVersion>
+    <NuGetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == 'v3.5'">net35</NuGetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>bin\Debug\$(NuGetFrameworkVersion)</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>bin\Release\$(NuGetFrameworkVersion)</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
+    <DefineConstants>$(NuGetFrameworkVersion);$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>

diff --git a/src/Shouldly.Tests/packages.config b/src/Shouldly.Tests/packages.config
@@ -4,5 +4,6 @@
   <package id="ApprovalTests" version="3.0.8" targetFramework="net4" userInstalled="true" />
   <package id="ApprovalUtilities" version="3.0.8" targetFramework="net4" userInstalled="true" />
   <package id="FodyCecil" version="1.28.0" targetFramework="net4" userInstalled="true" />
+  <package id="Mono.Cecil" version="0.9.5.4" targetFramework="net4" userInstalled="true" />
   <package id="NUnit" version="2.6.3" targetFramework="net4" userInstalled="true" />
 </packages>