Skip to content

Commit a3c966e

Browse files
slodgeslodge
committed
Merge pull request #9 from ololabs/unified
Convert to unified API
2 parents fafbf61 + 661b447 commit a3c966e

File tree

120 files changed

+223
-1294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+223
-1294
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ obj/
2727
[Rr]elease*/
2828
_ReSharper*/
2929
[Tt]est[Rr]esult*
30+
packages/
31+
*.userprefs

‎Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Project Lead - Stuart Lodge, @slodge, [email protected]
77

88
using System.Collections.Generic;
9-
using MonoTouch.UIKit;
9+
using UIKit;
1010

1111
namespace Cirrious.FluentLayouts.Touch
1212
{

‎Cirrious.FluentLayout/Cirrious.FluentLayouts.Touch.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
86
<ProjectGuid>{75D2DA9D-DFD4-49A1-98FB-FE0F0677EF0F}</ProjectGuid>
9-
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
7+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
108
<OutputType>Library</OutputType>
119
<RootNamespace>Cirrious.FluentLayouts.Touch</RootNamespace>
1210
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1311
<AssemblyName>Cirrious.FluentLayouts.Touch</AssemblyName>
12+
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
13+
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
1616
<DebugSymbols>true</DebugSymbols>
@@ -48,7 +48,7 @@
4848
<Reference Include="System" />
4949
<Reference Include="System.Xml" />
5050
<Reference Include="System.Core" />
51-
<Reference Include="monotouch" />
51+
<Reference Include="Xamarin.iOS" />
5252
</ItemGroup>
53-
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
53+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
5454
</Project>

‎Cirrious.FluentLayout/FluentLayout.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
using System;
99
using System.Collections.Generic;
10-
using MonoTouch.Foundation;
11-
using MonoTouch.UIKit;
10+
using UIKit;
11+
using Foundation;
1212

1313
namespace Cirrious.FluentLayouts.Touch
1414
{

‎Cirrious.FluentLayout/FluentLayoutExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using System.Collections.Generic;
99
using System.Linq;
10-
using MonoTouch.UIKit;
10+
using UIKit;
1111

1212
namespace Cirrious.FluentLayouts.Touch
1313
{

‎Cirrious.FluentLayout/RowSet-WorkInProgress/RowSet.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Text;
5-
using MonoTouch.UIKit;
4+
using UIKit;
65

76
namespace Cirrious.FluentLayouts.Touch.RowSet
87
{

‎Cirrious.FluentLayout/UIViewAndLayoutAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//
66
// Project Lead - Stuart Lodge, @slodge, [email protected]
77

8-
using MonoTouch.UIKit;
8+
using UIKit;
99

1010
namespace Cirrious.FluentLayouts.Touch
1111
{

‎QuickLayout.Core/QuickLayout.Core.csproj‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>QuickLayout.Core</RootNamespace>
1212
<AssemblyName>QuickLayout.Core</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Profile158</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
1515
<FileAlignment>512</FileAlignment>
1616
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
</PropertyGroup>
@@ -45,29 +45,27 @@
4545
<Compile Include="ViewModels\SearchViewModel.cs" />
4646
<Compile Include="ViewModels\TipViewModel.cs" />
4747
</ItemGroup>
48+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
49+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
50+
Other similar extension points exist, see Microsoft.Common.targets.
51+
<Target Name="BeforeBuild">
52+
</Target>
53+
<Target Name="AfterBuild">
54+
</Target>
55+
-->
4856
<ItemGroup>
4957
<None Include="packages.config" />
58+
<None Include="ToDo-MvvmCross\_ Core.txt" />
5059
</ItemGroup>
5160
<ItemGroup>
5261
<Reference Include="Cirrious.CrossCore">
53-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\portable-win+net45+MonoAndroid+MonoTouch+sl40+wp71\Cirrious.CrossCore.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Cirrious.MvvmCross">
56-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.0.14\lib\portable-win+net45+MonoAndroid+MonoTouch+sl40+wp71\Cirrious.MvvmCross.dll</HintPath>
62+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\portable-win+net45+wp8+win8+wpa81+Xamarin.iOS10+MonoAndroid\Cirrious.CrossCore.dll</HintPath>
5763
</Reference>
5864
<Reference Include="Cirrious.MvvmCross.Localization">
59-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\portable-win+net45+MonoAndroid+MonoTouch+sl40+wp71\Cirrious.MvvmCross.Localization.dll</HintPath>
65+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\portable-win+net45+wp8+win8+wpa81+Xamarin.iOS10+MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Cirrious.MvvmCross">
68+
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.5.0-alpha2\lib\portable-win+net45+wp8+win8+wpa81+Xamarin.iOS10+MonoAndroid\Cirrious.MvvmCross.dll</HintPath>
6069
</Reference>
6170
</ItemGroup>
62-
<ItemGroup>
63-
<Content Include="ToDo-MvvmCross\_ Core.txt" />
64-
</ItemGroup>
65-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
66-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
67-
Other similar extension points exist, see Microsoft.Common.targets.
68-
<Target Name="BeforeBuild">
69-
</Target>
70-
<Target Name="AfterBuild">
71-
</Target>
72-
-->
7371
</Project>

‎QuickLayout.Core/ToDo-MvvmCross/_ Core.txt‎

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

‎QuickLayout.Core/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="MvvmCross" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
4-
<package id="MvvmCross.HotTuna.CrossCore" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
5-
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
6-
<package id="MvvmCross.HotTuna.StarterPack" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
7-
<package id="MvvmCross.PortableSupport" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MvvmCross" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
4+
<package id="MvvmCross.HotTuna.CrossCore" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
5+
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
6+
<package id="MvvmCross.HotTuna.StarterPack" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
7+
<package id="MvvmCross.PortableSupport" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
88
</packages>

0 commit comments

Comments
 (0)