Skip to content

Commit 19d3854

Browse files
johnsheehanjohnsheehan
committed
fixing refs again and bumping to 102.3
1 parent c08b548 commit 19d3854

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

‎RestSharp.Tests/RestSharp.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@
6464
</Reference>
6565
<Reference Include="System.Data" />
6666
<Reference Include="System.Xml" />
67-
<Reference Include="Newtonsoft.Json.Net35, Version=4.0.2.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\Newtonsoft.Json.4.0.2\lib\net35\Newtonsoft.Json.Net35.dll</HintPath>
70-
</Reference>
7167
<Reference Include="xunit, Version=1.8.0.1549, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
7268
<SpecificVersion>False</SpecificVersion>
7369
<HintPath>..\packages\xunit.1.8.0.1549\lib\xunit.dll</HintPath>

‎RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<DocumentationFile>Bin\Release\RestSharp.WindowsPhone.xml</DocumentationFile>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="Newtonsoft.Json.WindowsPhone">
47-
<HintPath>..\packages\Newtonsoft.Json.4.0.2\lib\sl3-wp\Newtonsoft.Json.WindowsPhone.dll</HintPath>
46+
<Reference Include="Newtonsoft.Json">
47+
<HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
4848
</Reference>
4949
<Reference Include="System.Windows" />
5050
<Reference Include="system" />
@@ -244,6 +244,9 @@
244244
</Compile>
245245
<Compile Include="Properties\AssemblyInfo.cs" />
246246
</ItemGroup>
247+
<ItemGroup>
248+
<None Include="packages.config" />
249+
</ItemGroup>
247250
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
248251
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
249252
<ProjectExtensions />

‎RestSharp.WindowsPhone.Mango/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Newtonsoft.Json" version="4.0.3" />
4+
</packages>

‎RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="mscorlib" />
47-
<Reference Include="Newtonsoft.Json.WindowsPhone, Version=4.0.2.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Newtonsoft.Json.4.0.2\lib\sl3-wp\Newtonsoft.Json.WindowsPhone.dll</HintPath>
47+
<Reference Include="Newtonsoft.Json">
48+
<HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System.Windows" />
5151
<Reference Include="system" />

‎RestSharp.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.WindowsPhone", "RestSharp.WindowsPhone\RestSharp.WindowsPhone.csproj", "{F4D48DF6-316E-4963-B5C1-59CA39B431B7}"
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{E709A928-A45C-4622-A35C-CCD8EE44CA80}"
15+
ProjectSection(SolutionItems) = preProject
16+
restsharp.nuspec = restsharp.nuspec
17+
EndProjectSection
1518
EndProject
1619
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.WindowsPhone.Mango", "RestSharp.WindowsPhone.Mango\RestSharp.WindowsPhone.Mango.csproj", "{71647E33-714F-4975-8368-71B075045272}"
1720
EndProject

‎RestSharp/SharedAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
// You can specify all the values or you can default the Build and Revision Numbers
2424
// by using the '*' as shown below:
2525
// [assembly: AssemblyVersion("1.0.*")]
26-
[assembly: AssemblyVersion("102.0.0.0")]
27-
[assembly: AssemblyFileVersion("102.0.0.0")]
26+
[assembly: AssemblyVersion("102.3.0.0")]
27+
[assembly: AssemblyFileVersion("102.3.0.0")]

‎package.cmd‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
if not exist Download mkdir Download
2-
if not exist Download\WindowsPhone mkdir Download\WindowsPhone
31
if not exist Download\WindowsPhone\7.0\ mkdir Download\WindowsPhone\7.0\
42
if not exist Download\WindowsPhone\7.1\ mkdir Download\WindowsPhone\7.1\
5-
if not exist Download\package mkdir Download\package
6-
if not exist Download\package\lib mkdir Download\package\lib
73
if not exist Download\package\lib\net35 mkdir Download\package\lib\net35
84
if not exist Download\package\lib\net35-client mkdir Download\package\lib\net35-client
95
if not exist Download\package\lib\sl3-wp mkdir Download\package\lib\sl3-wp
106
if not exist Download\package\lib\sl4-wp71 mkdir Download\package\lib\sl4-wp71
117
if not exist Download\package\lib\sl4 mkdir Download\package\lib\sl4
128

13-
tools\ilmerge.exe /lib:RestSharp\bin\Release /internalize /ndebug /v2 /out:Download\RestSharp.dll RestSharp.dll Newtonsoft.Json.Net35.dll
14-
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
9+
tools\ilmerge.exe /lib:RestSharp\bin\Release /internalize /ndebug /v2 /out:Download\RestSharp.dll RestSharp.dll Newtonsoft.Json.dll
10+
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
1511

1612
copy RestSharp.WindowsPhone\bin\Release\*.dll Download\WindowsPhone\7.0\
1713
copy RestSharp.WindowsPhone.Mango\bin\Release\*.dll Download\WindowsPhone\7.1\

‎packages/repositories.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<repository path="..\RestSharp.Tests\packages.config" />
44
<repository path="..\RestSharp.IntegrationTests\packages.config" />
55
<repository path="..\RestSharp\packages.config" />
6-
<repository path="..\RestSharp.Net4\packages.config" />
76
<repository path="..\RestSharp.Silverlight\packages.config" />
87
<repository path="..\RestSharp.WindowsPhone\packages.config" />
8+
<repository path="..\RestSharp.WindowsPhone.Mango\packages.config" />
99
</repositories>

‎restsharp.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>RestSharp</id>
5-
<version>102.2</version>
5+
<version>102.3</version>
66
<authors>John Sheehan, RestSharp Community</authors>
77
<owners>John Sheehan</owners>
88
<description>Simple REST and HTTP API Client</description>

0 commit comments

Comments
 (0)