fixing refs again and bumping to 102.3

restsharp · Oct 23, 2011 · 19d3854 · 19d3854
1 parent c08b548
commit 19d3854
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 18 deletions.
diff --git a/RestSharp.Tests/RestSharp.Tests.csproj b/RestSharp.Tests/RestSharp.Tests.csproj
@@ -64,10 +64,6 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json.Net35, Version=4.0.2.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.0.2\lib\net35\Newtonsoft.Json.Net35.dll</HintPath>
-    </Reference>
     <Reference Include="xunit, Version=1.8.0.1549, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\xunit.1.8.0.1549\lib\xunit.dll</HintPath>

diff --git a/RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj b/RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj
@@ -43,8 +43,8 @@
     <DocumentationFile>Bin\Release\RestSharp.WindowsPhone.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json.WindowsPhone">
-      <HintPath>..\packages\Newtonsoft.Json.4.0.2\lib\sl3-wp\Newtonsoft.Json.WindowsPhone.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="system" />
@@ -244,6 +244,9 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions />

diff --git a/RestSharp.WindowsPhone.Mango/packages.config b/RestSharp.WindowsPhone.Mango/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="4.0.3" />
+</packages>
diff --git a/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj b/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json.WindowsPhone, Version=4.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.4.0.2\lib\sl3-wp\Newtonsoft.Json.WindowsPhone.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="system" />

diff --git a/RestSharp.sln b/RestSharp.sln
@@ -12,6 +12,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.WindowsPhone", "RestSharp.WindowsPhone\RestSharp.WindowsPhone.csproj", "{F4D48DF6-316E-4963-B5C1-59CA39B431B7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{E709A928-A45C-4622-A35C-CCD8EE44CA80}"
+	ProjectSection(SolutionItems) = preProject
+		restsharp.nuspec = restsharp.nuspec
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.WindowsPhone.Mango", "RestSharp.WindowsPhone.Mango\RestSharp.WindowsPhone.Mango.csproj", "{71647E33-714F-4975-8368-71B075045272}"
 EndProject

diff --git a/RestSharp/SharedAssemblyInfo.cs b/RestSharp/SharedAssemblyInfo.cs
@@ -23,5 +23,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("102.0.0.0")]
-[assembly: AssemblyFileVersion("102.0.0.0")]
+[assembly: AssemblyVersion("102.3.0.0")]
+[assembly: AssemblyFileVersion("102.3.0.0")]
diff --git a/package.cmd b/package.cmd
@@ -1,17 +1,13 @@
-if not exist Download mkdir Download
-if not exist Download\WindowsPhone mkdir Download\WindowsPhone
 if not exist Download\WindowsPhone\7.0\ mkdir Download\WindowsPhone\7.0\
 if not exist Download\WindowsPhone\7.1\ mkdir Download\WindowsPhone\7.1\
-if not exist Download\package mkdir Download\package
-if not exist Download\package\lib mkdir Download\package\lib
 if not exist Download\package\lib\net35 mkdir Download\package\lib\net35
 if not exist Download\package\lib\net35-client mkdir Download\package\lib\net35-client
 if not exist Download\package\lib\sl3-wp mkdir Download\package\lib\sl3-wp
 if not exist Download\package\lib\sl4-wp71 mkdir Download\package\lib\sl4-wp71
 if not exist Download\package\lib\sl4 mkdir Download\package\lib\sl4
 
-tools\ilmerge.exe /lib:RestSharp\bin\Release /internalize /ndebug /v2 /out:Download\RestSharp.dll RestSharp.dll Newtonsoft.Json.Net35.dll
-tools\ilmerge.exe /lib:RestSharp.Silverlight\bin\Release /internalize /ndebug /targetplatform:v4,"C:\Program Files (x86)\Microsoft Silverlight\4.0.60129.0" /out:Download\RestSharp.Silverlight.dll RestSharp.Silverlight.dll Newtonsoft.Json.Silverlight.dll System.Xml.Linq.dll
+tools\ilmerge.exe /lib:RestSharp\bin\Release /internalize /ndebug /v2 /out:Download\RestSharp.dll RestSharp.dll Newtonsoft.Json.dll
+tools\ilmerge.exe /lib:RestSharp.Silverlight\bin\Release /internalize /ndebug /targetplatform:v4,"C:\Program Files (x86)\Microsoft Silverlight\4.0.60531.0" /out:Download\RestSharp.Silverlight.dll RestSharp.Silverlight.dll Newtonsoft.Json.dll System.Xml.Linq.dll
 
 copy RestSharp.WindowsPhone\bin\Release\*.dll Download\WindowsPhone\7.0\
 copy RestSharp.WindowsPhone.Mango\bin\Release\*.dll Download\WindowsPhone\7.1\

diff --git a/packages/repositories.config b/packages/repositories.config
@@ -3,7 +3,7 @@
   <repository path="..\RestSharp.Tests\packages.config" />
   <repository path="..\RestSharp.IntegrationTests\packages.config" />
   <repository path="..\RestSharp\packages.config" />
-  <repository path="..\RestSharp.Net4\packages.config" />
   <repository path="..\RestSharp.Silverlight\packages.config" />
   <repository path="..\RestSharp.WindowsPhone\packages.config" />
+  <repository path="..\RestSharp.WindowsPhone.Mango\packages.config" />
 </repositories>
diff --git a/restsharp.nuspec b/restsharp.nuspec
@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>RestSharp</id>
-		<version>102.2</version>
+		<version>102.3</version>
 		<authors>John Sheehan, RestSharp Community</authors>
 		<owners>John Sheehan</owners>
 		<description>Simple REST and HTTP API Client</description>