Skip to content

Commit

Permalink
Fix broken tizen/ios initialization (#15190)
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkatz6 committed Apr 6, 2024
1 parent 7788f71 commit 58f930e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions samples/MobileSandbox/MobileSandbox.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;$(AvsCurrentTargetFramework)</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android;net8.0-browser;net8.0-ios</TargetFrameworks>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/SafeAreaDemo.iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
<string>10.0</string>
<string>13.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
Expand Down
5 changes: 4 additions & 1 deletion samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(AvsCurrentIOSTargetFramework)</TargetFramework>
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
<ProvisioningType>manual</ProvisioningType>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<CodesignKey>Apple Development: [email protected] (DN2P3PH6J5)</CodesignKey>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SafeAreaDemo\SafeAreaDemo.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen/Avalonia.Tizen/NuiTizenApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public Control? MainView
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 override void OnCreate()
Expand Down
2 changes: 1 addition & 1 deletion src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ event EventHandler<ActivatedEventArgs> IAvaloniaAppDelegate.Deactivated
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;

[Export("window")]
Expand Down

0 comments on commit 58f930e

Please sign in to comment.