diff --git a/Avalonia.sln b/Avalonia.sln index 0a043772b1..0354e20d4f 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -234,8 +234,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlSamples", "samples\S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.PlatformSupport", "src\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj", "{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.NetCore.Native", "samples\ControlCatalog.NetCore.Native\ControlCatalog.NetCore.Native.csproj", "{C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -2186,30 +2184,6 @@ Global {E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhone.Build.0 = Release|Any CPU {E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.AppStore|iPhone.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Debug|iPhone.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Release|Any CPU.Build.0 = Release|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Release|iPhone.ActiveCfg = Release|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Release|iPhone.Build.0 = Release|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2271,7 +2245,6 @@ Global {C08E9894-AA92-426E-BF56-033E262CAD3E} = {9B9E3891-2366-4253-A952-D08BCEB71098} {26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9} {A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098} - {C865FE0E-88C0-4026-8AC6-97FAB8C0AC90} = {9B9E3891-2366-4253-A952-D08BCEB71098} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A} diff --git a/samples/ControlCatalog.NetCore.Native/ControlCatalog.NetCore.Native.csproj b/samples/ControlCatalog.NetCore.Native/ControlCatalog.NetCore.Native.csproj deleted file mode 100644 index 1647410b65..0000000000 --- a/samples/ControlCatalog.NetCore.Native/ControlCatalog.NetCore.Native.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - WinExe - net6.0 - true - true - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json - 7.0.0-* - - - - - - - - - - - - - - - - - - - en - - - - - diff --git a/samples/ControlCatalog.NetCore.Native/Program.cs b/samples/ControlCatalog.NetCore.Native/Program.cs deleted file mode 100644 index 834f2d3ee0..0000000000 --- a/samples/ControlCatalog.NetCore.Native/Program.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.Headless; -using Avalonia.LogicalTree; -using Avalonia.Threading; - -namespace ControlCatalog.NetCore.Native -{ - static class Program - { - [STAThread] - static int Main(string[] args) - { - if (args.Contains("--wait-for-attach")) - { - Console.WriteLine("Attach debugger and use 'Set next statement'"); - while (true) - { - Thread.Sleep(100); - if (Debugger.IsAttached) - break; - } - } - - var builder = BuildAvaloniaApp(); - - double GetScaling() - { - var idx = Array.IndexOf(args, "--scaling"); - if (idx != 0 && args.Length > idx + 1 && - double.TryParse(args[idx + 1], NumberStyles.Any, CultureInfo.InvariantCulture, out var scaling)) - return scaling; - return 1; - } - if (args.Contains("--fbdev")) - { - SilenceConsole(); - return builder.StartLinuxFbDev(args, scaling: GetScaling()); - } - else if (args.Contains("--vnc")) - { - return builder.StartWithHeadlessVncPlatform(null, 5901, args, ShutdownMode.OnMainWindowClose); - } - else if (args.Contains("--full-headless")) - { - return builder - .UseHeadless(true) - .AfterSetup(_ => - { - DispatcherTimer.RunOnce(async () => - { - var window = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime) - .MainWindow; - var tc = window.GetLogicalDescendants().OfType().First(); - foreach (var page in tc.Items.Cast().ToList()) - { - // Skip DatePicker because of some layout bug in grid - if (page.Header.ToString() == "DatePicker") - continue; - Console.WriteLine("Selecting " + page.Header); - tc.SelectedItem = page; - await Task.Delay(500); - } - Console.WriteLine("Selecting the first page"); - tc.SelectedItem = tc.Items.OfType().First(); - await Task.Delay(500); - Console.WriteLine("Clicked through all pages, triggering GC"); - for (var c = 0; c < 3; c++) - { - GC.Collect(2, GCCollectionMode.Forced); - await Task.Delay(500); - } - - void FormatMem(string metric, long bytes) - { - Console.WriteLine(metric + ": " + bytes / 1024 / 1024 + "MB"); - } - - FormatMem("GC allocated bytes", GC.GetTotalMemory(true)); - FormatMem("WorkingSet64", Process.GetCurrentProcess().WorkingSet64); - - }, TimeSpan.FromSeconds(1)); - }) - .StartWithClassicDesktopLifetime(args); - } - else if (args.Contains("--drm")) - { - SilenceConsole(); - return builder.StartLinuxDrm(args, scaling: GetScaling()); - } - else - return builder.StartWithClassicDesktopLifetime(args); - } - - /// - /// This method is needed for IDE previewer infrastructure - /// - public static AppBuilder BuildAvaloniaApp() - => AppBuilder.Configure() - .UsePlatformDetect() - .With(new X11PlatformOptions - { - EnableMultiTouch = true, - UseDBusMenu = true, - EnableIme = true, - }) - .With(new Win32PlatformOptions - { - EnableMultitouch = true - }) - .UseSkia() - .LogToTrace(); - - static void SilenceConsole() - { - new Thread(() => - { - Console.CursorVisible = false; - while (true) - Console.ReadKey(true); - }) - { IsBackground = true }.Start(); - } - } -} diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj index 2d4fc45171..996fea8f18 100644 --- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj +++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj @@ -6,6 +6,12 @@ true + + true + https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json + 7.0.0-* + + @@ -15,6 +21,14 @@ + + + + + + + + en diff --git a/samples/ControlCatalog.NetCore.Native/rd.xml b/samples/ControlCatalog.NetCore/rd.xml similarity index 100% rename from samples/ControlCatalog.NetCore.Native/rd.xml rename to samples/ControlCatalog.NetCore/rd.xml