Attempting to fix unit tests failing on mono with errors like "Missin…

…g method .ctor in assembly ..., type ExtensionAttribute".
castleproject · Dec 29, 2014 · 3080c4c · 3080c4c
1 parent 86df41f
commit 3080c4c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -175,20 +175,19 @@
   <Choose>
     <When Condition="$(TargetFrameworkVersion)!='v3.5'">
       <ItemGroup>
-        <Reference Include="NLog">
-          <HintPath>..\..\lib\net40\NLog.dll</HintPath>
-        </Reference>
         <Reference Include="Microsoft.CSharp" />
       </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="NLog">
-          <HintPath>..\..\lib\net35\NLog.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
   </Choose>
+  <ItemGroup>
+    <Reference Include="NLog">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath Condition="'$(Configuration)' == 'NET35-Release' or '$(Configuration)' == 'NET35-Debug'">..\..\lib\net35\NLog.dll</HintPath>
+      <HintPath Condition="'$(Configuration)' == 'NET40-Release' or '$(Configuration)' == 'NET40-Debug'">..\..\lib\net40\NLog.dll</HintPath>
+      <HintPath Condition="'$(Configuration)' == 'NET45-Release' or '$(Configuration)' == 'NET45-Debug'">..\..\lib\net45\NLog.dll</HintPath>
+      <HintPath Condition="'$(Configuration)' == 'MONO310-Release' or '$(Configuration)' == 'MONO310-Debug'">..\..\lib\net45\NLog.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="Serilog, Version=1.3.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj b/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj
@@ -233,7 +233,7 @@
   <ItemGroup>
     <Reference Include="NLog" Condition="'$(BuildConfigKey)' == 'mono310'">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(RootPath)\lib\net40\NLog.dll</HintPath>
+      <HintPath>$(RootPath)\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="NLog" Condition="'$(BuildConfigKey)' != 'mono310'">
       <SpecificVersion>False</SpecificVersion>