Fixed up nuspec file dependencies for issue #2.

rdingwall · Oct 2, 2012 · 8469c14 · 8469c14
1 parent c7f890f
commit 8469c14
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/build/Elmah.Contrib.WebApi.nuspec b/build/Elmah.Contrib.WebApi.nuspec
@@ -13,7 +13,8 @@
     <tags>WebAPI ELMAH</tags>
     <dependencies>
       <dependency id="elmah" version="0.0.0.0" />
-      <dependency id="AspNetWebApi.Core" version="0.0.0.0" />
+      <dependency id="elmah.corelibrary" version="0.0.0.0" />
+      <dependency id="Microsoft.AspNet.WebApi.Core" version="0.0.0.0" />
     </dependencies>
   </metadata>
 </package>
diff --git a/build/Elmah.Contrib.WebApi.targets b/build/Elmah.Contrib.WebApi.targets
@@ -33,14 +33,20 @@
              XmlFileName="..\src\Elmah.Contrib.WebApi\packages.config">
         <Output TaskParameter="Value" PropertyName="ElmahDependencyVersion" />
     </XmlRead>
+
+    <XmlRead XPath="//package[@id='elmah.corelibrary']/@version"
+             XmlFileName="..\src\Elmah.Contrib.WebApi\packages.config">
+      <Output TaskParameter="Value" PropertyName="ElmahCoreDependencyVersion" />
+    </XmlRead>
 
-    <XmlRead XPath="//package[@id='AspNetWebApi.Core']/@version"
+    <XmlRead XPath="//package[@id='Microsoft.AspNet.WebApi.Core']/@version"
              XmlFileName="..\src\Elmah.Contrib.WebApi\packages.config">
       <Output TaskParameter="Value" PropertyName="WebApiDependencyVersion" />
     </XmlRead>
 
-    <Message Text="Using ELMAH dependency version = $(ElmahDependencyVersion)" />
-    <Message Text="Using WebAPI dependency version = $(WebApiDependencyVersion)" />
+    <Message Text="Using elmah dependency version = $(ElmahDependencyVersion)" />
+    <Message Text="Using elmah.corelibrary dependency version = $(ElmahCoreDependencyVersion)" />
+    <Message Text="Using Microsoft.AspNet.WebApi.Core dependency version = $(WebApiDependencyVersion)" />
 
 
     <Copy SourceFiles="$(NuspecFile)" DestinationFolder="$(OutputDir)" />
@@ -54,7 +60,11 @@
                Value="$(ElmahDependencyVersion)" />
 
     <XmlUpdate XmlFileName="$(OutputDir)\$(NuspecFile)"
-               Xpath="//dependency[@id='AspNetWebApi.Core']/@version"
+               Xpath="//dependency[@id='elmah.corelibrary']/@version"
+               Value="$(ElmahCoreDependencyVersion)" />
+
+    <XmlUpdate XmlFileName="$(OutputDir)\$(NuspecFile)"
+               Xpath="//dependency[@id='Microsoft.AspNet.WebApi.Core']/@version"
                Value="$(WebApiDependencyVersion)" />
 
     <NuGet BaseDir="$(OutputDir)" 

diff --git a/src/Elmah.Contrib.WebApi/Properties/AssemblyInfo.cs b/src/Elmah.Contrib.WebApi/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
diff --git a/src/Elmah.Contrib.WebApi/packages.config b/src/Elmah.Contrib.WebApi/packages.config
@@ -4,5 +4,4 @@
   <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="Newtonsoft.Json" version="4.5.9" targetFramework="net40" />
 </packages>