Skip to content

Commit d72d3a7

Browse files
hallemhallem
committed
Merge pull request #618 from mattleibow/xamarin-update
Added and updated the Xamarin projects
2 parents 721e360 + 32a89b1 commit d72d3a7

File tree

11 files changed

+328
-174
lines changed

11 files changed

+328
-174
lines changed

‎RestSharp.MonoDroid/Properties/AssemblyInfo.cs‎ renamed to ‎RestSharp.Android/Properties/AssemblyInfo.cs‎

File renamed without changes.

‎RestSharp.MonoDroid/RestSharp.MonoDroid.csproj‎ renamed to ‎RestSharp.Android/RestSharp.Android.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
86
<ProjectGuid>{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}</ProjectGuid>
97
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
108
<OutputType>Library</OutputType>
119
<RootNamespace>RestSharp</RootNamespace>
12-
<AssemblyName>RestSharp.MonoDroid</AssemblyName>
10+
<AssemblyName>RestSharp.Android</AssemblyName>
1311
<FileAlignment>512</FileAlignment>
1412
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
15-
<AndroidSupportedAbis>armeabi</AndroidSupportedAbis>
16-
<AndroidStoreUncompressedFileExtensions />
17-
<MandroidI18n />
13+
<TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
1814
</PropertyGroup>
1915
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2016
<DebugSymbols>true</DebugSymbols>
@@ -24,6 +20,7 @@
2420
<DefineConstants>TRACE;DEBUG;MONODROID;FRAMEWORK</DefineConstants>
2521
<ErrorReport>prompt</ErrorReport>
2622
<WarningLevel>4</WarningLevel>
23+
<AndroidLinkMode>None</AndroidLinkMode>
2724
</PropertyGroup>
2825
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2926
<DebugType>pdbonly</DebugType>
@@ -32,6 +29,7 @@
3229
<DefineConstants>TRACE;MONODROID;FRAMEWORK</DefineConstants>
3330
<ErrorReport>prompt</ErrorReport>
3431
<WarningLevel>4</WarningLevel>
32+
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
3533
</PropertyGroup>
3634
<ItemGroup>
3735
<Reference Include="mscorlib" />
@@ -44,6 +42,9 @@
4442
<Compile Include="..\RestSharp\Enum.cs">
4543
<Link>Enum.cs</Link>
4644
</Compile>
45+
<Compile Include="..\RestSharp\Extensions\ResponseStatusExtensions.cs">
46+
<Link>Extensions\ResponseStatusExtensions.cs</Link>
47+
</Compile>
4748
<Compile Include="..\RestSharp\FileParameter.cs">
4849
<Link>FileParameter.cs</Link>
4950
</Compile>
@@ -254,10 +255,9 @@
254255
<Compile Include="..\RestSharp\SharedAssemblyInfo.cs">
255256
<Link>SharedAssemblyInfo.cs</Link>
256257
</Compile>
257-
<Compile Include="Extensions\ResponseStatusExtensions.cs" />
258258
<Compile Include="Properties\AssemblyInfo.cs" />
259259
</ItemGroup>
260-
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
260+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
261261
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
262262
Other similar extension points exist, see Microsoft.Common.targets.
263263
<Target Name="BeforeBuild">

‎RestSharp.MonoDroid/Extensions/ResponseStatusExtensions.cs‎

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

‎RestSharp.MonoDroid/RestSharp.MonoDroid.sln‎

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

‎RestSharp.MonoTouch/Extensions/ResponseStatusExtensions.cs‎

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

‎RestSharp.MonoTouch/RestSharp.MonoTouch.csproj‎

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,37 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
6-
<ProductVersion>10.0.0</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
86
<ProjectGuid>{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}</ProjectGuid>
97
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
108
<OutputType>Library</OutputType>
119
<RootNamespace>RestSharp</RootNamespace>
1210
<MtouchSdkVersion>3.2</MtouchSdkVersion>
1311
<MtouchMinimumOS>3.0</MtouchMinimumOS>
14-
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
1512
<AssemblyName>RestSharp.MonoTouch</AssemblyName>
1613
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1815
<DebugSymbols>true</DebugSymbols>
1916
<DebugType>full</DebugType>
2017
<Optimize>false</Optimize>
21-
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
18+
<OutputPath>bin\Debug</OutputPath>
2219
<DefineConstants>DEBUG;MONOTOUCH;FRAMEWORK</DefineConstants>
2320
<ErrorReport>prompt</ErrorReport>
2421
<WarningLevel>4</WarningLevel>
2522
<MtouchDebug>True</MtouchDebug>
2623
<ConsolePause>false</ConsolePause>
27-
<MtouchLink>None</MtouchLink>
28-
<MtouchUseLlvm>false</MtouchUseLlvm>
2924
<MtouchArch>ARMv6</MtouchArch>
30-
<MtouchUseThumb>false</MtouchUseThumb>
31-
<MtouchUseSGen>false</MtouchUseSGen>
3225
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
3326
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3528
<DebugType>none</DebugType>
3629
<Optimize>false</Optimize>
37-
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
30+
<OutputPath>bin\Release</OutputPath>
3831
<ErrorReport>prompt</ErrorReport>
3932
<WarningLevel>4</WarningLevel>
40-
<MtouchDebug>False</MtouchDebug>
4133
<ConsolePause>false</ConsolePause>
42-
<MtouchLink>None</MtouchLink>
4334
<DefineConstants>MONOTOUCH;FRAMEWORK</DefineConstants>
44-
<MtouchUseLlvm>false</MtouchUseLlvm>
4535
<MtouchArch>ARMv6</MtouchArch>
46-
<MtouchUseThumb>false</MtouchUseThumb>
47-
<MtouchUseSGen>false</MtouchUseSGen>
48-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
49-
</PropertyGroup>
50-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
51-
<DebugSymbols>true</DebugSymbols>
52-
<DebugType>full</DebugType>
53-
<Optimize>false</Optimize>
54-
<OutputPath>bin\iPhone\Debug</OutputPath>
55-
<DefineConstants>DEBUG;MONOTOUCH;FRAMEWORK</DefineConstants>
56-
<ErrorReport>prompt</ErrorReport>
57-
<WarningLevel>4</WarningLevel>
58-
<MtouchDebug>True</MtouchDebug>
59-
<ConsolePause>false</ConsolePause>
60-
<CodesignKey>iPhone Developer</CodesignKey>
61-
<MtouchUseLlvm>false</MtouchUseLlvm>
62-
<MtouchArch>ARMv6</MtouchArch>
63-
<MtouchUseThumb>false</MtouchUseThumb>
64-
<MtouchUseSGen>false</MtouchUseSGen>
65-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
66-
</PropertyGroup>
67-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
68-
<DebugType>none</DebugType>
69-
<Optimize>false</Optimize>
70-
<OutputPath>bin\iPhone\Release</OutputPath>
71-
<ErrorReport>prompt</ErrorReport>
72-
<WarningLevel>4</WarningLevel>
73-
<MtouchDebug>False</MtouchDebug>
74-
<ConsolePause>false</ConsolePause>
75-
<CodesignKey>iPhone Developer</CodesignKey>
76-
<DefineConstants>MONOTOUCH;FRAMEWORK</DefineConstants>
77-
<MtouchUseLlvm>false</MtouchUseLlvm>
78-
<MtouchArch>ARMv6</MtouchArch>
79-
<MtouchUseThumb>false</MtouchUseThumb>
80-
<MtouchUseSGen>false</MtouchUseSGen>
8136
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
8237
</PropertyGroup>
8338
<ItemGroup>
@@ -87,12 +42,13 @@
8742
<Reference Include="monotouch" />
8843
<Reference Include="System.Xml.Linq" />
8944
</ItemGroup>
90-
<Import Project="$(ProgramFiles)\MSBuild\MonoTouch\Novell.MonoTouch.Common.targets" Condition="'$(windir)' != '' " />
91-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
9245
<ItemGroup>
9346
<Compile Include="..\RestSharp\Enum.cs">
9447
<Link>Enum.cs</Link>
9548
</Compile>
49+
<Compile Include="..\RestSharp\Extensions\ResponseStatusExtensions.cs">
50+
<Link>Extensions\ResponseStatusExtensions.cs</Link>
51+
</Compile>
9652
<Compile Include="..\RestSharp\FileParameter.cs">
9753
<Link>FileParameter.cs</Link>
9854
</Compile>
@@ -303,7 +259,7 @@
303259
<Compile Include="..\RestSharp\SharedAssemblyInfo.cs">
304260
<Link>SharedAssemblyInfo.cs</Link>
305261
</Compile>
306-
<Compile Include="Extensions\ResponseStatusExtensions.cs" />
307262
<Compile Include="Properties\AssemblyInfo.cs" />
308263
</ItemGroup>
264+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
309265
</Project>

‎RestSharp.MonoTouch/RestSharp.MonoTouch.sln‎

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

‎RestSharp.Xamarin.sln‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.MonoTouch", "RestSharp.MonoTouch\RestSharp.MonoTouch.csproj", "{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}"
5+
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.iOS", "RestSharp.iOS\RestSharp.iOS.csproj", "{7CBC38E5-BABF-4E79-86CA-41C42222FC85}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Android", "RestSharp.Android\RestSharp.Android.csproj", "{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Release|Any CPU.Build.0 = Release|Any CPU
28+
EndGlobalSection
29+
GlobalSection(MonoDevelopProperties) = preSolution
30+
StartupItem = RestSharp.MonoTouch\RestSharp.MonoTouch.csproj
31+
EndGlobalSection
32+
EndGlobal

‎RestSharp.iOS/Properties/AssemblyInfo.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("RestSharp.MonoTouch")]
9+
10+
// Setting ComVisible to false makes the types in this assembly not visible
11+
// to COM components. If you need to access a type in this assembly from
12+
// COM, set the ComVisible attribute to true on that type.
13+
[assembly: ComVisible(false)]
14+
15+
// The following GUID is for the ID of the typelib if this project is exposed to COM
16+
[assembly: Guid("0F11B2CA-D65D-4B63-92B2-E4C0B1AACB6E")]

0 commit comments

Comments
 (0)