Skip to content

Commit f6589e7

Browse files
peterfootpeterfoot
authored
Merge pull request #1 from unoplatform/dev/nr/pr/peterfoot/588
Merge Uno 5.0 and GTK features
2 parents 738483d + 92174ae commit f6589e7

File tree

11 files changed

+286
-26
lines changed

11 files changed

+286
-26
lines changed

‎UI/UnoCakesMobile/Directory.Packages.props

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
<Project ToolsVersion="15.0">
2-
<ItemGroup>
3-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.1" />
4-
<PackageVersion Include="InTheHand.DependencyInjection" Version="1.0.0" />
5-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
6-
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
7-
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
8-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230502000" />
9-
<!-- Use previous version for unpackaged apps due to build issue https://github.com/microsoft/WindowsAppSDK/issues/3591 -->
10-
<!-- <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.230313.1" /> -->
11-
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
12-
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
13-
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
14-
<PackageVersion Include="Uno.Resizetizer" Version="1.1.2" />
15-
<PackageVersion Include="Uno.Toolkit.WinUI" Version="4.2.22" />
16-
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.42" />
17-
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
18-
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.27" />
19-
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.27" />
20-
<PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="7.0.27" />
21-
<PackageVersion Include="Uno.WinUI" Version="4.9.42" />
22-
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.9.42" />
23-
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.9.42" />
24-
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.8.0" />
25-
</ItemGroup>
2+
<ItemGroup>
3+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
4+
<PackageVersion Include="InTheHand.DependencyInjection" Version="1.0.0" />
5+
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
6+
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
7+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
8+
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
9+
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
10+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
11+
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
12+
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
13+
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
14+
<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
15+
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.17" />
16+
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
17+
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
18+
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.0" />
19+
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.0" />
20+
<PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="7.0.27" />
21+
<PackageVersion Include="Uno.WinUI" Version="5.0.19" />
22+
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.19" />
23+
<PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.19" />
24+
<PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.19" />
25+
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.19" />
26+
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
27+
</ItemGroup>
2628
</Project>

‎UI/UnoCakesMobile/UnoCakesMobile.Mobile/UnoCakesMobile.Mobile.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
3131
<PackageReference Include="Uno.Extensions.Logging.OSLog" />
3232
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
33-
<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
33+
<PackageReference Include="Uno.WinUI.DevServer" Condition="'$(Configuration)'=='Debug'" />
3434
</ItemGroup>
3535
<Choose>
3636
<When Condition="$(IsAndroid)">

‎UI/UnoCakesMobile/UnoCakesMobile.Skia.Gtk/Package.appxmanifest

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<Package
4+
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
5+
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
6+
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
7+
IgnorableNamespaces="uap rescap">
8+
9+
<Identity
10+
Name="UnoCakesMobile"
11+
Publisher="O=UnoCakesMobile"
12+
Version="1.0.0.0" />
13+
14+
<Properties>
15+
<DisplayName>UnoCakesMobile</DisplayName>
16+
<PublisherDisplayName>UnoCakesMobile</PublisherDisplayName>
17+
</Properties>
18+
19+
<Dependencies>
20+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
21+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
22+
</Dependencies>
23+
24+
<Resources>
25+
<Resource Language="x-generate"/>
26+
</Resources>
27+
28+
<Applications>
29+
<Application Id="App"
30+
Executable="$targetnametoken$.exe"
31+
EntryPoint="$targetentrypoint$">
32+
<uap:VisualElements
33+
DisplayName="UnoCakesMobile"
34+
Description="UnoCakesMobile">
35+
<uap:SplashScreen />
36+
</uap:VisualElements>
37+
</Application>
38+
</Applications>
39+
40+
<Capabilities>
41+
<rescap:Capability Name="runFullTrust" />
42+
</Capabilities>
43+
</Package>

‎UI/UnoCakesMobile/UnoCakesMobile.Skia.Gtk/Program.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using GLib;
3+
using Uno.UI.Runtime.Skia.Gtk;
4+
5+
namespace UnoCakesMobile.Skia.Gtk;
6+
7+
public class Program
8+
{
9+
public static void Main(string[] args)
10+
{
11+
ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs)
12+
{
13+
Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString());
14+
expArgs.ExitApplication = true;
15+
};
16+
17+
var host = new GtkHost(() => new AppHead());
18+
19+
host.Run();
20+
}
21+
}

‎UI/UnoCakesMobile/UnoCakesMobile.Skia.Gtk/UnoCakesMobile.Skia.Gtk.csproj

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
4+
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
5+
<TargetFramework>net7.0</TargetFramework>
6+
<ApplicationManifest>app.manifest</ApplicationManifest>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<EmbeddedResource Include="Package.appxmanifest" />
10+
<Manifest Include="$(ApplicationManifest)" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Uno.WinUI.Skia.Gtk" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
16+
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
17+
<PackageReference Include="SkiaSharp.Skottie" />
18+
<PackageReference Include="Uno.WinUI.DevServer" Condition="'$(Configuration)'=='Debug'" />
19+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ProjectReference Include="..\UnoCakesMobile\UnoCakesMobile.csproj" />
23+
</ItemGroup>
24+
<Import Project="..\UnoCakesMobile.Base\base.props" />
25+
</Project>

‎UI/UnoCakesMobile/UnoCakesMobile.Skia.Gtk/app.manifest

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity version="1.0.0.0" name="UnoCakesMobile.Gtk"/>
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<!-- UAC Manifest Options
8+
If you want to change the Windows User Account Control level replace the
9+
requestedExecutionLevel node with one of the following.
10+
11+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
12+
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
13+
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
14+
15+
Specifying requestedExecutionLevel element will disable file and registry virtualization.
16+
Remove this element if your application requires this virtualization for backwards
17+
compatibility.
18+
-->
19+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20+
</requestedPrivileges>
21+
</security>
22+
</trustInfo>
23+
24+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
25+
<application>
26+
<!-- A list of the Windows versions that this application has been tested on
27+
and is designed to work with. Uncomment the appropriate elements
28+
and Windows will automatically select the most compatible environment. -->
29+
30+
<!-- Windows Vista -->
31+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
32+
33+
<!-- Windows 7 -->
34+
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
35+
36+
<!-- Windows 8 -->
37+
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
38+
39+
<!-- Windows 8.1 -->
40+
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
41+
42+
<!-- Windows 10 -->
43+
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
44+
45+
</application>
46+
</compatibility>
47+
48+
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
49+
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
50+
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
51+
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
52+
53+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
54+
<windowsSettings>
55+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
56+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
57+
</windowsSettings>
58+
</application>
59+
60+
61+
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
62+
<!--
63+
<dependency>
64+
<dependentAssembly>
65+
<assemblyIdentity
66+
type="win32"
67+
name="Microsoft.Windows.Common-Controls"
68+
version="6.0.0.0"
69+
processorArchitecture="*"
70+
publicKeyToken="6595b64144ccf1df"
71+
language="*"
72+
/>
73+
</dependentAssembly>
74+
</dependency>
75+
-->
76+
77+
</assembly>

‎UI/UnoCakesMobile/UnoCakesMobile.Wasm/UnoCakesMobile.Wasm.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<PackageReference Include="Uno.Wasm.Bootstrap" />
6060
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
6161
<PackageReference Include="Uno.WinUI.WebAssembly" />
62-
<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
62+
<PackageReference Include="Uno.WinUI.DevServer" Condition="'$(Configuration)'=='Debug'" />
6363
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
6464
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" />
6565
<PackageReference Include="Microsoft.Extensions.Logging.Console" />

‎UI/UnoCakesMobile/UnoCakesMobile.Windows/Properties/PublishProfiles/win-arm64.pubxml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<Platform>arm64</Platform>
9+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
10+
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
11+
<SelfContained>true</SelfContained>
12+
<PublishSingleFile>False</PublishSingleFile>
13+
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
15+
<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
16+
<!--
17+
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
18+
<TrimMode>partial</TrimMode>
19+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
20+
-->
21+
</PropertyGroup>
22+
</Project>

‎UI/UnoCakesMobile/UnoCakesMobile.Windows/Properties/PublishProfiles/win-x64.pubxml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<Platform>x64</Platform>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10+
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
11+
<SelfContained>true</SelfContained>
12+
<PublishSingleFile>False</PublishSingleFile>
13+
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
15+
<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
16+
<!--
17+
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
18+
<TrimMode>partial</TrimMode>
19+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
20+
-->
21+
</PropertyGroup>
22+
</Project>

‎UI/UnoCakesMobile/UnoCakesMobile.Windows/Properties/PublishProfiles/win-x86.pubxml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<Platform>x86</Platform>
9+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
10+
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
11+
<SelfContained>true</SelfContained>
12+
<PublishSingleFile>False</PublishSingleFile>
13+
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
15+
<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
16+
<!--
17+
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
18+
<TrimMode>partial</TrimMode>
19+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
20+
-->
21+
</PropertyGroup>
22+
</Project>

0 commit comments

Comments
 (0)