Browse Source

Fix broken tizen/ios initialization (#15190)

pull/15203/head
Max Katz 2 years ago
committed by GitHub
parent
commit
c5befd950d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 3
      samples/MobileSandbox/MobileSandbox.csproj
  2. 2
      samples/SafeAreaDemo.iOS/Info.plist
  3. 5
      samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj
  4. 2
      src/Tizen/Avalonia.Tizen/NuiTizenApplication.cs
  5. 2
      src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs

3
samples/MobileSandbox/MobileSandbox.csproj

@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net8.0;net8.0-android;net8.0-browser;net8.0-tizen</TargetFrameworks> <TargetFrameworks>net8.0;net8.0-android;net8.0-browser;net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>

2
samples/SafeAreaDemo.iOS/Info.plist

@ -13,7 +13,7 @@
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>10.0</string> <string>13.0</string>
<key>UIDeviceFamily</key> <key>UIDeviceFamily</key>
<array> <array>
<integer>1</integer> <integer>1</integer>

5
samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj

@ -2,10 +2,13 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>$(AvsCurrentIOSTargetFramework)</TargetFramework> <TargetFramework>$(AvsCurrentIOSTargetFramework)</TargetFramework>
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
<ProvisioningType>manual</ProvisioningType> <ProvisioningType>manual</ProvisioningType>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<CodesignKey>Apple Development: maxkatz6@outlook.com (DN2P3PH6J5)</CodesignKey>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\SafeAreaDemo\SafeAreaDemo.csproj" /> <ProjectReference Include="..\SafeAreaDemo\SafeAreaDemo.csproj" />

2
src/Tizen/Avalonia.Tizen/NuiTizenApplication.cs

@ -31,7 +31,7 @@ public class NuiTizenApplication<TApp> : NUIApplication
public TopLevel? TopLevel => View.TopLevel; public TopLevel? TopLevel => View.TopLevel;
} }
protected virtual AppBuilder CreateAppBuilder() => AppBuilder.Configure<Application>().UseTizen(); protected virtual AppBuilder CreateAppBuilder() => AppBuilder.Configure<TApp>().UseTizen();
protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder; protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder;
protected override void OnCreate() protected override void OnCreate()

2
src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs

@ -34,7 +34,7 @@ namespace Avalonia.iOS
remove { _onDeactivated -= value; } remove { _onDeactivated -= value; }
} }
protected virtual AppBuilder CreateAppBuilder() => AppBuilder.Configure<Application>().UseiOS(); protected virtual AppBuilder CreateAppBuilder() => AppBuilder.Configure<TApp>().UseiOS();
protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder; protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder;
[Export("window")] [Export("window")]

Loading…
Cancel
Save