Skip to content

Commit 2afed66

Browse files
author
Michael Hallett
committed
brought xamarin projects into all sln; trying to get nuget support for them as well;
1 parent 399aa25 commit 2afed66

File tree

12 files changed

+295
-390
lines changed

12 files changed

+295
-390
lines changed

‎RestSharp.2015.sln‎

Lines changed: 0 additions & 277 deletions
This file was deleted.

‎RestSharp.All.sln‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Net452.Signed", "
6565
EndProject
6666
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Tests.Signed", "RestSharp.Tests\RestSharp.Tests.Signed.csproj", "{25D4AAB0-B538-4F13-AB0E-96247307858B}"
6767
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Net4.Client", "RestSharp.Net4.Client\RestSharp.Net4.Client.csproj", "{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}"
69+
EndProject
70+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Net4.Client.Signed", "RestSharp.Net4.Client\RestSharp.Net4.Client.Signed.csproj", "{CE439183-9CC6-4767-9041-016E3576D0F6}"
71+
EndProject
72+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Android", "RestSharp.Android\RestSharp.Android.csproj", "{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}"
73+
EndProject
74+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.iOS", "RestSharp.iOS\RestSharp.iOS.csproj", "{7CBC38E5-BABF-4E79-86CA-41C42222FC85}"
75+
EndProject
76+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.MonoTouch", "RestSharp.MonoTouch\RestSharp.MonoTouch.csproj", "{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}"
77+
EndProject
6878
Global
6979
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7080
Debug|Any CPU = Debug|Any CPU
@@ -444,6 +454,87 @@ Global
444454
{25D4AAB0-B538-4F13-AB0E-96247307858B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
445455
{25D4AAB0-B538-4F13-AB0E-96247307858B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
446456
{25D4AAB0-B538-4F13-AB0E-96247307858B}.Release|x86.ActiveCfg = Release|Any CPU
457+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
458+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
459+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Debug|ARM.ActiveCfg = Debug|Any CPU
460+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
461+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
462+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Debug|x86.ActiveCfg = Debug|Any CPU
463+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.DebugAppveyor|Any CPU.ActiveCfg = Debug|Any CPU
464+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.DebugAppveyor|Any CPU.Build.0 = Debug|Any CPU
465+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.DebugAppveyor|ARM.ActiveCfg = Debug|Any CPU
466+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.DebugAppveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
467+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.DebugAppveyor|Mixed Platforms.Build.0 = Debug|Any CPU
468+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.DebugAppveyor|x86.ActiveCfg = Debug|Any CPU
469+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
470+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Release|Any CPU.Build.0 = Release|Any CPU
471+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Release|ARM.ActiveCfg = Release|Any CPU
472+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
473+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
474+
{67D441EA-FE5A-419F-ABD2-32E5B954A7C8}.Release|x86.ActiveCfg = Release|Any CPU
475+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
476+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
477+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Debug|ARM.ActiveCfg = Debug|Any CPU
478+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
479+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
480+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Debug|x86.ActiveCfg = Debug|Any CPU
481+
{CE439183-9CC6-4767-9041-016E3576D0F6}.DebugAppveyor|Any CPU.ActiveCfg = Debug|Any CPU
482+
{CE439183-9CC6-4767-9041-016E3576D0F6}.DebugAppveyor|Any CPU.Build.0 = Debug|Any CPU
483+
{CE439183-9CC6-4767-9041-016E3576D0F6}.DebugAppveyor|ARM.ActiveCfg = Debug|Any CPU
484+
{CE439183-9CC6-4767-9041-016E3576D0F6}.DebugAppveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
485+
{CE439183-9CC6-4767-9041-016E3576D0F6}.DebugAppveyor|Mixed Platforms.Build.0 = Debug|Any CPU
486+
{CE439183-9CC6-4767-9041-016E3576D0F6}.DebugAppveyor|x86.ActiveCfg = Debug|Any CPU
487+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
488+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Release|Any CPU.Build.0 = Release|Any CPU
489+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Release|ARM.ActiveCfg = Release|Any CPU
490+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
491+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
492+
{CE439183-9CC6-4767-9041-016E3576D0F6}.Release|x86.ActiveCfg = Release|Any CPU
493+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
494+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|ARM.ActiveCfg = Debug|Any CPU
495+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
496+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
497+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|x86.ActiveCfg = Debug|Any CPU
498+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.DebugAppveyor|Any CPU.ActiveCfg = Debug|Any CPU
499+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.DebugAppveyor|ARM.ActiveCfg = Debug|Any CPU
500+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.DebugAppveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
501+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.DebugAppveyor|Mixed Platforms.Build.0 = Debug|Any CPU
502+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.DebugAppveyor|x86.ActiveCfg = Debug|Any CPU
503+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
504+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Release|ARM.ActiveCfg = Release|Any CPU
505+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
506+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
507+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Release|x86.ActiveCfg = Release|Any CPU
508+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
509+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|ARM.ActiveCfg = Debug|Any CPU
510+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
511+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
512+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|x86.ActiveCfg = Debug|Any CPU
513+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.DebugAppveyor|Any CPU.ActiveCfg = Debug|Any CPU
514+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.DebugAppveyor|ARM.ActiveCfg = Debug|Any CPU
515+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.DebugAppveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
516+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.DebugAppveyor|Mixed Platforms.Build.0 = Debug|Any CPU
517+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.DebugAppveyor|x86.ActiveCfg = Debug|Any CPU
518+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Release|Any CPU.ActiveCfg = Release|Any CPU
519+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Release|ARM.ActiveCfg = Release|Any CPU
520+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
521+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
522+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Release|x86.ActiveCfg = Release|Any CPU
523+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
524+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|ARM.ActiveCfg = Debug|Any CPU
525+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
526+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
527+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|x86.ActiveCfg = Debug|Any CPU
528+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.DebugAppveyor|Any CPU.ActiveCfg = Debug|Any CPU
529+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.DebugAppveyor|ARM.ActiveCfg = Debug|Any CPU
530+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.DebugAppveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
531+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.DebugAppveyor|Mixed Platforms.Build.0 = Debug|Any CPU
532+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.DebugAppveyor|x86.ActiveCfg = Debug|Any CPU
533+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
534+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Release|ARM.ActiveCfg = Release|Any CPU
535+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
536+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
537+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Release|x86.ActiveCfg = Release|Any CPU
447538
EndGlobalSection
448539
GlobalSection(SolutionProperties) = preSolution
449540
HideSolutionNode = FALSE

‎RestSharp.Android/RestSharp.Android.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
88
<OutputType>Library</OutputType>
99
<RootNamespace>RestSharp</RootNamespace>
10-
<AssemblyName>RestSharp.Android</AssemblyName>
10+
<AssemblyName>RestSharp</AssemblyName>
1111
<FileAlignment>512</FileAlignment>
1212
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
13-
<TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
14+
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>

‎RestSharp.Build/NuSpecUpdateTask.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ private void GenerateComputedSpecFile()
6464
ReplaceToken(metaNode, "owners", this.Authors);
6565
ReplaceToken(metaNode, "description", this.Description);
6666
ReplaceToken(metaNode, "version", this.Version);
67-
67+
#if SIGNED
68+
doc.Save(this.SpecFile.Replace(".nuspec", "-signed-computed.nuspec"));
69+
#else
6870
doc.Save(this.SpecFile.Replace(".nuspec", "-computed.nuspec"));
71+
#endif
6972
}
7073

7174
private static void ReplaceToken(XContainer metaNode, XName name, string value)

‎RestSharp.Mono.sln‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎RestSharp.MonoTouch/RestSharp.MonoTouch.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<RootNamespace>RestSharp</RootNamespace>
1010
<MtouchSdkVersion>3.2</MtouchSdkVersion>
1111
<MtouchMinimumOS>3.0</MtouchMinimumOS>
12-
<AssemblyName>RestSharp.MonoTouch</AssemblyName>
12+
<AssemblyName>RestSharp</AssemblyName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1515
<DebugSymbols>true</DebugSymbols>

‎RestSharp.iOS/RestSharp.iOS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<RootNamespace>RestSharp</RootNamespace>
1010
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
11-
<AssemblyName>RestSharp.iOS</AssemblyName>
11+
<AssemblyName>RestSharp</AssemblyName>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>

‎RestSharp/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
[assembly: InternalsVisibleTo("RestSharp.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d"),
2323
InternalsVisibleTo("RestSharp.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d")]
2424
#else
25-
2625
[assembly: InternalsVisibleTo("RestSharp.IntegrationTests"),
2726
InternalsVisibleTo("RestSharp.Tests")]
2827
#endif

‎RestSharp/SharedAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ internal class SharedAssemblyInfo
4242
{
4343
#if SIGNED
4444
public const string VERSION = "100.0.0";
45-
public const string FILE_VERSION = "105.1.0";
45+
public const string FILE_VERSION = "105.2.2";
4646
#else
47-
public const string VERSION = "105.1.0";
47+
public const string VERSION = "105.2.2";
4848
#endif
4949
}
5050
}

0 commit comments

Comments
 (0)