51 Commits

Author SHA1 Message Date
Julien Lebosquain 71ce62ae32 Remove legacy Diagnostics project (#20332)
* Remove legacy Diagnostics project

* Remove DataGrid submodule
2026-01-07 01:24:28 +00:00
Julien Lebosquain 40a3af4aa5 Remove netstandard2.0 from almost all projects (#20111)
* Remove netstandard2.0 from almost all projects

* Fix duplicated target frameworks in unit tests

* Fix DesignerSupport tests

* Fix Designer.HostApp packaging

* Build ControlCatalog.Desktop on CI

* Fix another bad auto merge

* Fix LeakTests duplicated target frameworks

* Don't hardcode target framework in DesignerSupportTests
2025-11-21 09:59:39 +00:00
Max Katz 326ef7c9fd Add .NET 8 target (Avalonia 11.1) (#14535)
* Add .NET 8 target to packable projects

* Update test projects

* Update sample projects to target .NET 8

* Update main Avalonia package to target .NET 8 as well

* Remove MSBuildEnableWorkloadResolver hack and some minor change

* Use net8.0 in nuke build as well

* Pin 8.0.0 SDK

* Adjust API validation

* Pin a valid version

* Remove net461 target from Avalonia package

* Remove unused net6.0 target from Avalonia.Designer.HostApp

* Adjust API diff

* Update ControlCatalog.Android.csproj

* Remove MSBuildEnableWorkloadResolver

* Fix Browser issues on .NET 8

* Fix .NET 8 error

* Fix merge conflicts

* Replace explicit TFMs in .csproj files with a centralized registry

* Fix merge conflict

* Fix AvsLegacyWindowsTargetFrameworks and add hacks for the tests

* Update XCode project CommandLineArgument

---------

Co-authored-by: Nikita Tsukanov <keks9n@gmail.com>
2024-03-05 13:37:26 -08:00
Max Katz a1b5d6a0e9 Add missing <EnableWindowsTargeting>true</EnableWindowsTargeting> 2023-11-20 20:54:00 -05:00
Max Katz 59ffdd9950 Revert to net461 2023-05-23 03:14:11 -04:00
Max Katz c406b51cd0 Remove WPF integration after internal discussion 2023-05-23 02:53:41 -04:00
Max Katz 7bf2b7668c Use Skia in windows interop test + remove old hacks for old wpf control 2023-05-22 23:39:03 -04:00
Max Katz da157ff509 Fix WindowsInteropTest 2023-05-22 23:28:01 -04:00
Max Katz f31b42d901 Start WF control render timer when handle is created and stop when handle is destroyed 2023-05-22 23:27:29 -04:00
Max Katz c3738875e6 Migrate to net462 2023-05-22 22:14:06 -04:00
Max Katz 4be09e3063 Move to Avalonia.Win32.Interoperability project for correctness 2023-05-22 21:44:54 -04:00
Julien Lebosquain 7d879cf6fe Added Win32PlatformOptions.ShouldRenderOnUIThread
Fixes WPF interop
2023-02-10 13:00:25 +01:00
Julien Lebosquain 3568e60841 Set WindowsInteropTest platform target to x64 2023-02-10 12:35:23 +01:00
Max Katz 24626da489 Remove Rx.props from ControlCatalog and some other projects too 2023-01-08 18:43:06 -05:00
Max Katz b045393df3 Do not reference DevTools from shared control catalog 2022-02-23 23:55:35 -05:00
Nikita Tsukanov ce06a2029e Use .NET SDK for WindowsInteropTest 2021-12-01 17:18:42 +02:00
Nikita Tsukanov 303b6c1586 Remove ReactiveUI usage from sample apps 2020-11-16 23:37:17 +03:00
Jumar Macato fbd7ee5963 Remove UseDataGrid since DataGrid works without that now. 2019-05-15 23:12:38 +08:00
Steven Kirk 9650c7f9e3 Call UseDataGrid in WindowInteropTest.
The `ControlCatalog` that is being embedded requires it.
2019-05-01 20:35:07 +02:00
Steven Kirk 9a60d77e63 Don't import SkiaSharp.props into WindowsInteropTest.
Fixes the `"C:\Users\[user]\.nuget\packages\SkiaSharp\1.68.0\build\net45\SkiaSharp.dll.config" because it was not found.` error.
2019-05-01 20:33:47 +02:00
Jeremy Koritzinsky 3b9c7e47f0 Update Avalonia.sln and legacy desktop projects. 2018-10-27 17:51:11 -07:00
Jeremy Koritzinsky acb3d46ca0 Enable generating NuGet packages via the MSBuild Pack target. 2018-10-27 17:48:46 -07:00
Jeremy Koritzinsky 56019e8caf Remove old NCrunch files. 2018-10-27 17:48:39 -07:00
Jeremy Koritzinsky 321bd15664 Merge desktop runtime support libraries. Fixes #1899. 2018-10-27 17:48:22 -07:00
Jeremy Koritzinsky c1af7bd4b4 Merge remote-tracking branch 'AvaloniaUI/master' into skia-merge 2017-08-06 15:16:25 -07:00
Nikita Tsukanov cce1c7af60 Switched to nuget version of Portable.Xaml and updated to use netstandard1.3 2017-07-23 00:16:40 +03:00
Nikita Tsukanov bc5caecafb Merge branch 'master' into RemoveNugetWorkaround 2017-07-21 11:00:54 +03:00
Nikita Tsukanov e610d5858f Merge skia projects into one 2017-07-19 20:07:53 +03:00
Nikita Tsukanov 76c90df2da Initial implementation for Direct2D rendering for WPF integration 2017-07-15 04:12:40 +03:00
Nikita Tsukanov e5289146d9 Remove AttachDevToolsToTopLevelOnVisualTreeAttachment since @grokys doesn't like it 2017-07-14 11:20:02 +03:00
Nikita Tsukanov 76bc7aaafb Fixed issues from PR comments #1016 2017-07-12 19:57:25 +03:00
Nikita Tsukanov abf866cf61 Fixes to get it working again after merge 2017-07-07 23:46:58 +03:00
Nikita Tsukanov 41ed04f369 Merge branch 'master' into wpf-integration 2017-07-10 16:01:51 +03:00
Friedrich von Never cd8ddf31a6 WindowsInteropTest: add SkiaSharp dependency 2017-06-12 13:55:52 +07:00
Nikita Tsukanov 3126901721 WPF embedding improvements 2017-06-07 17:38:28 +03:00
Nikita Tsukanov b4d43be327 DevTools now can be attached to any toplevel 2017-06-07 17:38:18 +03:00
Nikita Tsukanov 67ff5ba53c Initial implementation of Proper WPF embedding™ 2017-06-07 17:38:09 +03:00
Wiesław Šoltés 2e590d84a1 Merge branch 'master' into RemoveNugetWorkaround 2017-06-03 22:39:18 +02:00
Steven Kirk 261df061e9 Reference Rx.props for interop samples.
Instead of including the `PackageReference` directly in the csproj.
2017-05-28 00:11:10 +02:00
Steven Kirk 3c3dc973e1 Fix interop samples.
They were missing a reference to System.Reactive.
2017-05-27 23:50:49 +02:00
Wiesław Šoltés 2afd6cb224 Remove NuGet workaround 2017-05-15 17:40:37 +02:00
Steven Kirk a49f1e0c96 Update binding redirects. 2017-04-25 23:43:36 +02:00
Wiesław Šoltés f8097cc27d Added msbuild props for package references 2017-03-19 16:31:09 +01:00
Nikita Tsukanov 485fe1364e Everything is buildable via MSBuild 2017-03-08 08:41:41 +03:00
Steven Kirk 71c6c572ac Moved ncrunch files to their own dir.
Also deleted v2 ncrunch files and update .gitignore.
2017-03-04 02:12:54 +01:00
Steven Kirk 59c49d259d Renamed assembly SceneGraph -> Visuals.
To make way for low-level scene graph library.
2016-10-21 23:52:58 +02:00
Steven Kirk 26f9d3fcd5 Add ncrunchprojects for new projects.
They need to be ignored by NCrunch.
2016-08-31 20:40:00 +02:00
Wiesław Šoltés 3c660eb21a Added missing DotNetFrameworkRuntime reference 2016-08-31 15:22:22 +02:00
Nikita Tsukanov d1ac5a4002 Code cleanup 2016-08-31 01:35:57 +03:00
Nikita Tsukanov 528e891e55 Embeddable control window lifecycle should be tied to native host control 2016-08-23 11:44:38 +03:00