Skip to content

Commit 6351cfc

Browse files
donandrendonandren
committed
merge release/0.10.13 Squashed commit of the following:
commit 345ff44 Author: Dan Walmsley <[email protected]> Date: Wed Mar 2 18:31:16 2022 +0000 bump version. commit 892960c Author: Max Katz <[email protected]> Date: Wed Mar 2 14:18:06 2022 -0400 Merge pull request AvaloniaUI#7736 from AvaloniaUI/fixes/mac-os-set-window-title-null allow setting the window title to null on osx. commit d884847 Author: Dan Walmsley <[email protected]> Date: Wed Mar 2 16:48:43 2022 +0000 Merge pull request AvaloniaUI#7723 from AvaloniaUI/fix-expander Fix expander header stretching commit 2eb51b8 Author: Dan Walmsley <[email protected]> Date: Wed Mar 2 14:21:55 2022 +0000 Merge pull request AvaloniaUI#7730 from AvaloniaUI/fixes/7582-centerowner-minimized Fall back from CenterOwner to CenterScreen when owner window is minimized. commit 84f04f4 Author: Max Katz <[email protected]> Date: Sun Feb 20 14:31:19 2022 -0500 Merge pull request AvaloniaUI#7660 from timunie/fix/AvaloniaUIgh-7636 Add missing call to base class in ReactiveUserControl.OnDataContextChanged commit 5b4f5da Author: Max Katz <[email protected]> Date: Sun Feb 20 14:09:49 2022 -0500 Merge pull request AvaloniaUI#7658 from trympet/7657-fix-brush-opacity-animation fix brush opacity animation commit d535960 Author: Max Katz <[email protected]> Date: Fri Feb 18 20:18:16 2022 -0500 Merge pull request AvaloniaUI#7645 from timunie/fix/CalendarDatePickerBindingMode Change default binding mode of SelectedDateProperty to TwoWay # Conflicts: # src/Avalonia.Controls/Calendar/CalendarDatePicker.cs commit 480dfdf Author: Nikita Tsukanov <[email protected]> Date: Wed Dec 29 16:26:59 2021 +0300 Merge pull request AvaloniaUI#7259 from AvaloniaUI/features/use-external-microcom-generator Use microcom generator from nuget # Conflicts: # build/MicroCom.targets commit 3f11b01 Author: Max Katz <[email protected]> Date: Wed Jan 26 15:21:00 2022 -0500 Merge pull request AvaloniaUI#7440 from emmauss/diagnostic-key Ensure Control Inspection in Diagnostics tool window is triggered on Key Down commit 870f62f Author: Tako <[email protected]> Date: Sat Jan 29 17:35:18 2022 +0200 Merge pull request AvaloniaUI#7449 from emmauss/fluent-compact Add DensityStyle property in Fluent Theme provider commit 7d771c8 Author: Nikita Tsukanov <[email protected]> Date: Fri Jan 28 12:38:54 2022 +0300 Merge pull request AvaloniaUI#7455 from Mikolaytis/DeadlockFix [Deadlock] Fix Monitor.Enter in finally commit 859793b Author: Max Katz <[email protected]> Date: Sun Jan 30 18:46:45 2022 -0500 Merge pull request AvaloniaUI#7475 from wieslawsoltes/ViewboxPageXamlOnly [ControlCatalog] Set ComboBox items from xaml on ViewboxPage commit 256bba5 Author: Max Katz <[email protected]> Date: Sun Jan 30 17:30:39 2022 -0500 Merge pull request AvaloniaUI#7484 from wieslawsoltes/ClippingPageXamlOnly [RenderDemo] Set Border clip from xaml on ClippingPage commit 039fa5b Author: Max Katz <[email protected]> Date: Tue Feb 15 15:22:22 2022 -0500 Merge pull request AvaloniaUI#7520 from timunie/fix/ScrollViewerShiftAndPointerWheel Fix [Shift] + [PointerWheel] should scroll horizontally commit 2c53e06 Author: Olivier DALET <[email protected]> Date: Fri Feb 4 17:55:12 2022 +0100 Fix AvaloniaUI#7519 - Reset fb and depth buffer Ids once they are deleted commit 8bc795b Author: Andrii Kurdiumov <[email protected]> Date: Sat Feb 5 17:51:15 2022 +0600 Fix AOT incompatible code (AvaloniaUI#7534) * Fix AOT incompatible code Use code patterns which are AOT-friendly. That improves R2R and Native AOT scenarios commit 7b44621 Author: Dan Walmsley <[email protected]> Date: Mon Feb 7 22:39:02 2022 +0000 Merge pull request AvaloniaUI#7537 from fr-Pursuit/master Minimization bugfix on Windows commit 80319bf Author: Nikita Tsukanov <[email protected]> Date: Mon Feb 7 22:13:51 2022 +0300 Merge pull request AvaloniaUI#7548 from ahopper/fix-32bit-linux-session-manger-pinvoke fix 32 bit raspberry pi session manager seg fault commit e89b6dc Author: Steve <[email protected]> Date: Tue Feb 8 20:30:48 2022 +0800 Fix COM issue in Cursor (AvaloniaUI#7551) Bump S.D.Common to 6.0.0 for non-netstandard2.0 builds commit 4dc4c99 Author: Dariusz Komosiński <[email protected]> Date: Wed Feb 9 14:41:07 2022 +0100 Merge pull request AvaloniaUI#7569 from MarchingCube/win32-filepicker-no-exceptions Avoid using COM exceptions for dialog control flow. commit 03bc5a4 Author: Max Katz <[email protected]> Date: Thu Feb 10 22:17:17 2022 -0500 Merge pull request AvaloniaUI#7576 from pr8x/button-flyout-diagnostics DevTools: Enable inspection for Button.Flyout commit bfff7d9 Author: Dan Walmsley <[email protected]> Date: Mon Feb 21 21:15:56 2022 +0000 Merge pull request AvaloniaUI#7622 from pr8x/child-window-property2 Exposing `Window.ChildWindows` collection commit da3004d Author: Dan Walmsley <[email protected]> Date: Wed Feb 16 22:24:27 2022 +0000 Merge pull request AvaloniaUI#7628 from wieslawsoltes/UpdateNuGetPackageDescription Update PackageDescription for NuGet commit 4b6d122 Author: Max Katz <[email protected]> Date: Thu Feb 17 10:22:03 2022 -0500 Merge pull request AvaloniaUI#7634 from AvaloniaUI/fixes/7633-date-time-picker-popup Fix Date/Time picker popups # Conflicts: # src/Avalonia.Controls/DateTimePickers/DatePicker.cs # src/Avalonia.Controls/DateTimePickers/TimePicker.cs commit 0419426 Merge: 645ce6a a9d683b Author: Dan Walmsley <[email protected]> Date: Wed Feb 16 13:46:20 2022 +0000 Merge branch 'stable/0.10.x' of https://github.com/AvaloniaUI/Avalonia into stable/0.10.x commit 645ce6a Author: Jumar Macato <[email protected]> Date: Wed Feb 16 21:42:16 2022 +0800 Merge pull request AvaloniaUI#7611 from AvaloniaUI/feature/transitioning-content-control add transitioning content control. # Conflicts: # src/Avalonia.Themes.Default/DefaultTheme.xaml # src/Avalonia.Themes.Default/TransitioningContentControl.xaml commit a9d683b Author: Nikita Tsukanov <[email protected]> Date: Sat Feb 12 15:25:42 2022 +0300 Introduced RawPointerPoint for usage with IntermediatePoints (AvaloniaUI#7581) Introduced RawPointerPoint for usage with IntermediatePoints commit 8b3b654 Author: Max Katz <[email protected]> Date: Sun Jan 23 19:55:40 2022 -0500 Merge pull request AvaloniaUI#7413 from AvaloniaUI/feature/intermediate-points Added GetIntermediatePoints support for X11, libinput and evdev # Conflicts: # src/Avalonia.Base/Threading/JobRunner.cs commit d22e627 Author: Dan Walmsley <[email protected]> Date: Tue Feb 15 17:45:22 2022 +0000 Merge pull request AvaloniaUI#7605 from AvaloniaUI/feature/skia-layering-extensions Add Skia Helper Methods to allow applying Skia Filter Effects (Blur, DropShadow, Lighting) to DC content # Conflicts: # build/SharedVersion.props
1 parent 86ad442 commit 6351cfc

File tree

75 files changed

+1151
-2259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1151
-2259
lines changed

‎Avalonia.sln

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI.Events"
223223
EndProject
224224
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "samples\Sandbox\Sandbox.csproj", "{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}"
225225
EndProject
226-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroComGenerator", "src\tools\MicroComGenerator\MicroComGenerator.csproj", "{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}"
227-
EndProject
228226
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.MicroCom", "src\Avalonia.MicroCom\Avalonia.MicroCom.csproj", "{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}"
229227
EndProject
230228
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniMvvm", "samples\MiniMvvm\MiniMvvm.csproj", "{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}"
@@ -2029,30 +2027,6 @@ Global
20292027
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhone.Build.0 = Release|Any CPU
20302028
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
20312029
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
2032-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
2033-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
2034-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
2035-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
2036-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
2037-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
2038-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
2039-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
2040-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
2041-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
2042-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
2043-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
2044-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2045-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
2046-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
2047-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.Build.0 = Debug|Any CPU
2048-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
2049-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
2050-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
2051-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.Build.0 = Release|Any CPU
2052-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.ActiveCfg = Release|Any CPU
2053-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.Build.0 = Release|Any CPU
2054-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
2055-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
20562030
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
20572031
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
20582032
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@@ -2255,7 +2229,6 @@ Global
22552229
{3C84E04B-36CF-4D0D-B965-C26DD649D1F3} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
22562230
{909A8CBD-7D0E-42FD-B841-022AD8925820} = {8B6A8209-894F-4BA1-B880-965FD453982C}
22572231
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571} = {9B9E3891-2366-4253-A952-D08BCEB71098}
2258-
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
22592232
{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
22602233
{25831348-EB2A-483E-9576-E8F6528674A5} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
22612234
{C08E9894-AA92-426E-BF56-033E262CAD3E} = {9B9E3891-2366-4253-A952-D08BCEB71098}

‎azure-pipelines.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ jobs:
5858
displayName: 'Generate avalonia-native'
5959
inputs:
6060
script: |
61-
export PATH="`pwd`/sdk:$PATH"
62-
cd src/tools/MicroComGenerator; dotnet run -f net6.0 -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h
61+
export COREHOST_TRACE=0
62+
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
63+
export DOTNET_CLI_TELEMETRY_OPTOUT=1
64+
./build.sh --target GenerateCppHeaders --configuration Release
6365
6466
- task: Xcode@5
6567
inputs:

‎build/MicroCom.targets

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎build/SharedVersion.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Product>Avalonia</Product>
5-
<Version>0.10.12</Version>
5+
<Version>0.10.13</Version>
66
<Copyright>Copyright 2022 &#169; The AvaloniaUI Project</Copyright>
77
<PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
88
<RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
@@ -11,7 +11,7 @@
1111
<LangVersion>latest</LangVersion>
1212
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1313
<PackageIcon>Icon.png</PackageIcon>
14-
<PackageDescription>Avalonia is a WPF/UWP-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of Operating Systems such as Windows (.NET Framework, .NET Core), Linux (via Xorg), MacOS and with experimental support for Android and iOS.</PackageDescription>
14+
<PackageDescription>Avalonia is a cross-platform UI framework for .NET providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, MacOS and with experimental support for Android, iOS and WebAssembly.</PackageDescription>
1515
<PackageTags>avalonia;avaloniaui;mvvm;rx;reactive extensions;android;ios;mac;forms;wpf;net;netstandard;net461;uwp;xamarin</PackageTags>
1616
<PackageReleaseNotes>https://github.com/AvaloniaUI/Avalonia/releases</PackageReleaseNotes>
1717
<RepositoryType>git</RepositoryType>

‎build/System.Drawing.Common.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<ItemGroup>
3-
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
3+
<PackageReference Condition="'$(TargetFramework)'!='netstandard2.0'" Include="System.Drawing.Common" Version="6.0.0" />
4+
<PackageReference Condition="'$(TargetFramework)'=='netstandard2.0'" Include="System.Drawing.Common" Version="4.5.0" />
45
</ItemGroup>
56
</Project>

‎nukebuild/MicroComGen.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
using System.IO;
2-
using MicroComGenerator;
2+
using MicroCom.CodeGenerator;
33
using Nuke.Common;
44

55
partial class Build : NukeBuild
66
{
77
Target GenerateCppHeaders => _ => _.Executes(() =>
88
{
9-
var text = File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl");
10-
var ast = AstParser.Parse(text);
9+
var file = MicroComCodeGenerator.Parse(
10+
File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl"));
1111
File.WriteAllText(RootDirectory / "native" / "Avalonia.Native" / "inc" / "avalonia-native.h",
12-
CppGen.GenerateCpp(ast));
12+
file.GenerateCppHeader());
1313
});
1414
}

‎nukebuild/_build.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="JetBrains.dotMemoryUnit" Version="3.0.20171219.105559" />
1616
<PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
1717
<PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
18+
<PackageReference Include="MicroCom.CodeGenerator" Version="0.10.4" />
1919
<!-- Keep in sync with Avalonia.Build.Tasks -->
2020
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
2121
<PackageReference Include="Pharmacist.Core" Version="1.8.1" />
@@ -38,10 +38,6 @@
3838
<None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
3939
<Compile Remove="Numerge/**/*.*" />
4040
<Compile Include="Numerge/Numerge/**/*.cs" />
41-
<Compile Include="..\src\tools\MicroComGenerator\**\*.cs" Exclude="..\src\tools\MicroComGenerator\obj\**">
42-
<Link>MicroComGenerator\%(Filename)%(Extension)</Link>
43-
</Compile>
44-
<Compile Remove="..\src\tools\MicroComGenerator\Program.cs" />
4541
</ItemGroup>
4642

4743
</Project>

0 commit comments

Comments
 (0)