diff options
author | Rui Marinho <me@ruimarinho.net> | 2016-09-14 22:56:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-14 22:56:17 +0100 |
commit | eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058 (patch) | |
tree | f19a733800ada7f18584a35e2f2c8c01dca9245e /Xamarin.Forms.Maps.iOS | |
parent | e6a2bed3b2a532aa2f937fc6a2957458f4680ef9 (diff) | |
download | xamarin-forms-eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058.tar.gz xamarin-forms-eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058.tar.bz2 xamarin-forms-eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058.zip |
Remove iOS classic from CI system (#353)beta-2.3.3-pre2
* [CI] Remove classic from build
* [Build] Remove classic forwarder
* [Nuget] Remove classic from Pages azure
* [Build] Remove classic csproj
* [IOS] Remove _UNIFIED_
Diffstat (limited to 'Xamarin.Forms.Maps.iOS')
-rw-r--r-- | Xamarin.Forms.Maps.iOS/FormsMaps.cs | 7 | ||||
-rw-r--r-- | Xamarin.Forms.Maps.iOS/GeocoderBackend.cs | 17 | ||||
-rw-r--r-- | Xamarin.Forms.Maps.iOS/MapRenderer.cs | 42 | ||||
-rw-r--r-- | Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.Classic.csproj | 92 | ||||
-rw-r--r-- | Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj | 2 |
5 files changed, 7 insertions, 153 deletions
diff --git a/Xamarin.Forms.Maps.iOS/FormsMaps.cs b/Xamarin.Forms.Maps.iOS/FormsMaps.cs index 91033f78..ca8dca67 100644 --- a/Xamarin.Forms.Maps.iOS/FormsMaps.cs +++ b/Xamarin.Forms.Maps.iOS/FormsMaps.cs @@ -1,10 +1,5 @@ -using Xamarin.Forms.Maps.iOS; -#if __UNIFIED__ using UIKit; - -#else -using MonoTouch.UIKit; -#endif +using Xamarin.Forms.Maps.iOS; namespace Xamarin { diff --git a/Xamarin.Forms.Maps.iOS/GeocoderBackend.cs b/Xamarin.Forms.Maps.iOS/GeocoderBackend.cs index 42b96457..08ffbbec 100644 --- a/Xamarin.Forms.Maps.iOS/GeocoderBackend.cs +++ b/Xamarin.Forms.Maps.iOS/GeocoderBackend.cs @@ -1,23 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -#if __UNIFIED__ -using CoreLocation; using AddressBookUI; -#else -using MonoTouch.AddressBookUI; -using MonoTouch.CoreLocation; -#endif -#if __UNIFIED__ -using RectangleF = CoreGraphics.CGRect; -using SizeF = CoreGraphics.CGSize; -using PointF = CoreGraphics.CGPoint; - -#else -using nfloat=global::System.Single; -using nint=global::System.Int32; -using nuint=global::System.UInt32; -#endif +using CoreLocation; namespace Xamarin.Forms.Maps.iOS { diff --git a/Xamarin.Forms.Maps.iOS/MapRenderer.cs b/Xamarin.Forms.Maps.iOS/MapRenderer.cs index c556d141..3f4e7eb6 100644 --- a/Xamarin.Forms.Maps.iOS/MapRenderer.cs +++ b/Xamarin.Forms.Maps.iOS/MapRenderer.cs @@ -4,31 +4,13 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; -using Xamarin.Forms.Platform.iOS; -#if __UNIFIED__ -using UIKit; -using MapKit; using CoreLocation; using Foundation; -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -using MonoTouch.CoreLocation; -using MonoTouch.MapKit; -using System.Drawing; -#endif -#if __UNIFIED__ -using RectangleF = CoreGraphics.CGRect; -using SizeF = CoreGraphics.CGSize; -using PointF = CoreGraphics.CGPoint; +using MapKit; using ObjCRuntime; - -#else -using nfloat=global::System.Single; -using nint=global::System.Int32; -using nuint=global::System.UInt32; -using MonoTouch.ObjCRuntime; -#endif +using UIKit; +using Xamarin.Forms.Platform.iOS; +using RectangleF = CoreGraphics.CGRect; namespace Xamarin.Forms.Maps.iOS { @@ -44,11 +26,7 @@ namespace Xamarin.Forms.Maps.iOS _map = map; } -#if __UNIFIED__ public override MKAnnotationView GetViewForAnnotation(MKMapView mapView, IMKAnnotation annotation) -#else - public override MKAnnotationView GetViewForAnnotation (MKMapView mapView, NSObject annotation) -#endif { MKPinAnnotationView mapPin = null; @@ -71,11 +49,7 @@ namespace Xamarin.Forms.Maps.iOS return mapPin; } -#if __UNIFIED__ void AttachGestureToPin(MKPinAnnotationView mapPin, IMKAnnotation annotation) -#else - void AttachGestureToPin (MKPinAnnotationView mapPin, NSObject annotation) -#endif { UIGestureRecognizer[] recognizers = mapPin.GestureRecognizers; @@ -238,11 +212,7 @@ namespace Xamarin.Forms.Maps.iOS var annotation = new MKPointAnnotation { Title = pin.Label, Subtitle = pin.Address ?? "" }; pin.Id = annotation; -#if __UNIFIED__ annotation.SetCoordinate(new CLLocationCoordinate2D(pin.Position.Latitude, pin.Position.Longitude)); -#else - annotation.Coordinate = new CLLocationCoordinate2D (pin.Position.Latitude, pin.Position.Longitude); -#endif ((MKMapView)Control).AddAnnotation(annotation); } } @@ -293,11 +263,7 @@ namespace Xamarin.Forms.Maps.iOS void RemovePins(IList pins) { foreach (object pin in pins) -#if __UNIFIED__ ((MKMapView)Control).RemoveAnnotation((IMKAnnotation)((Pin)pin).Id); -#else - ((MKMapView)Control).RemoveAnnotation ((NSObject)((Pin)pin).Id); -#endif } void UpdateHasScrollEnabled() diff --git a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.Classic.csproj b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.Classic.csproj deleted file mode 100644 index 0f5fb89e..00000000 --- a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.Classic.csproj +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform> - <ProductVersion>8.0.30703</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{CA10FACD-22AB-463F-A20E-379C212B0858}</ProjectGuid> - <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <OutputType>Library</OutputType> - <RootNamespace>Xamarin.Forms.Maps.iOS</RootNamespace> - <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> - <AssemblyName>Xamarin.Forms.Maps.iOS.Classic</AssemblyName> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>classic_bin\iPhoneSimulator\Debug</OutputPath> - <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath> - <DefineConstants>DEBUG</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <ConsolePause>false</ConsolePause> - <MtouchDebug>true</MtouchDebug> - <CodesignKey>iPhone Developer</CodesignKey> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>none</DebugType> - <Optimize>true</Optimize> - <OutputPath>classic_bin\iPhoneSimulator\Release</OutputPath> - <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <ConsolePause>false</ConsolePause> - <CodesignKey>iPhone Developer</CodesignKey> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Turkey\</OutputPath> - <DefineConstants>__MOBILE__;__IOS__;DEBUG</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <UseVSHostingProcess>false</UseVSHostingProcess> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|AnyCPU'"> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <ItemGroup> - <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs"> - <Link>Properties\GlobalAssemblyInfo.cs</Link> - </Compile> - <Compile Include="MapRenderer.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="FormsMaps.cs" /> - <Compile Include="GeocoderBackend.cs" /> - </ItemGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Xml" /> - <Reference Include="System.Core" /> - <Reference Include="monotouch" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj"> - <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project> - <Name>Xamarin.Forms.Core</Name> - </ProjectReference> - <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj"> - <Project>{7D13BAC2-C6A4-416A-B07E-C169B199E52B}</Project> - <Name>Xamarin.Forms.Maps</Name> - </ProjectReference> - <ProjectReference Include="..\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS.Classic.csproj"> - <Project>{4a47b5df-ddfc-476b-ac41-5105ff3b9b8b}</Project> - <Name>Xamarin.Forms.Platform.iOS.Classic</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" /> -</Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj index 0318b39e..4ce638ea 100644 --- a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj +++ b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj @@ -42,7 +42,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> <DebugSymbols>true</DebugSymbols> <OutputPath>bin\Turkey\</OutputPath> - <DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;DEBUG</DefineConstants> + <DefineConstants>__MOBILE__;__IOS__;DEBUG</DefineConstants> <DebugType>full</DebugType> <PlatformTarget>AnyCPU</PlatformTarget> <UseVSHostingProcess>false</UseVSHostingProcess> |