Upgraded to WebApi 5.0.

rdingwall · Jan 6, 2014 · ca13745 · ca13745
1 parent e0a3128
commit ca13745
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/build/Elmah.Contrib.WebApi.targets b/build/Elmah.Contrib.WebApi.targets
@@ -25,7 +25,7 @@
     </ItemGroup>
     <Delete Files="@(FilesToRemove)" />
 
-    <GetAssemblyIdentity AssemblyFiles="$(OutputDir)\lib\net40\Elmah.Contrib.WebApi.dll">
+    <GetAssemblyIdentity AssemblyFiles="$(OutputDir)\lib\net45\Elmah.Contrib.WebApi.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyInfo"/>
     </GetAssemblyIdentity>
 
@@ -83,7 +83,7 @@
       <ZipFiles Include="$(OutputDir)\lib\license.txt" />
     </ItemGroup>
 
-    <GetAssemblyIdentity AssemblyFiles="$(OutputDir)\lib\net40\Elmah.Contrib.WebApi.dll">
+    <GetAssemblyIdentity AssemblyFiles="$(OutputDir)\lib\net45\Elmah.Contrib.WebApi.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyInfo"/>
     </GetAssemblyIdentity>
 
@@ -96,11 +96,9 @@
   <Target Name="Rebuild">
     <RemoveDir Directories="$(OutputDir)" />
 
-    <!-- ASP.NET Web API only supports .NET 4.0, so don't need to worry about
-         any other CLR versions. -->
     <MSBuild Projects="$(ProjectFile)"
              Targets="Clean; Rebuild"
-             Properties="Configuration=Release;OutputPath=..\$(OutputDir)\lib\net40;TargetFrameworkVersion=v4.0" />
+             Properties="Configuration=Release;OutputPath=..\$(OutputDir)\lib\net45;TargetFrameworkVersion=v4.5" />
   </Target>
 
 </Project>
diff --git a/src/Elmah.Contrib.WebApi/Elmah.Contrib.WebApi.csproj b/src/Elmah.Contrib.WebApi/Elmah.Contrib.WebApi.csproj
@@ -43,8 +43,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.0.0\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Elmah.Contrib.WebApi/packages.config b/src/Elmah.Contrib.WebApi/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="elmah.corelibrary" version="1.2.2" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.0.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.0.0" targetFramework="net45" />
   <package id="MSBuildTasks" version="1.4.0.56" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
 </packages>