Skip to content
This repository has been archived by the owner on Feb 29, 2020. It is now read-only.

Commit

Permalink
Xamarin.iOS Unified API Support
Browse files Browse the repository at this point in the history
  • Loading branch information
Redth authored and paulbatum committed Dec 23, 2014
1 parent ccac730 commit d778c60
Show file tree
Hide file tree
Showing 9 changed files with 257 additions and 23 deletions.
10 changes: 9 additions & 1 deletion component/component.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ icons:
- azure-mobile-services_128x128.png
libraries:
ios:
- ..\..\bin\Signed\Release\Managed\iOS-Classic\Microsoft.WindowsAzure.Mobile.dll
- ..\..\bin\Signed\Release\Managed\iOS-Classic\Microsoft.WindowsAzure.Mobile.Ext.dll
- ..\..\bin\Signed\Release\Managed\iOS-Classic\Newtonsoft.Json.dll
- ..\..\bin\Signed\Release\Managed\iOS-Classic\System.Net.Http.Extensions.dll
- ..\..\bin\Signed\Release\Managed\iOS-Classic\System.Net.Http.Primitives.dll
ios-unified:
- ..\..\bin\Signed\Release\Managed\iOS\Microsoft.WindowsAzure.Mobile.dll
- ..\..\bin\Signed\Release\Managed\iOS\Microsoft.WindowsAzure.Mobile.Ext.dll
- ..\..\bin\Signed\Release\Managed\iOS\Newtonsoft.Json.dll
Expand All @@ -29,7 +35,9 @@ libraries:
samples:
- name: Android Sample
path: samples\androidsample\androidsample.sln
- name: iOS Sample
- name: iOS Classic API Sample
path: samples\iOSsample-Classic\iOSsample-Classic.sln
- name: iOS Unified API Sample
path: samples\iOSsample\iOSsample.sln
screenshots:
- screenshots/WAMS-New.PNG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WindowsAzure.Mobile.WP81.Test", "test\Microsoft.WindowsAzure.MobileServices.WindowsPhone81.Test\Microsoft.WindowsAzure.Mobile.WP81.Test.csproj", "{92CD4A69-950A-45FE-B8EA-774BA69E7482}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WindowsAzure.Mobile.Test.Unit", "test\Microsoft.WindowsAzure.MobileServices.Test.Unit\Microsoft.WindowsAzure.Mobile.Test.Unit.csproj", "{574B5567-FF51-4B0F-A9ED-CC9F711E9156}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WindowsAzure.Mobile.Ext.iOS-Classic", "src\Microsoft.WindowsAzure.MobileServices.iOS\Microsoft.WindowsAzure.Mobile.Ext.iOS-Classic.csproj", "{9D2109B6-F005-4419-B9DB-8FA2A4514D28}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -562,6 +563,30 @@ Global
{574B5567-FF51-4B0F-A9ED-CC9F711E9156}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
{574B5567-FF51-4B0F-A9ED-CC9F711E9156}.Signed|x64.ActiveCfg = Release|Any CPU
{574B5567-FF51-4B0F-A9ED-CC9F711E9156}.Signed|x86.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|ARM.ActiveCfg = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|ARM.Build.0 = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|x64.ActiveCfg = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Debug|x86.ActiveCfg = Debug|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|Any CPU.Build.0 = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|ARM.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|ARM.Build.0 = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|x64.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Release|x86.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|Any CPU.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|Any CPU.Build.0 = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|ARM.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|ARM.Build.0 = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|Mixed Platforms.Build.0 = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|x64.ActiveCfg = Release|Any CPU
{9D2109B6-F005-4419-B9DB-8FA2A4514D28}.Signed|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -585,5 +610,6 @@ Global
{02EEF75A-D824-4203-B243-C1B97B0D35A9} = {BA83494B-A52F-4CC8-B2BE-E339376AD2D5}
{92CD4A69-950A-45FE-B8EA-774BA69E7482} = {45E57CDC-7178-4915-8D0B-CF80F5E44AF6}
{574B5567-FF51-4B0F-A9ED-CC9F711E9156} = {45E57CDC-7178-4915-8D0B-CF80F5E44AF6}
{9D2109B6-F005-4419-B9DB-8FA2A4514D28} = {BA83494B-A52F-4CC8-B2BE-E339376AD2D5}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
using System.Collections.Generic;
using System.Drawing;
using System.Threading.Tasks;
using Xamarin.Auth._MobileServices;
#if __UNIFIED__
using Foundation;
using UIKit;
using NSAction = System.Action;
#else
using MonoTouch.Foundation;
using MonoTouch.UIKit;
using Xamarin.Auth._MobileServices;
#endif

namespace Microsoft.WindowsAzure.MobileServices
{
Expand Down Expand Up @@ -90,4 +96,4 @@ protected override Task<string> LoginAsyncOverride()
return tcs.Task;
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
using System.Collections.Generic;
using System.Drawing;
using System.Threading.Tasks;
#if __UNIFIED__
using UIKit;
#else
using MonoTouch.UIKit;
#endif

namespace Microsoft.WindowsAzure.MobileServices
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.WindowsAzure.Mobile.Build.msbuild))\tools\Microsoft.WindowsAzure.Mobile.Build.settings.targets" Condition="$(CmdLine) != ''" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9D2109B6-F005-4419-B9DB-8FA2A4514D28}</ProjectGuid>
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.WindowsAzure.MobileServices</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>Microsoft.WindowsAzure.Mobile.Ext</AssemblyName>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\classic\Debug</OutputPath>
<IntermediateOutputPath>obj\classic\Debug</IntermediateOutputPath>
<DefineConstants>DEBUG;__IOS__;__MOBILE__;PLATFORM_IOS;XAMARIN_AUTH_INTERNAL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\classic\Release</OutputPath>
<IntermediateOutputPath>obj\classic\Release</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<DocumentationFile>bin\iPhone\Release\Microsoft.WindowsAzure.Mobile.Ext.xml</DocumentationFile>
<DefineConstants>__IOS__;__MOBILE__;PLATFORM_IOS;XAMARIN_AUTH_INTERNAL</DefineConstants>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\managed\src\Microsoft.WindowsAzure.MobileServices.WindowsStore\ExpressionUtility\PartialEvaluator.cs">
<Link>ExpressionUtility\PartialEvaluator.cs</Link>
</Compile>
<Compile Include="..\..\..\managed\src\Microsoft.WindowsAzure.MobileServices.WindowsStore\ExpressionUtility\VisitorHelper.cs">
<Link>ExpressionUtility\VisitorHelper.cs</Link>
</Compile>
<Compile Include="..\..\..\managed\src\Microsoft.WindowsAzure.MobileServices.WindowsStore\Platform\ExpressionUtility.cs">
<Link>Platform\ExpressionUtility.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth.iOS\ACAccountWrapper.cs">
<Link>Auth\iOS\ACAccountWrapper.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth.iOS\FormAuthenticatorController.cs">
<Link>Auth\iOS\FormAuthenticatorController.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth.iOS\KeyChainAccountStore.cs">
<Link>Auth\iOS\KeyChainAccountStore.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth.iOS\ProgressLabel.cs">
<Link>Auth\iOS\ProgressLabel.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth.iOS\UIViewControllerEx.cs">
<Link>Auth\iOS\UIViewControllerEx.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth.iOS\WebAuthenticatorController.cs">
<Link>Auth\iOS\WebAuthenticatorController.cs</Link>
</Compile>
<Compile Include="..\Microsoft.WindowsAzure.MobileServices.Android\ExpressionUtility\ExpressionVisitor.cs">
<Link>ExpressionUtility\ExpressionVisitor.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\Account.cs">
<Link>Auth\Account.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\AccountStore.cs">
<Link>Auth\AccountStore.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\Authenticator.cs">
<Link>Auth\Authenticator.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\AuthException.cs">
<Link>Auth\AuthException.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\ExceptionEx.cs">
<Link>Auth\ExceptionEx.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\FormAuthenticator.cs">
<Link>Auth\FormAuthenticator.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\OAuth1.cs">
<Link>Auth\OAuth1.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\OAuth1Authenticator.cs">
<Link>Auth\OAuth1Authenticator.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\OAuth1Request.cs">
<Link>Auth\OAuth1Request.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\OAuth2Authenticator.cs">
<Link>Auth\OAuth2Authenticator.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\OAuth2Request.cs">
<Link>Auth\OAuth2Request.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\Request.cs">
<Link>Auth\Request.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\Response.cs">
<Link>Auth\Response.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\System.Json\JavaScriptReader.cs">
<Link>Auth\Json\JavaScriptReader.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\System.Json\JsonArray.cs">
<Link>Auth\Json\JsonArray.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\System.Json\JsonObject.cs">
<Link>Auth\Json\JsonObject.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\System.Json\JsonPrimitive.cs">
<Link>Auth\Json\JsonPrimitive.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\System.Json\JsonType.cs">
<Link>Auth\Json\JsonType.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\System.Json\JsonValue.cs">
<Link>Auth\Json\JsonValue.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\WebAuthenticator.cs">
<Link>Auth\WebAuthenticator.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\WebEx.cs">
<Link>Auth\WebEx.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\WebRedirectAuthenticator.cs">
<Link>Auth\WebRedirectAuthenticator.cs</Link>
</Compile>
<Compile Include="..\External\Xamarin.Auth\src\Xamarin.Auth\WebUtilities.cs">
<Link>Auth\WebUtilities.cs</Link>
</Compile>
<Compile Include="Authentication\MobileServiceUIAuthentication.cs" />
<Compile Include="Extensions\MobileServiceClientExtensions.cs" />
<Compile Include="Platform\ApplicationStorage.cs" />
<Compile Include="Platform\CurrentPlatform.cs" />
<Compile Include="Platform\PlatformInformation.cs" />
<Compile Include="Push\Push.cs" />
<Compile Include="Platform\PushUtility.cs" />
<Compile Include="Push\ApnsRegistration.cs" />
<Compile Include="Push\ApnsTemplateRegistration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\monotouch\System.Net.Http.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\monotouch\System.Net.Http.Primitives.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.WindowsAzure.MobileServices\Microsoft.WindowsAzure.Mobile.csproj">
<Project>{75557793-E36E-4190-8714-5BD2665859FB}</Project>
<Name>Microsoft.WindowsAzure.Mobile</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</Target>
</Project>
Loading

0 comments on commit d778c60

Please sign in to comment.