Commit a9487f01 authored by Benjamin REIS's avatar Benjamin REIS

update xamarin for iOS

parent 11745dd6
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
// Version du runtime :4.0.30319.42000
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
......@@ -2342,27 +2342,9 @@ namespace Xamarin.Droid
// aapt resource value: 0x7f020053
public const int avd_hide_password = 2130837587;
// aapt resource value: 0x7f02012f
public const int avd_hide_password_1 = 2130837807;
// aapt resource value: 0x7f020130
public const int avd_hide_password_2 = 2130837808;
// aapt resource value: 0x7f020131
public const int avd_hide_password_3 = 2130837809;
// aapt resource value: 0x7f020054
public const int avd_show_password = 2130837588;
// aapt resource value: 0x7f020132
public const int avd_show_password_1 = 2130837810;
// aapt resource value: 0x7f020133
public const int avd_show_password_2 = 2130837811;
// aapt resource value: 0x7f020134
public const int avd_show_password_3 = 2130837812;
// aapt resource value: 0x7f020055
public const int design_bottom_navigation_item_background = 2130837589;
......
......@@ -7,25 +7,25 @@ using UIKit;
namespace Xamarin.iOS
{
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
// application events from iOS.
[Register("AppDelegate")]
public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
{
//
// This method is invoked when the application has loaded and is ready to run. In this
// method you should instantiate the window, load the UI into it and then make the window
// visible.
//
// You have 17 seconds to return from this method, or iOS will terminate your application.
//
public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{
global::Xamarin.Forms.Forms.Init();
LoadApplication(new App());
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
// application events from iOS.
[Register("AppDelegate")]
public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
{
//
// This method is invoked when the application has loaded and is ready to run. In this
// method you should instantiate the window, load the UI into it and then make the window
// visible.
//
// You have 17 seconds to return from this method, or iOS will terminate your application.
//
public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{
global::Xamarin.Forms.Forms.Init ();
LoadApplication (new App());
return base.FinishedLaunching(app, options);
}
}
return base.FinishedLaunching (app, options);
}
}
}
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
</dict>
<dict/>
</plist>
......@@ -10,6 +10,7 @@
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
......@@ -25,14 +26,30 @@
<key>CFBundleDisplayName</key>
<string>Xamarin</string>
<key>CFBundleIdentifier</key>
<string>com.companyname.Xamarin</string>
<string>org.linphone.xamarin</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>CFBundleIconFiles</key>
<array>
<string>Icon-60@2x.png</string>
<string>Icon-60@3x.png</string>
<string>Icon-76.png</string>
<string>Icon-76@2x.png</string>
<string>Default.png</string>
<string>Default@2x.png</string>
<string>Default-568h@2x.png</string>
<string>Default-Portrait.png</string>
<string>Default-Portrait@2x.png</string>
<string>Icon-Small-40.png</string>
<string>Icon-Small-40@2x.png</string>
<string>Icon-Small-40@3x.png</string>
<string>Icon-Small.png</string>
<string>Icon-Small@2x.png</string>
<string>Icon-Small@3x.png</string>
</array>
<key>CFBundleName</key>
<string>Xamarin</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>NSMicrophoneUsageDescription</key>
<string>Make audio call</string>
</dict>
</plist>
......@@ -7,14 +7,14 @@ using UIKit;
namespace Xamarin.iOS
{
public class Application
{
// This is the main entry point of the application.
static void Main(string[] args)
{
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main(args, null, "AppDelegate");
}
}
public class IApplication
{
// This is the main entry point of the application.
static void Main(string[] args)
{
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main(args, null, "AppDelegate");
}
}
}
......@@ -27,6 +27,9 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignKey>iPhone Developer: Benjamin Reis (79E334HYJ8)</CodesignKey>
<AssemblyName>LinphoneXamarin.iOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
......@@ -37,6 +40,9 @@
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<ConsolePause>false</ConsolePause>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignKey>iPhone Developer: Benjamin Reis (79E334HYJ8)</CodesignKey>
<AssemblyName>LinphoneXamarin.iOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
......@@ -48,9 +54,10 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignKey>iPhone Developer: Benjamin Reis (79E334HYJ8)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
......@@ -60,8 +67,9 @@
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignKey>iPhone Developer: Benjamin Reis (79E334HYJ8)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<DebugType>none</DebugType>
......@@ -72,8 +80,8 @@
<ConsolePause>False</ConsolePause>
<MtouchArch>ARM64</MtouchArch>
<BuildIpa>True</BuildIpa>
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignKey>iPhone Developer: Benjamin Reis (79E334HYJ8)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
......@@ -84,8 +92,8 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<MtouchArch>ARM64</MtouchArch>
<CodesignProvision>Automatic:AppStore</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignKey>iPhone Developer: Benjamin Reis (79E334HYJ8)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
<ItemGroup>
......@@ -147,7 +155,47 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
<PackageReference Include="Xamarin.Forms">
<Version>3.1.0.697729</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<NativeReference Include="Frameworks\bctoolbox.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\belcard.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\belr.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\linphone.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\mediastreamer_base.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\mediastreamer_voip.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\mediastreamer2.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\mswebrtc.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="Frameworks\ortp.framework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\Xamarin\Xamarin.projitems" Label="Shared" />
......
......@@ -234,7 +234,7 @@ ios-sdk:
\tarchives=`find iOS/liblinphone-sdk/{first_arch}-apple-darwin.ios -name '*.framework'` && \\
\trm -rf iOS/liblinphone-sdk/apple-darwin && \\
\tmkdir -p iOS/liblinphone-sdk/apple-darwin && \\
\tcp iOS/liblinphone-sdk/{first_arch}-apple-darwin.ios/share/linphonecs/LinphoneWrapper.cs LinphoneXamarin/LinphoneXamarin/LinphoneXamarin && \\
\tcp iOS/liblinphone-sdk/{first_arch}-apple-darwin.ios/share/linphonecs/LinphoneWrapper.cs Xamarin/Xamarin/Xamarin && \\
\tcp -rf iOS/liblinphone-sdk/{first_arch}-apple-darwin.ios/share iOS/liblinphone-sdk/apple-darwin/. && \\
\tcp -rf iOS/liblinphone-sdk/{first_arch}-apple-darwin.ios/lib iOS/liblinphone-sdk/apple-darwin/. && \\
\tcp -rf iOS/liblinphone-sdk/{first_arch}-apple-darwin.ios/include iOS/liblinphone-sdk/apple-darwin/. && \\
......@@ -254,7 +254,7 @@ ios-sdk:
\t\techo "[{archs}] Mixing `basename $$archive` in $$destpath"; \\
\t\tlipo -create -output $$destpath/$$framework_name $$armv7_path/$$framework_name $$arm64_path/$$framework_name $$x86_64_path/$$framework_name; \\
\tdone; \\
\tcp -rf iOS/liblinphone-sdk/apple-darwin/Frameworks LinphoneXamarin/LinphoneXamarin/LinphoneXamarin.iOS \\
\tcp -rf iOS/liblinphone-sdk/apple-darwin/Frameworks Xamarin/Xamarin/Xamarin.iOS \\
generate-ios-sdk: $(addprefix ios-, $(addsuffix -build, $(ios-archs)))
\t$(MAKE) -f Makefile.ios ios-sdk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment