summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.nuspec/Xamarin.Forms.Maps.nuspec17
-rw-r--r--.nuspec/Xamarin.Forms.Pages.Azure.nuspec11
-rw-r--r--.nuspec/Xamarin.Forms.Pages.nuspec9
-rw-r--r--.nuspec/Xamarin.Forms.nuspec112
-rw-r--r--Stubs/Xamarin.Forms.Platform.iOS.Classic/Properties/AssemblyInfo.cs37
-rw-r--r--Stubs/Xamarin.Forms.Platform.iOS.Classic/Xamarin.Forms.Platform.iOS.Classic (Forwarders).csproj65
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs189
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs16
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs58
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/Main.cs22
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.Classic.csproj232
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj2
-rw-r--r--Xamarin.Forms.Maps.iOS/FormsMaps.cs7
-rw-r--r--Xamarin.Forms.Maps.iOS/GeocoderBackend.cs17
-rw-r--r--Xamarin.Forms.Maps.iOS/MapRenderer.cs42
-rw-r--r--Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.Classic.csproj92
-rw-r--r--Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj2
-rw-r--r--Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs11
-rw-r--r--Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs9
-rw-r--r--Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs8
-rw-r--r--Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs9
-rw-r--r--Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs15
-rw-r--r--Xamarin.Forms.Platform.iOS/ContextActionCell.cs20
-rw-r--r--Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/EventTracker.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs7
-rw-r--r--Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs21
-rw-r--r--Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs15
-rw-r--r--Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs7
-rw-r--r--Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs10
-rw-r--r--Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs10
-rw-r--r--Xamarin.Forms.Platform.iOS/Forms.cs18
-rw-r--r--Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs11
-rw-r--r--Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs17
-rw-r--r--Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs15
-rw-r--r--Xamarin.Forms.Platform.iOS/PageExtensions.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Platform.cs23
-rw-r--r--Xamarin.Forms.Platform.iOS/PlatformEffect.cs8
-rw-r--r--Xamarin.Forms.Platform.iOS/PlatformRenderer.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/RendererPool.cs7
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs7
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs17
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs9
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs23
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs15
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs15
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs18
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs19
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs26
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs17
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs12
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs7
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs21
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs19
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs9
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs17
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs12
-rw-r--r--Xamarin.Forms.Platform.iOS/ResourcesProvider.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/ViewRenderer.cs13
-rw-r--r--Xamarin.Forms.Platform.iOS/VisualElementPackager.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs20
-rw-r--r--Xamarin.Forms.Platform.iOS/VisualElementTracker.cs9
-rw-r--r--Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj274
-rw-r--r--Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj2
-rw-r--r--Xamarin.Forms.Platform.iOS/iOSAppLinks.cs13
-rw-r--r--Xamarin.Forms.sln161
92 files changed, 233 insertions, 1985 deletions
diff --git a/.nuspec/Xamarin.Forms.Maps.nuspec b/.nuspec/Xamarin.Forms.Maps.nuspec
index dda8371..7cc93df 100644
--- a/.nuspec/Xamarin.Forms.Maps.nuspec
+++ b/.nuspec/Xamarin.Forms.Maps.nuspec
@@ -24,17 +24,13 @@
</group>
</dependencies>
<references>
- <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
+ <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10">
<reference file="Xamarin.Forms.Maps.dll" />
</group>
<group targetFramework="Xamarin.iOS10">
<reference file="Xamarin.Forms.Maps.dll" />
<reference file="Xamarin.Forms.Maps.iOS.dll" />
</group>
- <group targetFramework="MonoTouch10">
- <reference file="Xamarin.Forms.Maps.dll" />
- <reference file="Xamarin.Forms.Maps.iOS.Classic.dll" />
- </group>
<group targetFramework="MonoAndroid10">
<reference file="Xamarin.Forms.Maps.dll" />
<reference file="Xamarin.Forms.Maps.Android.dll" />
@@ -57,8 +53,8 @@
</references>
</metadata>
<files>
- <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid10" />
@@ -68,10 +64,6 @@
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\Xamarin.iOS10" />
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Maps.iOS\classic_bin\iPhoneSimulator\$Configuration$\Xamarin.Forms.Maps.iOS.Classic.dll" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\MonoTouch10" />
- <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\MonoTouch10" />
-
<file src="..\Xamarin.Forms.Maps.WP8\bin\$Configuration$\Xamarin.Forms.Maps.WP8.dll" target="lib\WP80" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\WP80" />
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\WP80" />
@@ -121,10 +113,9 @@
<file src="..\Xamarin.Forms.Platform.WinRT.Tablet\bin\ARM\$Configuration$\FormsTextBoxStyle.xbf" target="build\win81\ARM\Xamarin.Forms.Platform.WinRT.Tablet" />
<!-- Xaml Design-time Stuff -->
- <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Design" />
+ <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\MonoAndroid10\Design" />
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\Xamarin.iOS10\Design" />
- <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\MonoTouch10\Design" />
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\WP80\Design" />
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\wpa81\Design" />
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\win81\Design" />
diff --git a/.nuspec/Xamarin.Forms.Pages.Azure.nuspec b/.nuspec/Xamarin.Forms.Pages.Azure.nuspec
index 7a4532c..3ff5a5c 100644
--- a/.nuspec/Xamarin.Forms.Pages.Azure.nuspec
+++ b/.nuspec/Xamarin.Forms.Pages.Azure.nuspec
@@ -21,15 +21,12 @@
</group>
</dependencies>
<references>
- <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
+ <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10">
<reference file="Xamarin.Forms.Pages.Azure.dll" />
</group>
<group targetFramework="Xamarin.iOS10">
<reference file="Xamarin.Forms.Pages.Azure.dll" />
</group>
- <group targetFramework="MonoTouch10">
- <reference file="Xamarin.Forms.Pages.Azure.dll" />
- </group>
<group targetFramework="MonoAndroid10">
<reference file="Xamarin.Forms.Pages.Azure.dll" />
</group>
@@ -48,15 +45,13 @@
</references>
</metadata>
<files>
- <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\MonoTouch10" />
-
- <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\WP80" />
+ <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\WP80" />
<!--UWP-->
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\uap10.0" />
diff --git a/.nuspec/Xamarin.Forms.Pages.nuspec b/.nuspec/Xamarin.Forms.Pages.nuspec
index c91b2ab..148f32e 100644
--- a/.nuspec/Xamarin.Forms.Pages.nuspec
+++ b/.nuspec/Xamarin.Forms.Pages.nuspec
@@ -19,15 +19,12 @@
</group>
</dependencies>
<references>
- <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
+ <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10">
<reference file="Xamarin.Forms.Pages.dll" />
</group>
<group targetFramework="Xamarin.iOS10">
<reference file="Xamarin.Forms.Pages.dll" />
</group>
- <group targetFramework="MonoTouch10">
- <reference file="Xamarin.Forms.Pages.dll" />
- </group>
<group targetFramework="MonoAndroid10">
<reference file="Xamarin.Forms.Pages.dll" />
</group>
@@ -46,14 +43,12 @@
</references>
</metadata>
<files>
- <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\MonoTouch10" />
-
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\WP80" />
<!--UWP-->
diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
index 89c9750..d8b8f06 100644
--- a/.nuspec/Xamarin.Forms.nuspec
+++ b/.nuspec/Xamarin.Forms.nuspec
@@ -25,7 +25,7 @@
</group>
</dependencies>
<references>
- <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
+ <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
<reference file="Xamarin.Forms.Xaml.dll" />
@@ -36,12 +36,6 @@
<reference file="Xamarin.Forms.Xaml.dll" />
<reference file="Xamarin.Forms.Platform.iOS.dll" />
</group>
- <group targetFramework="MonoTouch10">
- <reference file="Xamarin.Forms.Core.dll" />
- <reference file="Xamarin.Forms.Platform.dll" />
- <reference file="Xamarin.Forms.Xaml.dll" />
- <reference file="Xamarin.Forms.Platform.iOS.Classic.dll" />
- </group>
<group targetFramework="MonoAndroid10">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
@@ -79,27 +73,27 @@
</metadata>
<files>
<!--PCL-->
- <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
<!--Xaml PCL Stuff-->
- <file src="Xamarin.Forms.targets" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms$IdAppend$.targets" />
- <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+ <file src="Xamarin.Forms.targets" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Xamarin.Forms$IdAppend$.targets" />
+ <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
<!-- Xaml Design-time Stuff -->
- <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Design" />
- <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Design" />
+ <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Design" />
+ <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid10\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid10\Design" />
@@ -107,9 +101,6 @@
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\Xamarin.iOS10\Design" />
- <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoTouch10\Design" />
- <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoTouch10\Design" />
-
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\WP80\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\WP80\Design" />
@@ -123,15 +114,15 @@
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\uap10.0\Design" />
<!-- XamlC stuffs -->
- <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Mdb.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.Decompiler.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.Cecil.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.CSharp.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
- <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.Xml.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Mdb.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.Decompiler.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.Cecil.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.CSharp.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
+ <file src="..\ICSharpCode.Decompiler\bin\$Configuration$\ICSharpCode.NRefactory.Xml.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
<!--Android-->
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid10" />
@@ -160,20 +151,6 @@
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\Xamarin.iOS10" />
<file src="..\Stubs\Xamarin.Forms.Platform.iOS\bin\iPhone\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\Xamarin.iOS10" />
- <!--iPhone Classic-->
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\Xamarin.Forms.Platform.iOS.Classic.dll" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\Xamarin.Forms.Platform.iOS.Classic.*pdb" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\Xamarin.Forms.Platform.iOS.Classic.*mdb" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*mdb" target="lib\MonoTouch10" />
- <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\MonoTouch10" />
- <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*mdb" target="lib\MonoTouch10" />
- <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoTouch10" />
- <file src="..\Stubs\Xamarin.Forms.Platform.iOS.Classic\bin\iPhone\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\MonoTouch10" />
-
<!--Windows Phone 8-->
<file src="..\Xamarin.Forms.Platform.WP8\bin\$Configuration$\Xamarin.Forms.Platform.WP8.dll" target="lib\WP80" />
<file src="..\Xamarin.Forms.Platform.WP8\bin\$Configuration$\Xamarin.Forms.Platform.WP8.*pdb" target="lib\WP80" />
@@ -285,40 +262,5 @@
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\zh-Hant\Xamarin.Forms.Platform.iOS.resources.dll" target="lib\Xamarin.iOS10\zh-Hant" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\zh-HK\Xamarin.Forms.Platform.iOS.resources.dll" target="lib\Xamarin.iOS10\zh-HK" />
- <!-- iOS Classic Localized String Resource Assemblies -->
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\ar\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\ar" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\ca\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\ca" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\cs\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\cs" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\da\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\da" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\de\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\de" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\el\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\el" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\es\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\es" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\fi\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\fi" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\fr\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\fr" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\he\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\he" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\hi\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\hi" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\hr\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\hr" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\hu\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\hu" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\id\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\id" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\it\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\it" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\ja\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\ja" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\ko\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\ko" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\ms\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\ms" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\nb\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\nb" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\nl\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\nl" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\pl\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\pl" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\pt-BR\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\pt-BR" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\pt\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\pt" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\ro\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\ro" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\ru\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\ru" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\sk\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\sk" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\sv\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\sv" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\th\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\th" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\tr\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\tr" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\uk\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\uk" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\vi\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\vi" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\zh-Hans\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\zh-Hans" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\zh-Hant\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\zh-Hant" />
- <file src="..\Xamarin.Forms.Platform.iOS\classic_bin\iPhoneSimulator\$Configuration$\zh-HK\Xamarin.Forms.Platform.iOS.Classic.resources.dll" target="lib\MonoTouch10\zh-HK" />
</files>
</package>
diff --git a/Stubs/Xamarin.Forms.Platform.iOS.Classic/Properties/AssemblyInfo.cs b/Stubs/Xamarin.Forms.Platform.iOS.Classic/Properties/AssemblyInfo.cs
deleted file mode 100644
index 43f8158..0000000
--- a/Stubs/Xamarin.Forms.Platform.iOS.Classic/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle ("Xamarin.Forms.Platform.iOS.Classic")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("Xamarin.Forms.Platform.iOS.Classic")]
-[assembly: AssemblyCopyright ("Copyright © 2015")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-[assembly: InternalsVisibleTo ("Xamarin.Forms.Core")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible (false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid ("fa4af8a0-f4f1-41b4-a463-a8b5b8fc5b8b")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: AssemblyFileVersion ("1.0.0.0")]
diff --git a/Stubs/Xamarin.Forms.Platform.iOS.Classic/Xamarin.Forms.Platform.iOS.Classic (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.iOS.Classic/Xamarin.Forms.Platform.iOS.Classic (Forwarders).csproj
deleted file mode 100644
index 7121266..0000000
--- a/Stubs/Xamarin.Forms.Platform.iOS.Classic/Xamarin.Forms.Platform.iOS.Classic (Forwarders).csproj
+++ /dev/null
@@ -1,65 +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>{3E443AEF-3EC0-48C4-A524-7C6996339E1B}</ProjectGuid>
- <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <RootNamespace>Xamarin.Forms.Platform</RootNamespace>
- <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
- <AssemblyName>Xamarin.Forms.Platform</AssemblyName>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\iPhone\Debug</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <MtouchDebug>true</MtouchDebug>
- <CodesignKey>iPhone Developer</CodesignKey>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\iPhone\Release</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodesignKey>iPhone Developer</CodesignKey>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|AnyCPU'">
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\Xamarin.Forms.Platform.cs">
- <Link>Xamarin.Forms.Platform.cs</Link>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- </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.Platform.iOS\Xamarin.Forms.Platform.iOS.Classic.csproj">
- <Project>{4a47b5df-ddfc-476b-ac41-5105ff3b9b8b}</Project>
- <Name>Xamarin.Forms.Platform.iOS.Classic</Name>
- <IsAppExtension>false</IsAppExtension>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="monotouch" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
-</Project> \ No newline at end of file
diff --git a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
index c4d8eaf..7614796 100644
--- a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
@@ -1,93 +1,87 @@
using System;
-using System.Collections.Generic;
using System.Drawing;
-using System.Linq;
-using System.Runtime.Remoting.Lifetime;
+using System.Globalization;
using System.IO;
-#if __UNIFIED__
-using UIKit;
-using Foundation;
-using CoreGraphics;
using AdvancedColorPicker;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using MonoTouch.CoreGraphics;
-#endif
+using CoreGraphics;
+using Foundation;
+using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.ControlGallery.iOS;
using Xamarin.Forms.Controls;
-using Xamarin.Forms.Maps.iOS;
using Xamarin.Forms.Platform.iOS;
-using System.Globalization;
-[assembly: Dependency (typeof (TestCloudService))]
-[assembly: Dependency (typeof (StringProvider))]
-[assembly: Dependency (typeof (CacheService))]
-[assembly: ExportRenderer (typeof (DisposePage), typeof(DisposePageRenderer))]
-[assembly: ExportRenderer (typeof (DisposeLabel), typeof(DisposeLabelRenderer))]
+[assembly: Dependency(typeof(TestCloudService))]
+[assembly: Dependency(typeof(StringProvider))]
+[assembly: Dependency(typeof(CacheService))]
+[assembly: ExportRenderer(typeof(DisposePage), typeof(DisposePageRenderer))]
+[assembly: ExportRenderer(typeof(DisposeLabel), typeof(DisposeLabelRenderer))]
namespace Xamarin.Forms.ControlGallery.iOS
{
public class CacheService : ICacheService
{
- public void ClearImageCache ()
+ public void ClearImageCache()
{
- var documents = Environment.GetFolderPath (Environment.SpecialFolder.MyDocuments);
- var cache = Path.Combine (documents, ".config", ".isolated-storage", "ImageLoaderCache");
- foreach (var file in Directory.GetFiles (cache)) {
- File.Delete (file);
+ var documents = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+ var cache = Path.Combine(documents, ".config", ".isolated-storage", "ImageLoaderCache");
+ foreach (var file in Directory.GetFiles(cache))
+ {
+ File.Delete(file);
}
}
}
public class DisposePageRenderer : PageRenderer
{
- protected override void Dispose (bool disposing)
+ protected override void Dispose(bool disposing)
{
- if (disposing) {
- ((DisposePage) Element).SendRendererDisposed ();
+ if (disposing)
+ {
+ ((DisposePage)Element).SendRendererDisposed();
}
- base.Dispose (disposing);
+ base.Dispose(disposing);
}
}
public class DisposeLabelRenderer : LabelRenderer
{
- protected override void Dispose (bool disposing)
+ protected override void Dispose(bool disposing)
{
- if (disposing) {
- ((DisposeLabel) Element).SendRendererDisposed ();
+ if (disposing)
+ {
+ ((DisposeLabel)Element).SendRendererDisposed();
}
- base.Dispose (disposing);
+ base.Dispose(disposing);
}
}
public class StringProvider : IStringProvider
{
- public string CoreGalleryTitle {
+ public string CoreGalleryTitle
+ {
get { return "iOS Core Gallery"; }
}
}
public class TestCloudService : ITestCloudService
{
- public bool IsOnTestCloud ()
+ public bool IsOnTestCloud()
{
- var isInTestCloud = Environment.GetEnvironmentVariable ("XAMARIN_TEST_CLOUD");
-
+ var isInTestCloud = Environment.GetEnvironmentVariable("XAMARIN_TEST_CLOUD");
+
return isInTestCloud != null && isInTestCloud.Equals("1");
}
- public string GetTestCloudDeviceName ()
+ public string GetTestCloudDeviceName()
{
- return Environment.GetEnvironmentVariable ("XTC_DEVICE_NAME");
+ return Environment.GetEnvironmentVariable("XTC_DEVICE_NAME");
}
public string GetTestCloudDevice()
{
- return Environment.GetEnvironmentVariable ("XTC_DEVICE");
+ return Environment.GetEnvironmentVariable("XTC_DEVICE");
}
}
@@ -135,36 +129,39 @@ namespace Xamarin.Forms.ControlGallery.iOS
}
#else
- [Register ("AppDelegate")]
+ [Register("AppDelegate")]
public partial class AppDelegate : FormsApplicationDelegate
{
- public override bool FinishedLaunching (UIApplication uiApplication, NSDictionary launchOptions)
+ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)
{
- App.IOSVersion = int.Parse (UIDevice.CurrentDevice.SystemVersion.Substring (0, 1));
+ App.IOSVersion = int.Parse(UIDevice.CurrentDevice.SystemVersion.Substring(0, 1));
- #if !_CLASSIC_
- Xamarin.Calabash.Start ();
- #endif
- Forms.Init ();
- FormsMaps.Init ();
- Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) => {
+ Xamarin.Calabash.Start();
+ Forms.Init();
+ FormsMaps.Init();
+ Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
+ {
// http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
- if (null != e.View.AutomationId && null != e.NativeView) {
- // e.NativeView.AccessibilityIdentifier = e.View.StyleId;
+ if (null != e.View.AutomationId && null != e.NativeView)
+ {
+ // e.NativeView.AccessibilityIdentifier = e.View.StyleId;
}
};
- var app = new App ();
+ var app = new App();
var mdp = app.MainPage as MasterDetailPage;
var detail = mdp?.Detail as NavigationPage;
- if (detail != null) {
- detail.Pushed += (sender, args) => {
+ if (detail != null)
+ {
+ detail.Pushed += (sender, args) =>
+ {
var nncgPage = args.Page as NestedNativeControlGalleryPage;
- if (nncgPage != null) {
- AddNativeControls (nncgPage);
+ if (nncgPage != null)
+ {
+ AddNativeControls(nncgPage);
}
var nncgPage1 = args.Page as NativeBindingGalleryPage;
@@ -174,15 +171,16 @@ namespace Xamarin.Forms.ControlGallery.iOS
AddNativeBindings(nncgPage1);
}
};
- }
+ }
- LoadApplication (app);
- return base.FinishedLaunching (uiApplication, launchOptions);
+ LoadApplication(app);
+ return base.FinishedLaunching(uiApplication, launchOptions);
}
- void AddNativeControls (NestedNativeControlGalleryPage page)
+ void AddNativeControls(NestedNativeControlGalleryPage page)
{
- if (page.NativeControlsAdded) {
+ if (page.NativeControlsAdded)
+ {
return;
}
@@ -193,93 +191,96 @@ namespace Xamarin.Forms.ControlGallery.iOS
var longerText =
"I am a native UILabel with considerably more text. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
- var uilabel = new UILabel {
+ var uilabel = new UILabel
+ {
MinimumFontSize = 14f,
Text = originalText,
Lines = 0,
LineBreakMode = UILineBreakMode.WordWrap,
- Font = UIFont.FromName ("Helvetica", 24f)
+ Font = UIFont.FromName("Helvetica", 24f)
};
- sl?.Children.Add (uilabel);
+ sl?.Children.Add(uilabel);
// Create and add a native Button
- var uibutton = new UIButton (UIButtonType.RoundedRect);
- uibutton.SetTitle ("Toggle Text Amount", UIControlState.Normal);
- uibutton.Font = UIFont.FromName ("Helvetica", 14f);
-
+ var uibutton = new UIButton(UIButtonType.RoundedRect);
+ uibutton.SetTitle("Toggle Text Amount", UIControlState.Normal);
+ uibutton.Font = UIFont.FromName("Helvetica", 14f);
+
- uibutton.TouchUpInside += (sender, args) => {
+ uibutton.TouchUpInside += (sender, args) =>
+ {
uilabel.Text = uilabel.Text == originalText ? longerText : originalText;
- uilabel.SizeToFit ();
+ uilabel.SizeToFit();
};
- sl?.Children.Add (uibutton.ToView ());
+ sl?.Children.Add(uibutton.ToView());
// Create some control which we know don't behave correctly with regard to measurement
- var difficultControl0 = new BrokenNativeControl {
+ var difficultControl0 = new BrokenNativeControl
+ {
MinimumFontSize = 14f,
- Font = UIFont.FromName ("Helvetica", 14f),
+ Font = UIFont.FromName("Helvetica", 14f),
Lines = 0,
LineBreakMode = UILineBreakMode.WordWrap,
Text = "Doesn't play nice with sizing. That's why there's a big gap around it."
};
- var difficultControl1 = new BrokenNativeControl {
+ var difficultControl1 = new BrokenNativeControl
+ {
MinimumFontSize = 14f,
- Font = UIFont.FromName ("Helvetica", 14f),
+ Font = UIFont.FromName("Helvetica", 14f),
Lines = 0,
LineBreakMode = UILineBreakMode.WordWrap,
Text = "Custom size fix specified. No gaps."
};
- var explanation0 = new UILabel {
+ var explanation0 = new UILabel
+ {
MinimumFontSize = 14f,
Text = "The next control is a customized label with a bad SizeThatFits implementation.",
Lines = 0,
LineBreakMode = UILineBreakMode.WordWrap,
- Font = UIFont.FromName ("Helvetica", 24f)
+ Font = UIFont.FromName("Helvetica", 24f)
};
- var explanation1 = new UILabel {
+ var explanation1 = new UILabel
+ {
MinimumFontSize = 14f,
Text = "The next control is the same broken class as above, but we pass in an override to the GetDesiredSize method.",
Lines = 0,
LineBreakMode = UILineBreakMode.WordWrap,
- Font = UIFont.FromName ("Helvetica", 24f)
+ Font = UIFont.FromName("Helvetica", 24f)
};
// Add a misbehaving control
- sl?.Children.Add (explanation0);
- sl?.Children.Add (difficultControl0);
+ sl?.Children.Add(explanation0);
+ sl?.Children.Add(difficultControl0);
// Add the misbehaving control with a custom delegate for FixSize
- sl?.Children.Add (explanation1);
- sl?.Children.Add (difficultControl1, FixSize);
+ sl?.Children.Add(explanation1);
+ sl?.Children.Add(difficultControl1, FixSize);
page.NativeControlsAdded = true;
}
- SizeRequest? FixSize (NativeViewWrapperRenderer renderer, double width, double height)
+ SizeRequest? FixSize(NativeViewWrapperRenderer renderer, double width, double height)
{
var uiView = renderer.Control;
var view = renderer.Element;
- if (uiView == null || view == null) {
+ if (uiView == null || view == null)
+ {
return null;
}
-#if __UNIFIED__
- var constraint = new CGSize (width, height);
-#else
- var constraint = new SizeF ((float)width, (float)height);
-#endif
-
+ var constraint = new CGSize(width, height);
+
// Let the BrokenNativeControl determine its size (which we know will be wrong)
- var badRect = uiView.SizeThatFits (constraint);
+ var badRect = uiView.SizeThatFits(constraint);
// And we'll use the width (which is fine) and substitute our own height
- return new SizeRequest (new Size (badRect.Width, 20));
+ return new SizeRequest(new Size(badRect.Width, 20));
}
void AddNativeBindings(NativeBindingGalleryPage page)
@@ -315,11 +316,9 @@ namespace Xamarin.Forms.ControlGallery.iOS
uiView.Add(uilabel);
sl?.Children.Add(uiView);
sl?.Children.Add(uibuttonColor.ToView());
-#if !_CLASSIC_
var colorPicker = new ColorPickerView(new CGRect(0, 0, width, 300));
colorPicker.SetBinding("SelectedColor", new Binding("NativeLabelColor", BindingMode.TwoWay, nativeColorConverter), "ColorPicked");
sl?.Children.Add(colorPicker);
-#endif
page.NativeControlsAdded = true;
}
}
@@ -340,5 +339,5 @@ namespace Xamarin.Forms.ControlGallery.iOS
return value;
}
}
-#endif
}
+#endif
diff --git a/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs b/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
index 37fe4c5..f8163c1 100644
--- a/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
@@ -1,10 +1,5 @@
-#if __UNIFIED__
using CoreGraphics;
using UIKit;
-#else
-using System.Drawing;
-using MonoTouch.UIKit;
-#endif
namespace Xamarin.Forms.ControlGallery.iOS
{
@@ -16,19 +11,12 @@ namespace Xamarin.Forms.ControlGallery.iOS
public override string Text
{
get { return base.Text; }
- set { base.Text = value.ToUpper (); }
+ set { base.Text = value.ToUpper(); }
}
-#if __UNIFIED__
- public override CGSize SizeThatFits (CGSize size)
+ public override CGSize SizeThatFits(CGSize size)
{
return new CGSize(size.Width, 150);
}
-#else
- public override SizeF SizeThatFits (SizeF size)
- {
- return new SizeF (size.Width, 150);
- }
-#endif
}
} \ No newline at end of file
diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
index c89e9ef..6b2ab38 100644
--- a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
@@ -1,27 +1,15 @@
using System;
-using Xamarin.Forms.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.iOS;
-using Xamarin.Forms.ControlGallery.iOS;
using System.Collections.Generic;
-using System.Linq;
-using System.Drawing;
-using System.Collections;
-
-#if __UNIFIED__
-using UIKit;
-using MapKit;
using CoreLocation;
using Foundation;
+using MapKit;
+using UIKit;
+using Xamarin.Forms;
+using Xamarin.Forms.ControlGallery.iOS;
+using Xamarin.Forms.Controls;
+using Xamarin.Forms.Platform.iOS;
using RectangleF = CoreGraphics.CGRect;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using MonoTouch.MapKit;
-using MonoTouch.CoreLocation;
-#endif
-
[assembly: ExportRenderer(typeof(Bugzilla21177.CollectionView), typeof(CollectionViewRenderer))]
[assembly: ExportRenderer(typeof(Bugzilla31395.CustomContentView), typeof(CustomContentRenderer))]
[assembly: ExportRenderer(typeof(NativeCell), typeof(NativeiOSCellRenderer))]
@@ -326,7 +314,7 @@ namespace Xamarin.Forms.ControlGallery.iOS
public IEnumerable<DataSource> Items
{
//get{ }
- set { _tableItems = new List<DataSource>(value); }
+ set { _tableItems = new List<DataSource>(value); }
}
public NativeiOSListViewSource(NativeListView2 view)
@@ -339,19 +327,10 @@ namespace Xamarin.Forms.ControlGallery.iOS
/// Called by the TableView to determine how many cells to create for that particular section.
/// </summary>
-#if __UNIFIED__
public override nint RowsInSection(UITableView tableview, nint section)
{
return _tableItems.Count;
}
-#else
- public override int RowsInSection (UITableView tableview, int section)
- {
- return _tableItems.Count;
- }
-
-#endif
-
#region user interaction methods
@@ -419,19 +398,11 @@ namespace Xamarin.Forms.ControlGallery.iOS
_listView = view;
}
-#if __UNIFIED__
public override nint RowsInSection(UITableView tableview, nint section)
{
return _tableItems.Count;
}
-#else
- public override int RowsInSection (UITableView tableview, int section)
- {
- return _tableItems.Count;
- }
-#endif
-
#region user interaction methods
public override void RowSelected(UITableView tableView, NSIndexPath indexPath)
@@ -537,10 +508,9 @@ namespace Xamarin.Forms.ControlGallery.iOS
public override void ViewDidLoad()
{
base.ViewDidLoad();
- CollectionView.RegisterClassForCell(typeof (CollectionViewCell), cellId);
+ CollectionView.RegisterClassForCell(typeof(CollectionViewCell), cellId);
}
-#if __UNIFIED__
public override nint NumberOfSections(UICollectionView collectionView)
{
return 1;
@@ -551,18 +521,6 @@ namespace Xamarin.Forms.ControlGallery.iOS
return items.Count;
}
-#else
- public override int NumberOfSections (UICollectionView collectionView)
- {
- return 1;
- }
-
- public override int GetItemsCount (UICollectionView collectionView, int section)
- {
- return items.Count;
- }
-#endif
-
public override UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath)
{
var cell = (CollectionViewCell)collectionView.DequeueReusableCell(cellId, indexPath);
diff --git a/Xamarin.Forms.ControlGallery.iOS/Main.cs b/Xamarin.Forms.ControlGallery.iOS/Main.cs
index 921c475..f4834f9 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Main.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/Main.cs
@@ -1,30 +1,16 @@
using System.Diagnostics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Xamarin.Forms.Controls;
-#if __UNIFIED__
using UIKit;
-using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
+using Xamarin.Forms.Controls;
namespace Xamarin.Forms.ControlGallery.iOS
{
public class Application
{
- // This is the main entry point of the application.
- static void Main (string [] args)
+ static void Main(string[] args)
{
- // if you want to use a different Application Delegate class from "AppDelegate"
- // you can specify it here.
- #if __UNIFIED__
if (!Debugger.IsAttached)
- Insights.Initialize (App.InsightsApiKey);
- #endif
- UIApplication.Main (args, null, "AppDelegate");
+ Insights.Initialize(App.InsightsApiKey);
+ UIApplication.Main(args, null, "AppDelegate");
}
}
}
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.Classic.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.Classic.csproj
deleted file mode 100644
index 5e539bd..0000000
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.Classic.csproj
+++ /dev/null
@@ -1,232 +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>{DEEC5844-D609-4F35-BCF0-5B71C91C8133}</ProjectGuid>
- <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <OutputType>Exe</OutputType>
- <RootNamespace>Xamarin.Forms.ControlGallery.iOS</RootNamespace>
- <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
- <AssemblyName>XamarinFormsControlGalleryiOS</AssemblyName>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- <UseMSBuildEngine>True</UseMSBuildEngine>
- <DefineConstants>_CLASSIC_</DefineConstants>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>classic_bin\iPhoneSimulator\Debug\</OutputPath>
- <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
- <DefineConstants>DEBUG;HAVE_OPENTK;_CLASSIC_</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <MtouchLink>SdkOnly</MtouchLink>
- <MtouchDebug>True</MtouchDebug>
- <MtouchSdkVersion>6.1</MtouchSdkVersion>
- <MtouchProfiling>False</MtouchProfiling>
- <MtouchExtraArgs />
- <MtouchFastDev>False</MtouchFastDev>
- <MtouchArch>Default, i386</MtouchArch>
- <MtouchUseLlvm>False</MtouchUseLlvm>
- <MtouchUseThumb>False</MtouchUseThumb>
- <MtouchUseSGen>False</MtouchUseSGen>
- <MtouchUseRefCounting>False</MtouchUseRefCounting>
- <MtouchOptimizePNGs>False</MtouchOptimizePNGs>
- <MtouchSdkVersion>7.0</MtouchSdkVersion>
- <MtouchEnableGenericValueTypeSharing>True</MtouchEnableGenericValueTypeSharing>
- <MtouchI18n />
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
- <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>
- <MtouchLink>None</MtouchLink>
- <DefineConstants>_CLASSIC_</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>classic_bin\iPhone\Debug</OutputPath>
- <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
- <DefineConstants>DEBUG;__MOBILE__;__IOS__;_CLASSIC_</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <MtouchDebug>True</MtouchDebug>
- <CodesignKey>iPhone Developer</CodesignKey>
- <MtouchSdkVersion>8.1</MtouchSdkVersion>
- <IpaPackageName>
- </IpaPackageName>
- <MtouchLink>SdkOnly</MtouchLink>
- <MtouchProfiling>False</MtouchProfiling>
- <MtouchExtraArgs />
- <MtouchFastDev>False</MtouchFastDev>
- <MtouchEnableGenericValueTypeSharing>True</MtouchEnableGenericValueTypeSharing>
- <MtouchArch>Default, ARMv7</MtouchArch>
- <MtouchUseLlvm>False</MtouchUseLlvm>
- <MtouchUseThumb>False</MtouchUseThumb>
- <MtouchUseSGen>False</MtouchUseSGen>
- <MtouchUseRefCounting>False</MtouchUseRefCounting>
- <MtouchOptimizePNGs>True</MtouchOptimizePNGs>
- <MtouchI18n />
- <BuildIpa>true</BuildIpa>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
- <DebugType>none</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>classic_bin\iPhone\Release</OutputPath>
- <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodesignKey>iPhone Developer</CodesignKey>
- <DefineConstants>_CLASSIC_</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
- <DebugType>none</DebugType>
- <Optimize>True</Optimize>
- <OutputPath>classic_bin\iPhone\Ad-Hoc</OutputPath>
- <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>False</ConsolePause>
- <CodesignKey>iPhone Distribution</CodesignKey>
- <DefineConstants>_CLASSIC_</DefineConstants>
- <BuildIpa>True</BuildIpa>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
- <DebugType>none</DebugType>
- <Optimize>True</Optimize>
- <OutputPath>classic_bin\iPhone\AppStore</OutputPath>
- <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>False</ConsolePause>
- <CodesignKey>iPhone Distribution</CodesignKey>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|iPhoneSimulator'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\iPhoneSimulator\Turkey\</OutputPath>
- <DefineConstants>__MOBILE__;__IOS__;DEBUG;HAVE_OPENTK;_CLASSIC_</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|iPhone'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\iPhone\Turkey\</OutputPath>
- <DefineConstants>__MOBILE__;__IOS__;DEBUG;__MOBILE__;__IOS__;_CLASSIC_</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhoneSimulator'">
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|iPhoneSimulator'">
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="BrokenNativeControl.cs" />
- <Compile Include="Main.cs" />
- <Compile Include="AppDelegate.cs" />
- <None Include="app.config" />
- <None Include="Info.plist" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <None Include="packages.config" />
- <Compile Include="CustomRenderers.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Stubs\Xamarin.Forms.Platform.iOS.Classic\Xamarin.Forms.Platform.iOS.Classic %28Forwarders%29.csproj">
- <Project>{3e443aef-3ec0-48c4-a524-7c6996339e1b}</Project>
- <Name>Xamarin.Forms.Platform.iOS.Classic %28Forwarders%29</Name>
- </ProjectReference>
- <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
- <Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
- <Name>Xamarin.Forms.Controls</Name>
- </ProjectReference>
- <ProjectReference Include="..\Xamarin.Forms.Maps.iOS\Xamarin.Forms.Maps.iOS.Classic.csproj">
- <Project>{ca10facd-22ab-463f-a20e-379c212b0858}</Project>
- <Name>Xamarin.Forms.Maps.iOS.Classic</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>
- <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
- <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
- <Name>Xamarin.Forms.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Content Include="bank%402x.png" />
- <Content Include="bank.png" />
- <Content Include="calculator%402x.png" />
- <Content Include="calculator.png" />
- <Content Include="cover1.jpg" />
- <Content Include="crimson.jpg" />
- <Content Include="Default-568h%402x.png" />
- <BundleResource Include="default.css" />
- <Content Include="Entitlements.plist" />
- <Content Include="Goobuntu-icon.png" />
- <Content Include="Intranet-icon.png" />
- <BundleResource Include="Default%402x.png" />
- <BundleResource Include="local.html" />
- <Content Include="oasis.jpg" />
- <BundleResource Include="oasissmall.jpg" />
- <Content Include="coffee%402x.png" />
- <Content Include="settings%402x.png" />
- <Content Include="menuIcon%402x.png" />
- <Content Include="crimsonsmall.jpg" />
- <Content Include="seth%402x.png" />
- <Content Include="cover1small.jpg" />
- <Content Include="menuIcon.png" />
- <Content Include="seth.png" />
- <BundleResource Include="photo.jpg" />
- <BundleResource Include="WebImages\XamarinLogo.png" />
- <BundleResource Include="Images\FlowerBuds.jpg" />
- <BundleResource Include="Images\FlowerBuds%402x.jpg" />
- <BundleResource Include="Images\Fruits.jpg" />
- <BundleResource Include="Images\Fruits%402x.jpg" />
- <BundleResource Include="Images\Legumes.jpg" />
- <BundleResource Include="Images\Legumes%402x.jpg" />
- <BundleResource Include="Images\Vegetables.jpg" />
- <BundleResource Include="Images\Vegetables%402x.jpg" />
- <BundleResource Include="toolbar_close.png" />
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="monotouch" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- </Project>
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index 35951c5..fabf981 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -131,7 +131,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|iPhoneSimulator'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\iPhoneSimulator\Turkey\</OutputPath>
- <DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;DEBUG</DefineConstants>
+ <DefineConstants>__MOBILE__;__IOS__;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
diff --git a/Xamarin.Forms.Maps.iOS/FormsMaps.cs b/Xamarin.Forms.Maps.iOS/FormsMaps.cs
index 91033f7..ca8dca6 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 42b9645..08ffbbe 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 c556d14..3f4e7eb 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 0f5fb89..0000000
--- 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 0318b39..4ce638e 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>
diff --git a/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs b/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs
index e910297..8b60b01 100644
--- a/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs
+++ b/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs
@@ -1,17 +1,10 @@
using System;
using System.Collections.Concurrent;
using System.Threading;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
using CoreAnimation;
using Foundation;
-
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreAnimation;
-using MonoTouch.Foundation;
-#endif
+using UIKit;
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs
index 3ec12bd..ea0e8d3 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs
@@ -1,13 +1,6 @@
using System;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
using UIKit;
-using Foundation;
-
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs b/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
index 39bedf4..e32e86c 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
@@ -1,13 +1,7 @@
using System;
using System.ComponentModel;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class CellTableViewCell : UITableViewCell, INativeElementView
@@ -32,7 +26,7 @@ namespace Xamarin.Forms.Platform.iOS
if (cellController != null)
Device.BeginInvokeOnMainThread(cellController.SendDisappearing);
-
+
_cell = value;
cellController = value;
diff --git a/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs
index e94e0ea..b00ff9d 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs
@@ -1,21 +1,7 @@
using System;
using System.ComponentModel;
-using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs
index 010319b..38aae37 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs
@@ -1,14 +1,7 @@
using System.ComponentModel;
using System.Threading.Tasks;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
+using UIKit;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs
index ed7ddc1..d93ec5c 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs
@@ -1,13 +1,8 @@
using System;
using System.ComponentModel;
using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class SwitchCellRenderer : CellRenderer
diff --git a/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs
index 41c4334..2f5cfdd 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs
@@ -1,11 +1,6 @@
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class TextCellRenderer : CellRenderer
diff --git a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
index d1cd939..8f8a92c 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
@@ -1,23 +1,8 @@
using System;
using System.ComponentModel;
-using Xamarin.Forms.Internals;
-
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-using System.Drawing;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/ContextActionCell.cs b/Xamarin.Forms.Platform.iOS/ContextActionCell.cs
index 5d50d31..bb7bea1 100644
--- a/Xamarin.Forms.Platform.iOS/ContextActionCell.cs
+++ b/Xamarin.Forms.Platform.iOS/ContextActionCell.cs
@@ -1,25 +1,13 @@
using System;
+using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Collections.Generic;
-using System.Drawing;
-using Xamarin.Forms.Platform.iOS.Resources;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
+using Xamarin.Forms.Platform.iOS.Resources;
+using PointF = CoreGraphics.CGPoint;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs b/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs
index b2b34e4..bc04ede 100644
--- a/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs
+++ b/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs
@@ -1,23 +1,9 @@
using System;
-using System.Drawing;
using System.Collections.Generic;
-#if __UNIFIED__
using UIKit;
-using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
using NSAction = System.Action;
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-#endif
+using RectangleF = CoreGraphics.CGRect;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/EventTracker.cs b/Xamarin.Forms.Platform.iOS/EventTracker.cs
index 16ccd50..9c6c90e 100644
--- a/Xamarin.Forms.Platform.iOS/EventTracker.cs
+++ b/Xamarin.Forms.Platform.iOS/EventTracker.cs
@@ -3,21 +3,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Linq;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs
index 7243456..80473a8 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs
@@ -1,11 +1,6 @@
using System;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
using Foundation;
-
-#else
-using MonoTouch.Foundation;
-#endif
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs
index f512e15..bb4342a 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs
@@ -1,28 +1,9 @@
using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-#if __UNIFIED__
-using CoreAnimation;
using CoreGraphics;
-using Foundation;
using UIKit;
-#else
-using MonoTouch.CoreAnimation;
-using MonoTouch.CoreGraphics;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
+using PointF = CoreGraphics.CGPoint;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs
index a75e7a6..bb0dfff 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs
@@ -1,20 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-#if __UNIFIED__
-using CoreAnimation;
-using CoreGraphics;
using Foundation;
-using UIKit;
-
-#else
-using MonoTouch.CoreAnimation;
-using MonoTouch.CoreGraphics;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
index e74fed8..3b24c1a 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public static class Extensions
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs
index 6e7f573..823c3f3 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs
@@ -1,17 +1,7 @@
using System.Collections.Generic;
-#if __UNIFIED__
using CoreGraphics;
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
-#if !__UNIFIED__
- // Save ourselves a ton of ugly ifdefs below
-using CGSize = System.Drawing.SizeF;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public delegate SizeRequest? GetDesiredSizeDelegate(NativeViewWrapperRenderer renderer, double widthConstraint, double heightConstraint);
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs
index 3ee0964..295ebd5 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs
@@ -1,23 +1,9 @@
-using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using CoreGraphics;
using UIKit;
-#else
-using MonoTouch.CoreGraphics;
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
+using PointF = CoreGraphics.CGPoint;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs
index 73475b1..eab88e8 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs
@@ -1,15 +1,9 @@
+using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
-using System;
-using static System.String;
-
-#if __UNIFIED__
using UIKit;
-
-#else
-using MonoTouch.UIKit;
-#endif
+using static System.String;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Forms.cs b/Xamarin.Forms.Platform.iOS/Forms.cs
index eb4100d..820d3c0 100644
--- a/Xamarin.Forms.Platform.iOS/Forms.cs
+++ b/Xamarin.Forms.Platform.iOS/Forms.cs
@@ -11,16 +11,10 @@ using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
using CoreFoundation;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreFoundation;
-using MonoTouch.Foundation;
-#endif
+using UIKit;
+using Xamarin.Forms.Internals;
using Xamarin.Forms.Platform.iOS;
namespace Xamarin.Forms
@@ -241,18 +235,10 @@ namespace Xamarin.Forms
public void StartTimer(TimeSpan interval, Func<bool> callback)
{
NSTimer timer = null;
-#if __UNIFIED__
timer = NSTimer.CreateRepeatingScheduledTimer(interval, t =>
{
-#else
- timer = NSTimer.CreateRepeatingScheduledTimer (interval, () => {
- #endif
if (!callback())
-#if __UNIFIED__
t.Invalidate();
-#else
- timer.Invalidate ();
- #endif
});
NSRunLoop.Main.AddTimer(timer, NSRunLoopMode.Common);
}
diff --git a/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs b/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs
index 78dc6dc..a14bd7e 100644
--- a/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs
+++ b/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs
@@ -1,17 +1,8 @@
using System;
using System.ComponentModel;
-using System.Linq;
-using System.Text;
-#if __UNIFIED__
+using CoreSpotlight;
using Foundation;
using UIKit;
-using CoreSpotlight;
-
-#else
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-using MonoTouch.CoreSpotlight;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs b/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs
index f0e8522..1a4e9c0 100644
--- a/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs
+++ b/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs
@@ -1,22 +1,7 @@
-using System.Collections.Generic;
-using System.Drawing;
-#if __UNIFIED__
using Foundation;
using UIKit;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
using NSAction = System.Action;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-#endif
+using RectangleF = CoreGraphics.CGRect;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs b/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs
index 5ffabf0..9a2bf58 100644
--- a/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs
@@ -1,11 +1,6 @@
using System;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public interface IVisualElementRenderer : IDisposable, IRegisterable
diff --git a/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs b/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs
index ffe117f..2d872af 100644
--- a/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs
+++ b/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs
@@ -1,12 +1,7 @@
using System;
using System.ComponentModel;
-#if __UNIFIED__
using Foundation;
-#else
-using MonoTouch.Foundation;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
class NativeViewPropertyListener : NSObject, INotifyPropertyChanged
diff --git a/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs b/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs
index 5474c65..31cb186 100644
--- a/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs
+++ b/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs
@@ -1,16 +1,4 @@
-using System.Collections.Generic;
-#if __UNIFIED__
-using CoreGraphics;
-using UIKit;
-
-#else
-using MonoTouch.UIKit;
-#endif
-
-#if !__UNIFIED__
- // Save ourselves a ton of ugly ifdefs below
-using CGSize = System.Drawing.SizeF;
-#endif
+using UIKit;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs b/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs
index 58cacdc..4d1252e 100644
--- a/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs
@@ -1,17 +1,6 @@
-using System.Collections.Generic;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using CoreGraphics;
+using CoreGraphics;
using UIKit;
-
-#else
-using MonoTouch.UIKit;
-#endif
-
-#if !__UNIFIED__
- // Save ourselves a ton of ugly ifdefs below
-using CGSize = System.Drawing.SizeF;
-#endif
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/PageExtensions.cs b/Xamarin.Forms.Platform.iOS/PageExtensions.cs
index 07da048..51a5a33 100644
--- a/Xamarin.Forms.Platform.iOS/PageExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/PageExtensions.cs
@@ -1,11 +1,6 @@
using System;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms
{
public static class PageExtensions
diff --git a/Xamarin.Forms.Platform.iOS/Platform.cs b/Xamarin.Forms.Platform.iOS/Platform.cs
index 3022fa0..9ec4a8a 100644
--- a/Xamarin.Forms.Platform.iOS/Platform.cs
+++ b/Xamarin.Forms.Platform.iOS/Platform.cs
@@ -1,33 +1,10 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
using System.Linq;
-using System.Runtime.InteropServices;
using System.Threading.Tasks;
-
-#if __UNIFIED__
-using CoreGraphics;
using Foundation;
-using ObjCRuntime;
using UIKit;
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using MonoTouch;
-using MonoTouch.CoreAnimation;
-using MonoTouch.CoreFoundation;
-using MonoTouch.CoreGraphics;
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/PlatformEffect.cs b/Xamarin.Forms.Platform.iOS/PlatformEffect.cs
index 436ef6d..8fb4f97 100644
--- a/Xamarin.Forms.Platform.iOS/PlatformEffect.cs
+++ b/Xamarin.Forms.Platform.iOS/PlatformEffect.cs
@@ -1,10 +1,4 @@
-using System.ComponentModel;
-#if __UNIFIED__
-using UIKit;
-
-#else
-using MonoTouch.UIKit;
-#endif
+using UIKit;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs b/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs
index 554c0f5..f2d897e 100644
--- a/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs
@@ -1,11 +1,5 @@
-using System;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal class ModalWrapper : UIViewController
diff --git a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
index 822e143..24df203 100644
--- a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
@@ -5,13 +5,8 @@ using System.Runtime.CompilerServices;
using Xamarin.Forms;
using Xamarin.Forms.Internals;
using Xamarin.Forms.Platform.iOS;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
[assembly: AssemblyTitle("Xamarin.Forms.Platform.iOS")]
[assembly: AssemblyDescription("iOS Backend for Xamarin.Forms")]
[assembly: AssemblyConfiguration("")]
diff --git a/Xamarin.Forms.Platform.iOS/RendererPool.cs b/Xamarin.Forms.Platform.iOS/RendererPool.cs
index 51f7f4f..babfa7b 100644
--- a/Xamarin.Forms.Platform.iOS/RendererPool.cs
+++ b/Xamarin.Forms.Platform.iOS/RendererPool.cs
@@ -1,12 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-#if __UNIFIED__
-using UIKit;
-
-#else
-using MonoTouch.UIKit;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
index 0ef8741..abd8f24 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
@@ -1,12 +1,7 @@
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
+using System.Drawing;
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class ActivityIndicatorRenderer : ViewRenderer<ActivityIndicator, UIActivityIndicatorView>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
index 01d0bf6..e6ae550 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
@@ -1,10 +1,5 @@
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal static class AlignmentExtensions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
index 20e9c38..466773b 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
@@ -1,23 +1,7 @@
using System.ComponentModel;
-using System.Drawing;
-using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-#if __UNIFIED__
using UIKit;
-using CoreGraphics;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreGraphics;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
index 34609b4..ac97223 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
@@ -1,22 +1,10 @@
using System;
-using System.Linq;
using System.ComponentModel;
using System.Diagnostics;
-
-#if __UNIFIED__
+using System.Linq;
using Foundation;
using UIKit;
-using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-#else
-using System.Drawing;
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
index 4992131..58587e8 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
@@ -2,23 +2,11 @@ using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Drawing;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
+using Xamarin.Forms.Internals;
+using PointF = CoreGraphics.CGPoint;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
index d4ba00e..710aa36 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
@@ -1,23 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
index 939a984..49126da 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
@@ -1,21 +1,7 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
index f946de8..2e37a95 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
@@ -1,13 +1,8 @@
using System;
-using System.Drawing;
-using System.Runtime.Remoting.Channels;
using System.ComponentModel;
-#if __UNIFIED__
-using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
+using System.Drawing;
+using UIKit;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
index c2e565d..ae16c66 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
@@ -1,14 +1,8 @@
-using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public static class FontExtensions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
index 4bb829b..dce86b9 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
@@ -1,12 +1,6 @@
-#if __UNIFIED__
using Foundation;
using UIKit;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public static class FormattedStringExtensions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
index 3f2f1cc..3d2213f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
@@ -1,12 +1,7 @@
using System.ComponentModel;
using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class FrameRenderer : VisualElementRenderer<Frame>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
index a08365e..6f6392b 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
@@ -1,26 +1,11 @@
-using System.Drawing;
+using System;
using System.ComponentModel;
using System.IO;
-using System.Threading.Tasks;
using System.Threading;
-using System;
-#if __UNIFIED__
-using UIKit;
+using System.Threading.Tasks;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
@@ -180,7 +165,7 @@ namespace Xamarin.Forms.Platform.iOS
{
public async Task<UIImage> LoadImageAsync(ImageSource imagesource, CancellationToken cancelationToken = default(CancellationToken), float scale = 1f)
{
- UIImage image = null;
+ UIImage image = null;
var streamsource = imagesource as StreamImageSource;
if (streamsource != null && streamsource.Stream != null)
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
index d575994..9521767 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
@@ -1,20 +1,7 @@
using System;
-using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
+using RectangleF = CoreGraphics.CGRect;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
index 4ebb75d..987858b 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
@@ -1,11 +1,6 @@
using System;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal static class KeyboardObserver
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
index f886cb3..0a9ef79 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
@@ -1,23 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-using CoreText;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreText;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
index d0dacbd..07025c7 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
@@ -3,26 +3,12 @@ using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Drawing;
using System.Linq;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
+using Xamarin.Forms.Internals;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs
index aa9b5ff..2ea8a00 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs
@@ -1,23 +1,9 @@
using System;
-using System.Drawing;
using System.Linq;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
@@ -41,7 +27,8 @@ namespace Xamarin.Forms.Platform.iOS
SectionInset = new UIEdgeInsets(margin, margin, bottomMargin, margin),
MinimumInteritemSpacing = margin,
MinimumLineSpacing = margin
- }) { DataSource = new DataSource((NavigationMenu)Element), BackgroundColor = UIColor.White };
+ })
+ { DataSource = new DataSource((NavigationMenu)Element), BackgroundColor = UIColor.White };
using (var navigationCellId = new NSString("NavigationCell"))
_collectionView.RegisterClassForCell(typeof(NavigationCell), navigationCellId);
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
index c418688..654fc8e 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
@@ -1,30 +1,14 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
using System.Linq;
-using System.Threading;
using System.Threading.Tasks;
+using CoreGraphics;
+using UIKit;
using Xamarin.Forms.Internals;
using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-#if __UNIFIED__
-using UIKit;
-using CoreGraphics;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreGraphics;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
+using RectangleF = CoreGraphics.CGRect;
namespace Xamarin.Forms.Platform.iOS
{
@@ -309,11 +293,7 @@ namespace Xamarin.Forms.Platform.iOS
var task = GetAppearedOrDisappearedTask(page);
UIViewController poppedViewController;
-#if __UNIFIED__
poppedViewController = base.PopViewController(animated);
-#else
- poppedViewController = base.PopViewControllerAnimated (animated);
-#endif
if (poppedViewController == null)
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
index 84c6774..58c172c 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
@@ -1,27 +1,10 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using GLKit;
using OpenGLES;
using Foundation;
using CoreAnimation;
-#else
-using MonoTouch.GLKit;
-using MonoTouch.OpenGLES;
-using MonoTouch.Foundation;
-using MonoTouch.CoreAnimation;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
index ff28653..94caef0 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
@@ -1,14 +1,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class PageRenderer : UIViewController, IVisualElementRenderer, IEffectControlProvider
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
index 55ed961..17c08e7 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
@@ -1,23 +1,9 @@
using System;
-using System.Linq;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
+using System.Linq;
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
using PointF = CoreGraphics.CGPoint;
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class PhoneMasterDetailRenderer : UIViewController, IVisualElementRenderer, IEffectControlProvider
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
index 069fc02..d0cc4ec 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
@@ -1,21 +1,7 @@
using System;
using System.ComponentModel;
-using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
index 3709172..234f812 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
@@ -1,20 +1,6 @@
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
index 1e8ea1f..b2107db 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
@@ -1,21 +1,9 @@
using System;
using System.ComponentModel;
-using System.Drawing;
-#if __UNIFIED__
using UIKit;
-using Foundation;
-using ObjCRuntime;
using PointF = CoreGraphics.CGPoint;
using RectangleF = CoreGraphics.CGRect;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-using MonoTouch.UIKit;
-using nfloat=System.Single;
-
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class ScrollViewRenderer : UIScrollView, IVisualElementRenderer
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
index 90a2437..8c54702 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
@@ -1,13 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
+using System.Drawing;
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class SearchBarRenderer : ViewRenderer<SearchBar, UISearchBar>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
index 2df61f2..aa01c95 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
@@ -1,21 +1,7 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
index 0cb0fcb..9d96399 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
@@ -1,13 +1,8 @@
using System;
using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class StepperRenderer : ViewRenderer<Stepper, UIStepper>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
index 0bb7fbe..50889b8 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
@@ -1,12 +1,7 @@
using System;
using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class SwitchRenderer : ViewRenderer<Switch, UISwitch>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
index 695ce2a..626a61f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
@@ -1,24 +1,9 @@
using System;
+using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Linq;
-using System.Collections.Generic;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{
@@ -356,7 +341,7 @@ namespace Xamarin.Forms.Platform.iOS
if (!_defaultBarTextColorSet)
{
- _defaultBarTextColor = TabBar.TintColor;
+ _defaultBarTextColor = TabBar.TintColor;
_defaultBarTextColorSet = true;
}
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
index cc70a5f..4a9f694 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
@@ -1,24 +1,7 @@
using System;
using System.Collections.Generic;
-using Xamarin.Forms;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
+using UIKit;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
index cdfc138..725ef51 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
@@ -1,15 +1,8 @@
-using System;
-using System.ComponentModel;
-using System.Drawing;
using System.Collections.Generic;
-#if __UNIFIED__
+using System.ComponentModel;
using UIKit;
using RectangleF = CoreGraphics.CGRect;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class TableViewRenderer : ViewRenderer<TableView, UITableView>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
index cb76b76..7b54faf 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
@@ -1,12 +1,7 @@
using System;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal class ChildViewController : UIViewController
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
index c64ce8f..f263276 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
@@ -1,23 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
index 11ab72f..70c9bf6 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
@@ -1,15 +1,9 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
+using System.Drawing;
using Foundation;
-
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
+using UIKit;
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs b/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs
index 847107d..cb5e3cf 100644
--- a/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs
+++ b/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs
@@ -1,10 +1,5 @@
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal class ResourcesProvider : ISystemResourcesProvider
diff --git a/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs b/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs
index e34a493..7304116 100644
--- a/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs
+++ b/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs
@@ -1,11 +1,6 @@
using System;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms
{
public class ViewInitializedEventArgs : EventArgs
diff --git a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs
index 0c0f8f9..6ecc307 100644
--- a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs
@@ -1,21 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs
index 0aefc48..1670176 100644
--- a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs
+++ b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs
@@ -1,10 +1,4 @@
using System;
-#if __UNIFIED__
-using UIKit;
-
-#else
-using MonoTouch.UIKit;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs b/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs
index d4da093..b4a60f6 100644
--- a/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs
@@ -1,27 +1,11 @@
using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Drawing;
using System.ComponentModel;
-using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-using CoreGraphics;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
+
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs
index c939676..5b41ca8 100644
--- a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs
+++ b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs
@@ -1,16 +1,9 @@
using System;
-using System.Drawing;
using System.ComponentModel;
+using System.Drawing;
using System.Threading;
-#if __UNIFIED__
-using UIKit;
using CoreAnimation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreAnimation;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class VisualElementTracker : IDisposable
diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj
deleted file mode 100644
index 45699da..0000000
--- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj
+++ /dev/null
@@ -1,274 +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>{4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}</ProjectGuid>
- <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <RootNamespace>Xamarin.Forms.Platform.iOS</RootNamespace>
- <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
- <AssemblyName>Xamarin.Forms.Platform.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>TRACE;DEBUG;__MOBILE__;__IOS__</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>
- <DefineConstants>TRACE;__IOS__;__MOBILE__;</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <NoWarn>
- </NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Turkey\</OutputPath>
- <DefineConstants>__MOBILE__;__IOS__;TRACE;DEBUG;__MOBILE__;__IOS__</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="CADisplayLinkTicker.cs" />
- <Compile Include="ContextActionCell.cs" />
- <Compile Include="ContextScrollViewDelegate.cs" />
- <Compile Include="EffectUtilities.cs" />
- <Compile Include="Extensions\CellExtensions.cs" />
- <Compile Include="Extensions\PlatformConfigurationExtensions.cs" />
- <Compile Include="Forms.cs" />
- <Compile Include="GlobalCloseContextGestureRecognizer.cs" />
- <Compile Include="Extensions\ArrayExtensions.cs" />
- <Compile Include="NativeViewWrapper.cs" />
- <Compile Include="NativeViewWrapperRenderer.cs" />
- <Compile Include="PlatformEffect.cs" />
- <Compile Include="Renderers\AlignmentExtensions.cs" />
- <Compile Include="PageExtensions.cs" />
- <Compile Include="Renderers\ExportCellAttribute.cs" />
- <Compile Include="Renderers\ExportImageSourceHandlerAttribute.cs" />
- <Compile Include="Renderers\ExportRendererAttribute.cs" />
- <Compile Include="Resources\StringResources.Designer.cs" />
- <Compile Include="ViewInitializedEventArgs.cs" />
- <Compile Include="NativeViewPropertyListener.cs" />
- <Compile Include="Extensions\LayoutExtensions.cs" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="$(MSBuildThisFileDirectory)Deserializer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)ElementChangedEventArgs.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)EventTracker.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)FormsApplicationDelegate.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)IVisualElementRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Platform.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)PlatformRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)RendererFactory.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)RendererPool.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)ResourcesProvider.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)ViewRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)VisualElementPackager.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)VisualElementRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)VisualElementTracker.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Cells\CellRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Cells\CellTableViewCell.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Cells\EntryCellRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Cells\ImageCellRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Cells\SwitchCellRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Cells\TextCellRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Cells\ViewCellRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Extensions\ColorExtensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Extensions\DateExtensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Extensions\Extensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Extensions\ToolbarItemExtensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Extensions\UIViewExtensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Extensions\ViewExtensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\ActivityIndicatorRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\BoxRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\ButtonRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\CarouselPageRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\DatePickerRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\EditorRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\EntryRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\FontExtensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\FormattedStringExtensions.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\FrameRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\ImageRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\KeyboardInsetTracker.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\KeyboardObserver.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\LabelRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\ListViewRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\NavigationMenuRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\NavigationRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\OpenGLViewRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\PageRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\PhoneMasterDetailRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\PickerRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\ProgressBarRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\ScrollViewRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\SearchBarRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\SliderRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\StepperRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\SwitchRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\TabbedRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\TableViewModelRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\TableViewRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\TabletMasterDetailRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\TimePickerRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Renderers\WebViewRenderer.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
- <Compile Include="iOSAppIndexingProvider.cs" />
- <Compile Include="iOSAppLinks.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.ar.resx" />
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="monotouch" />
- <Reference Include="System.Net.Http" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
- <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
- <Name>Xamarin.Forms.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.ca.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.cs.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.da.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.de.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.el.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.es.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.fi.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.fr.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.he.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.hi.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.hr.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.hu.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.id.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.it.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.ja.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.ko.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.ms.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.nb.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.nl.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.pl.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.pt-BR.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.pt.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.ro.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.ru.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.sk.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.sv.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.th.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.tr.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.uk.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.vi.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.zh-Hans.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.zh-Hant.resx" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\StringResources.zh-HK.resx" />
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
index e31aa3a..c7f0278 100644
--- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
+++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
@@ -37,7 +37,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>
diff --git a/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs b/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs
index 8c46ed0..f8771a9 100644
--- a/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs
+++ b/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs
@@ -1,16 +1,9 @@
using System;
using System.Threading.Tasks;
-#if __UNIFIED__
-using Foundation;
using CoreSpotlight;
+using Foundation;
using UIKit;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-using MonoTouch.CoreSpotlight;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal class IOSAppLinks : IAppLinks
@@ -60,11 +53,7 @@ namespace Xamarin.Forms.Platform.iOS
//we need to make sure we index the item in spotlight first or the RelatedUniqueIdentifier will not work
await IndexItemAsync(searchItem);
-#if __UNIFIED__
var activity = new NSUserActivity($"{appDomain}.{contentType}");
-#else
- var activity = new NSUserActivity (new NSString($"{appDomain}.{contentType}"));
-#endif
activity.Title = deepLinkUri.Title;
activity.EligibleForSearch = true;
diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index 168583a..24ba8ed 100644
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -13,19 +13,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Control Gallery", "Control
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml", "{32F608E2-6406-4DCF-9105-E2A7CB7085CF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS.Classic", "Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS.Classic.csproj", "{4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}"
- ProjectSection(ProjectDependencies) = postProject
- {C7131F14-274F-4B55-ACA9-E81731AD012F} = {C7131F14-274F-4B55-ACA9-E81731AD012F}
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS", "Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS.csproj", "{271193C1-6E7C-429C-A36D-3F1BE5267231}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android", "Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj", "{0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.UnitTests", "Xamarin.Forms.Core.UnitTests\Xamarin.Forms.Core.UnitTests.csproj", "{00259593-A283-47A5-ACB7-9C3819B16364}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.iOS.Classic", "Xamarin.Forms.ControlGallery.iOS\Xamarin.Forms.ControlGallery.iOS.Classic.csproj", "{DEEC5844-D609-4F35-BCF0-5B71C91C8133}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.Android", "Xamarin.Forms.ControlGallery.Android\Xamarin.Forms.ControlGallery.Android.csproj", "{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Xamlg", "Xamarin.Forms.Xaml.Xamlg\Xamarin.Forms.Xaml.Xamlg.csproj", "{D597E3C6-1A50-4042-99FA-3E7CE28E4819}"
@@ -90,8 +83,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Android.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.CustomAttributes", "Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj", "{4DCD0420-1168-4B77-86DB-6196EE4BD491}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.iOS.Classic", "Xamarin.Forms.Maps.iOS\Xamarin.Forms.Maps.iOS.Classic.csproj", "{CA10FACD-22AB-463F-A20E-379C212B0858}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.iOS", "Xamarin.Forms.ControlGallery.iOS\Xamarin.Forms.ControlGallery.iOS.csproj", "{C7131F14-274F-4B55-ACA9-E81731AD012F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform", "Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
@@ -100,8 +91,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forwarders", "Forwarders",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android (Forwarders)", "Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj", "{6E53FEB1-1100-46AE-8013-17BBA35CC197}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS.Classic (Forwarders)", "Stubs\Xamarin.Forms.Platform.iOS.Classic\Xamarin.Forms.Platform.iOS.Classic (Forwarders).csproj", "{3E443AEF-3EC0-48C4-A524-7C6996339E1B}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS (Forwarders)", "Stubs\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS (Forwarders).csproj", "{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.WP8 (Forwarders)", "Stubs\Xamarin.Forms.Platform.WP8\Xamarin.Forms.Platform.WP8 (Forwarders).csproj", "{483CDAE7-4353-4AB2-9C20-145A9F148FAD}"
@@ -148,14 +137,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery", "PagesGaller
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.Droid", "PagesGallery\PagesGallery.Droid\PagesGallery.Droid.csproj", "{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.iOS", "PagesGallery\PagesGallery.iOS\PagesGallery.iOS.csproj", "{392156B2-760A-4EE3-A822-CABD3238A21D}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.UWP", "PagesGallery\PagesGallery.UWP\PagesGallery.UWP.csproj", "{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.AppLinks", "Xamarin.Forms.Platform.Android.AppLinks\Xamarin.Forms.Platform.Android.AppLinks.csproj", "{42DB052E-0909-45D2-8240-187F99F393FB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages.Azure", "Xamarin.Forms.Pages.Azure\Xamarin.Forms.Pages.Azure.csproj", "{C9696465-7657-4843-872E-3C01891C4A9B}"
EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "PagesGallery.iOS", "PagesGallery\PagesGallery.iOS\PagesGallery.iOS.csproj", "{62DE9FC4-F77B-400C-A47C-F1559741C44B}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
docs\APIDocs.projitems*{dc1f3933-ac99-4887-8b09-e13c2b346d4f}*SharedItemsImports = 13
@@ -182,32 +171,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|ARM.Build.0 = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|iPhone.Build.0 = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|Templates.ActiveCfg = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|x64.Build.0 = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Debug|x86.Build.0 = Debug|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|Any CPU.Build.0 = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|ARM.ActiveCfg = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|ARM.Build.0 = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|iPhone.ActiveCfg = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|iPhone.Build.0 = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|Templates.ActiveCfg = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|x64.ActiveCfg = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|x64.Build.0 = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|x86.ActiveCfg = Release|Any CPU
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}.Release|x86.Build.0 = Release|Any CPU
{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|Any CPU.Build.0 = Debug|Any CPU
{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -286,30 +249,6 @@ Global
{00259593-A283-47A5-ACB7-9C3819B16364}.Release|x64.Build.0 = Release|Any CPU
{00259593-A283-47A5-ACB7-9C3819B16364}.Release|x86.ActiveCfg = Release|Any CPU
{00259593-A283-47A5-ACB7-9C3819B16364}.Release|x86.Build.0 = Release|Any CPU
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|ARM.ActiveCfg = Debug|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|iPhone.Build.0 = Debug|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|iPhone.Deploy.0 = Debug|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|Templates.ActiveCfg = Debug|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|x64.ActiveCfg = Debug|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Debug|x86.ActiveCfg = Debug|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|Any CPU.Deploy.0 = Release|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|ARM.ActiveCfg = Release|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|iPhone.ActiveCfg = Release|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|iPhone.Build.0 = Release|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|iPhone.Deploy.0 = Release|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|Templates.ActiveCfg = Release|iPhoneSimulator
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|x64.ActiveCfg = Release|iPhone
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133}.Release|x86.ActiveCfg = Release|iPhone
{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -830,32 +769,6 @@ Global
{4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x64.Build.0 = Release|Any CPU
{4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x86.ActiveCfg = Release|Any CPU
{4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x86.Build.0 = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|ARM.Build.0 = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|iPhone.Build.0 = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|Templates.ActiveCfg = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|x64.ActiveCfg = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|x64.Build.0 = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Debug|x86.Build.0 = Debug|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|Any CPU.Build.0 = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|ARM.ActiveCfg = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|ARM.Build.0 = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|iPhone.ActiveCfg = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|iPhone.Build.0 = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|Templates.ActiveCfg = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|x64.ActiveCfg = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|x64.Build.0 = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|x86.ActiveCfg = Release|Any CPU
- {CA10FACD-22AB-463F-A20E-379C212B0858}.Release|x86.Build.0 = Release|Any CPU
{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|ARM.ActiveCfg = Debug|iPhone
@@ -928,32 +841,6 @@ Global
{6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|x64.Build.0 = Release|Any CPU
{6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|x86.ActiveCfg = Release|Any CPU
{6E53FEB1-1100-46AE-8013-17BBA35CC197}.Release|x86.Build.0 = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|ARM.Build.0 = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|iPhone.Build.0 = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|Templates.ActiveCfg = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|x64.Build.0 = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Debug|x86.Build.0 = Debug|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|Any CPU.Build.0 = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|ARM.ActiveCfg = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|ARM.Build.0 = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|iPhone.ActiveCfg = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|iPhone.Build.0 = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|Templates.ActiveCfg = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|x64.ActiveCfg = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|x64.Build.0 = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|x86.ActiveCfg = Release|Any CPU
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B}.Release|x86.Build.0 = Release|Any CPU
{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1534,25 +1421,6 @@ Global
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.ActiveCfg = Release|Any CPU
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Build.0 = Release|Any CPU
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Deploy.0 = Release|Any CPU
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|ARM.ActiveCfg = Debug|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.Build.0 = Debug|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Templates.ActiveCfg = Debug|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x64.ActiveCfg = Debug|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x86.ActiveCfg = Debug|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|Any CPU.ActiveCfg = Release|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|ARM.ActiveCfg = Release|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhone.ActiveCfg = Release|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhone.Build.0 = Release|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|Templates.ActiveCfg = Release|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x64.ActiveCfg = Release|iPhone
- {392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x86.ActiveCfg = Release|iPhone
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.ActiveCfg = Debug|x86
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Build.0 = Debug|x86
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Deploy.0 = Debug|x86
@@ -1637,16 +1505,33 @@ Global
{C9696465-7657-4843-872E-3C01891C4A9B}.Release|x64.Build.0 = Release|Any CPU
{C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.ActiveCfg = Release|Any CPU
{C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.Build.0 = Release|Any CPU
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|ARM.ActiveCfg = Debug|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|iPhone.ActiveCfg = Debug|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|iPhone.Build.0 = Debug|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|Templates.ActiveCfg = Debug|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|x64.ActiveCfg = Debug|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Debug|x86.ActiveCfg = Debug|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|Any CPU.ActiveCfg = Release|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|ARM.ActiveCfg = Release|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|iPhone.ActiveCfg = Release|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|iPhone.Build.0 = Release|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|Templates.ActiveCfg = Release|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|x64.ActiveCfg = Release|iPhone
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B}.Release|x86.ActiveCfg = Release|iPhone
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
{271193C1-6E7C-429C-A36D-3F1BE5267231} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
{0E16E70A-D6DD-4323-AD5D-363ABFF42D6A} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
{00259593-A283-47A5-ACB7-9C3819B16364} = {33A20844-7EF4-441D-83DA-2ACAF5E1CDFA}
- {DEEC5844-D609-4F35-BCF0-5B71C91C8133} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
{1346A7F1-4457-4BB4-A371-2C8E28BBD53E} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
{D597E3C6-1A50-4042-99FA-3E7CE28E4819} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
{4B14D295-C09B-4C38-B880-7CC768E50585} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
@@ -1667,12 +1552,10 @@ Global
{EADD8100-B3AE-4A31-92C4-267A64A1C6EB} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9}
{A34EBE01-25BF-4E69-A2DC-2288DC625541} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9}
{4DCD0420-1168-4B77-86DB-6196EE4BD491} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9}
- {CA10FACD-22AB-463F-A20E-379C212B0858} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
{C7131F14-274F-4B55-ACA9-E81731AD012F} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
{67F9D3A8-F71E-4428-913F-C37AE82CDB24} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
{5A2DADBC-9510-4DD1-BE58-01501F2DF65D} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
{6E53FEB1-1100-46AE-8013-17BBA35CC197} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D}
- {3E443AEF-3EC0-48C4-A524-7C6996339E1B} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D}
{39B3457F-01D8-43D0-8E84-D8C4F73CF48D} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D}
{483CDAE7-4353-4AB2-9C20-145A9F148FAD} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D}
{F3FDD7AC-8899-4E41-BFD7-EC83403E736D} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
@@ -1695,9 +1578,9 @@ Global
{447DC60E-C485-4427-8CF7-50074C6B61DE} = {33A20844-7EF4-441D-83DA-2ACAF5E1CDFA}
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41} = {80BAC3FB-357A-4D05-A050-9F234DF49C97}
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2} = {80BAC3FB-357A-4D05-A050-9F234DF49C97}
- {392156B2-760A-4EE3-A822-CABD3238A21D} = {80BAC3FB-357A-4D05-A050-9F234DF49C97}
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B} = {80BAC3FB-357A-4D05-A050-9F234DF49C97}
{42DB052E-0909-45D2-8240-187F99F393FB} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
{C9696465-7657-4843-872E-3C01891C4A9B} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
+ {62DE9FC4-F77B-400C-A47C-F1559741C44B} = {80BAC3FB-357A-4D05-A050-9F234DF49C97}
EndGlobalSection
EndGlobal