-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Update uno and upgrade sample app to net7.0
- Loading branch information
Showing
24 changed files
with
149 additions
and
188 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <Project ToolsVersion="15.0"> | ||
| <Import Project="..\Directory.Build.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <DefineConstants>$(DefineConstants);IS_UNO_RUNTIMETEST_PROJECT</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
...ts.Engine.Skia.Linux.FrameBuffer/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 5 additions & 7 deletions
12
src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
| <Application x:Class="Uno.UI.RuntimeTests.Engine.WPF.App" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF" | ||
| StartupUri="MainWindow.xaml"> | ||
| <Application.Resources> | ||
|
|
||
| </Application.Resources> | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="clr-namespace:Uno.UI.RuntimeTests.Engine.WPF"> | ||
| <Application.Resources> | ||
| </Application.Resources> | ||
| </Application> |
17 changes: 7 additions & 10 deletions
17
src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/App.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,14 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Configuration; | ||
| using System.Data; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using System.Windows; | ||
| using Uno.UI.Runtime.Skia.Wpf; | ||
|
|
||
| namespace Uno.UI.RuntimeTests.Engine.WPF | ||
| namespace Uno.UI.RuntimeTests.Engine.WPF; | ||
|
|
||
| public partial class App : Application | ||
| { | ||
| /// <summary> | ||
| /// Interaction logic for App.xaml | ||
| /// </summary> | ||
| public partial class App : Application | ||
| public App() | ||
| { | ||
| new WpfHost(Dispatcher, () => new Uno.UI.RuntimeTests.Engine.App()).Run(); | ||
| } | ||
| } | ||
| } |
10 changes: 0 additions & 10 deletions
10
src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml
This file was deleted.
Oops, something went wrong.
30 changes: 0 additions & 30 deletions
30
src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.WPF/MainWindow.xaml.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Wasm/Uno.UI.RuntimeTests.Engine.Wasm.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 15 additions & 16 deletions
31
src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,21 @@ | ||
| using GLib; | ||
| using System; | ||
| using Uno.UI.Runtime.Skia; | ||
| using Uno.UI.Runtime.Skia.Gtk; | ||
|
|
||
| namespace Uno.UI.RuntimeTests.Engine.Skia.Gtk | ||
| namespace Uno.UI.RuntimeTests.Engine.Skia.Gtk; | ||
|
|
||
| internal class Program | ||
| { | ||
| internal class Program | ||
| { | ||
| static void Main(string[] args) | ||
| { | ||
| ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs) | ||
| { | ||
| Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString()); | ||
| expArgs.ExitApplication = true; | ||
| }; | ||
| static void Main(string[] args) | ||
| { | ||
| ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs) | ||
| { | ||
| Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString()); | ||
| expArgs.ExitApplication = true; | ||
| }; | ||
|
|
||
| var host = new GtkHost(() => new App()); | ||
| var host = new GtkHost(() => new App()); | ||
|
|
||
| host.Run(); | ||
| } | ||
| } | ||
| } | ||
| host.Run(); | ||
| } | ||
| } |
Oops, something went wrong.