Merge branch 'master' of https://github.com/escfrya/Locator

Conflicts: Locator.ServiceContract/Locator.ServiceContract.iOS.csproj
escfrya · Jan 22, 2014 · 43276c1 · 43276c1
2 parents 8d4cedb + 5c03df3
commit 43276c1
Show file tree

Hide file tree

Showing 13 changed files with 350 additions and 158 deletions.
diff --git a/Locator.Entity/Locator.Entity.iOS.csproj b/Locator.Entity/Locator.Entity.iOS.csproj
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"></Import>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')">
+  </Import>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{8B5C2664-525D-40BF-B25F-BB3E27888C97}</ProjectGuid>
-<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Locator.Entity</RootNamespace>
     <AssemblyName>Locator.Entity</AssemblyName>
-
     <FileAlignment>512</FileAlignment>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,33 +33,43 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"></Reference>
-    <Reference Include="System.Core"></Reference>
-    <Reference Include="System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="System">
     </Reference>
-    <Reference Include="System.XML"></Reference>
-    <Reference Include="System.Xml.Linq"></Reference>
-    <Reference Include="System.Data.DataSetExtensions"></Reference>
-    <Reference Include="Microsoft.CSharp"></Reference>
-    <Reference Include="System.Data"></Reference>
+    <Reference Include="System.Core">
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+    </Reference>
+    <Reference Include="Microsoft.CSharp">
+    </Reference>
+    <Reference Include="System.Data">
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BaseEntity.cs"></Compile>
-    <Compile Include="Entities\Locations.cs"></Compile>
-    <Compile Include="Entities\User.cs"></Compile>
-    <Compile Include="Entities\UserFriends.cs"></Compile>
-    <Compile Include="Entities\UserPush.cs"></Compile>
-    <Compile Include="Properties\AssemblyInfo.cs"></Compile>
+    <Compile Include="BaseEntity.cs">
+    </Compile>
+    <Compile Include="Entities\Locations.cs">
+    </Compile>
+    <Compile Include="Entities\User.cs">
+    </Compile>
+    <Compile Include="Entities\UserFriends.cs">
+    </Compile>
+    <Compile Include="Entities\UserPush.cs">
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <WCFMetadata Include="Service References\"></WCFMetadata>
+    <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"></Import>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets">
+  </Import>
   <PropertyGroup>
     <PostBuildEvent>$(ProjectDir)..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\Tools\WP8.xslt -o $(ProjectDir)$(ProjectName).WP8.csproj
 $(ProjectDir)..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\Tools\ios.xslt -o $(ProjectDir)$(ProjectName).iOS.csproj
 $(ProjectDir)..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\Tools\android.xslt -o $(ProjectDir)$(ProjectName).Android.csproj</PostBuildEvent>
   </PropertyGroup>
-
 </Project>
diff --git a/Locator.Mobile/Locator.Mobile.BL/Locator.Mobile.BL.iOS.csproj b/Locator.Mobile/Locator.Mobile.BL/Locator.Mobile.BL.iOS.csproj
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"></Import>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')">
+  </Import>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{A5007BE4-6A3D-4159-9AC0-DAF4037380F5}</ProjectGuid>
-<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Locator.Mobile.BL</RootNamespace>
     <AssemblyName>Locator.Mobile.BL</AssemblyName>
-
     <FileAlignment>512</FileAlignment>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,33 +33,53 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"></Reference>
-    <Reference Include="System.Core"></Reference>
-    <Reference Include="System.Xml.Linq"></Reference>
-    <Reference Include="System.Data.DataSetExtensions"></Reference>
-    <Reference Include="Microsoft.CSharp"></Reference>
-    <Reference Include="System.Data"></Reference>
-    <Reference Include="System.Xml"></Reference>
+    <Reference Include="System">
+    </Reference>
+    <Reference Include="System.Core">
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+    </Reference>
+    <Reference Include="Microsoft.CSharp">
+    </Reference>
+    <Reference Include="System.Data">
+    </Reference>
+    <Reference Include="System.Xml">
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Client\ExecuteParams.cs"></Compile>
-    <Compile Include="Client\IExecuteParams.cs"></Compile>
-    <Compile Include="Client\IRequestClient.cs"></Compile>
-    <Compile Include="Client\ISerializer.cs"></Compile>
-    <Compile Include="Client\RequestClient.cs"></Compile>
-    <Compile Include="Exceptions\HttpCodeException.cs"></Compile>
-    <Compile Include="Exceptions\NetworkException.cs"></Compile>
-    <Compile Include="Exceptions\NotLoggedException.cs"></Compile>
-    <Compile Include="HTTPType.cs"></Compile>
-    <Compile Include="Properties\AssemblyInfo.cs"></Compile>
+    <Compile Include="Client\ExecuteParams.cs">
+    </Compile>
+    <Compile Include="Client\IExecuteParams.cs">
+    </Compile>
+    <Compile Include="Client\IRequestClient.cs">
+    </Compile>
+    <Compile Include="Client\ISerializer.cs">
+    </Compile>
+    <Compile Include="Client\RequestClient.cs">
+    </Compile>
+    <Compile Include="Exceptions\HttpCodeException.cs">
+    </Compile>
+    <Compile Include="Exceptions\NetworkException.cs">
+    </Compile>
+    <Compile Include="Exceptions\NotLoggedException.cs">
+    </Compile>
+    <Compile Include="HTTPType.cs">
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+    </Compile>
     <Compile Include="Request\Requests1.g.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Requests.tt</DependentUpon>
     </Compile>
-    <Compile Include="Response\BaseResponse.cs"></Compile>
-    <Compile Include="Response\RequestResponse.cs"></Compile>
-    <Compile Include="ServiceClient\BaseClient.cs"></Compile>
+    <Compile Include="Response\BaseResponse.cs">
+    </Compile>
+    <Compile Include="Response\RequestResponse.cs">
+    </Compile>
+    <Compile Include="ServiceClient\BaseClient.cs">
+    </Compile>
     <Compile Include="ServiceClient\IServiceCommandFactory1.g.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -68,9 +90,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>ServiceCommandFactory.tt</DependentUpon>
     </Compile>
-    <Compile Include="UserSettings.cs"></Compile>
+    <Compile Include="UserSettings.cs">
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
   </ItemGroup>
-  <ItemGroup></ItemGroup>
   <ItemGroup>
     <None Include="Request\Requests.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
@@ -86,27 +110,27 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}"></Service>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Locator.Entity\Locator.Entity.iOS.csproj">
-      <Project>{8b5c2664-525d-40bf-b25f-bb3e27888c97}</Project>
+      <Project>{8B5C2664-525D-40BF-B25F-BB3E27888C97}</Project>
       <Name>Locator.Entity.iOS</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Locator.ServiceContract\Locator.ServiceContract.iOS.csproj">
-      <Project>{bd5eb34d-1875-4e8c-867a-b18dd8bbd659}</Project>
+      <Project>{BD5EB34D-1875-4E8C-867A-B18DD8BBD659}</Project>
       <Name>Locator.ServiceContract.iOS</Name>
     </ProjectReference>
     <ProjectReference Include="..\Locator.Mobile.DAL\Locator.Mobile.DAL.iOS.csproj">
-      <Project>{0ae488fc-1a38-422f-9e68-bba72d784407}</Project>
+      <Project>{0AE488FC-1A38-422F-9E68-BBA72D784407}</Project>
       <Name>Locator.Mobile.DAL.iOS</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"></Import>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets">
+  </Import>
   <PropertyGroup>
     <PostBuildEvent>$(ProjectDir)..\..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\..\Tools\WP8.xslt -o $(ProjectDir)$(ProjectName).WP8.csproj
 $(ProjectDir)..\..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\..\Tools\ios.xslt -o $(ProjectDir)$(ProjectName).iOS.csproj
 $(ProjectDir)..\..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\..\Tools\android.xslt -o $(ProjectDir)$(ProjectName).Android.csproj</PostBuildEvent>
   </PropertyGroup>
-
 </Project>
diff --git a/Locator.Mobile/Locator.Mobile.Client/Locator.Mobile.Client.iOS.csproj b/Locator.Mobile/Locator.Mobile.Client/Locator.Mobile.Client.iOS.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"></Import>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')">
+  </Import>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B085F057-5FCD-4595-A3BD-A64FDF062B09}</ProjectGuid>
-<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Locator.Mobile.Client</RootNamespace>
     <AssemblyName>Locator.Mobile.Client</AssemblyName>
-
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -35,30 +35,43 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Libs\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="RestSharp.WindowsPhone">
       <HintPath>..\..\Libs\RestSharp.WindowsPhone.dll</HintPath>
     </Reference>
-    <Reference Include="System"></Reference>
-    <Reference Include="System.Core"></Reference>
-    <Reference Include="System.Xml.Linq"></Reference>
-    <Reference Include="System.Data.DataSetExtensions"></Reference>
-    <Reference Include="Microsoft.CSharp"></Reference>
-    <Reference Include="System.Data"></Reference>
-    <Reference Include="System.Xml"></Reference>
+    <Reference Include="System">
+    </Reference>
+    <Reference Include="System.Core">
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+    </Reference>
+    <Reference Include="Microsoft.CSharp">
+    </Reference>
+    <Reference Include="System.Data">
+    </Reference>
+    <Reference Include="System.Xml">
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\Libs\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Bootstrapper.cs">
+    </Compile>
+    <Compile Include="ClientImpl\JsonNetSerializer.cs">
+    </Compile>
+    <Compile Include="ClientImpl\RestSharpClient.cs">
+    </Compile>
+    <Compile Include="ClientImpl\RestWebClient.cs">
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+    </Compile>
+    <Compile Include="TinyIoC.cs">
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Bootstrapper.cs"></Compile>
-    <Compile Include="ClientImpl\JsonNetSerializer.cs"></Compile>
-    <Compile Include="ClientImpl\RestSharpClient.cs"></Compile>
-    <Compile Include="ClientImpl\RestWebClient.cs"></Compile>
-    <Compile Include="Properties\AssemblyInfo.cs"></Compile>
-    <Compile Include="TinyIoC.cs"></Compile>
   </ItemGroup>
-  <ItemGroup></ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Locator.Entity\Locator.Entity.iOS.csproj">
       <Project>{8B5C2664-525D-40BF-B25F-BB3E27888C97}</Project>
@@ -74,14 +87,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"></None>
+    <None Include="packages.config">
+    </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"></Import>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets">
+  </Import>
   <PropertyGroup>
     <PostBuildEvent>$(ProjectDir)..\..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\..\Tools\WP8.xslt -o $(ProjectDir)$(ProjectName).WP8.csproj
 $(ProjectDir)..\..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\..\Tools\ios.xslt -o $(ProjectDir)$(ProjectName).iOS.csproj
 $(ProjectDir)..\..\Tools\msxsl.exe $(ProjectPath) $(ProjectDir)..\..\Tools\android.xslt -o $(ProjectDir)$(ProjectName).Android.csproj</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')"></Import>
-
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')">
+  </Import>
 </Project>