Issue #2 - updated to use new Microsoft.AspNet.WebApi.Core NuGet pack…

…age.
rdingwall · Sep 30, 2012 · 22cdee0 · 22cdee0
1 parent 8e2de26
commit 22cdee0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/Elmah.Contrib.WebApi/Elmah.Contrib.WebApi.csproj b/src/Elmah.Contrib.WebApi/Elmah.Contrib.WebApi.csproj
@@ -12,6 +12,8 @@
     <AssemblyName>Elmah.Contrib.WebApi</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,11 +38,12 @@
     <Reference Include="Elmah">
       <HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Http">
-      <HintPath>..\packages\AspNetWebApi.Core.4.0.20126.16343\lib\net40\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -53,6 +56,7 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/Elmah.Contrib.WebApi/packages.config b/src/Elmah.Contrib.WebApi/packages.config
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AspNetWebApi.Core" version="4.0.20126.16343" />
   <package id="elmah" version="1.2.2" />
   <package id="elmah.corelibrary" version="1.2.2" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
   <package id="MSBuildTasks" version="1.3.0.528" />
-  <package id="System.Json" version="4.0.20126.16343" />
-  <package id="System.Net.Http" version="2.0.20126.16343" />
-  <package id="System.Net.Http.Formatting" version="4.0.20126.16343" />
-  <package id="System.Web.Http.Common" version="4.0.20126.16343" />
+  <package id="Newtonsoft.Json" version="4.5.9" targetFramework="net40" />
 </packages>