Skip to content

Commit

Permalink
merge release/0.10.13 Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 345ff44
Author: Dan Walmsley <dan@walms.co.uk>
Date:   Wed Mar 2 18:31:16 2022 +0000

    bump version.

commit 892960c
Author: Max Katz <maxkatz6@outlook.com>
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 <dan@walms.co.uk>
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 <dan@walms.co.uk>
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 <maxkatz6@outlook.com>
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 <maxkatz6@outlook.com>
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 <maxkatz6@outlook.com>
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 <keks9n@gmail.com>
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 <maxkatz6@outlook.com>
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 <53405089+Takoooooo@users.noreply.github.com>
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 <keks9n@gmail.com>
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 <maxkatz6@outlook.com>
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 <maxkatz6@outlook.com>
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 <maxkatz6@outlook.com>
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 <olivier.dalet@addupsolutions.com>
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 <kant2002@gmail.com>
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 <dan@walms.co.uk>
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 <keks9n@gmail.com>
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 <hez2010@outlook.com>
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 <darek.komosinski@gmail.com>
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 <maxkatz6@outlook.com>
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 <dan@walms.co.uk>
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 <dan@walms.co.uk>
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 <maxkatz6@outlook.com>
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 <dan@walms.co.uk>
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 <16554748+jmacato@users.noreply.github.com>
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 <keks9n@gmail.com>
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 <maxkatz6@outlook.com>
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 <dan@walms.co.uk>
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
  • Loading branch information
@donandren
donandren committed Mar 15, 2022
1 parent 86ad442 commit 6351cfc
Show file tree
Hide file tree
Showing 75 changed files with 1,151 additions and 2,259 deletions.
27 changes: 0 additions & 27 deletions Avalonia.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI.Events"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "samples\Sandbox\Sandbox.csproj", "{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroComGenerator", "src\tools\MicroComGenerator\MicroComGenerator.csproj", "{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.MicroCom", "src\Avalonia.MicroCom\Avalonia.MicroCom.csproj", "{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniMvvm", "samples\MiniMvvm\MiniMvvm.csproj", "{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}"
Expand Down Expand Up @@ -2029,30 +2027,6 @@ Global
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhone.Build.0 = Release|Any CPU
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.Build.0 = Release|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.ActiveCfg = Release|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.Build.0 = Release|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -2255,7 +2229,6 @@ Global
{3C84E04B-36CF-4D0D-B965-C26DD649D1F3} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
{909A8CBD-7D0E-42FD-B841-022AD8925820} = {8B6A8209-894F-4BA1-B880-965FD453982C}
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{25831348-EB2A-483E-9576-E8F6528674A5} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
{C08E9894-AA92-426E-BF56-033E262CAD3E} = {9B9E3891-2366-4253-A952-D08BCEB71098}
Expand Down
6 changes: 4 additions & 2 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ jobs:
displayName: 'Generate avalonia-native'
inputs:
script: |
export PATH="`pwd`/sdk:$PATH"
cd src/tools/MicroComGenerator; dotnet run -f net6.0 -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h
export COREHOST_TRACE=0
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_CLI_TELEMETRY_OPTOUT=1
./build.sh --target GenerateCppHeaders --configuration Release
- task: Xcode@5
inputs:
Expand Down
34 changes: 0 additions & 34 deletions build/MicroCom.targets
View file

This file was deleted.

4 changes: 2 additions & 2 deletions build/SharedVersion.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Product>Avalonia</Product>
<Version>0.10.12</Version>
<Version>0.10.13</Version>
<Copyright>Copyright 2022 &#169; The AvaloniaUI Project</Copyright>
<PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
<RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
Expand All @@ -11,7 +11,7 @@
<LangVersion>latest</LangVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>Icon.png</PackageIcon>
<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>
<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>
<PackageTags>avalonia;avaloniaui;mvvm;rx;reactive extensions;android;ios;mac;forms;wpf;net;netstandard;net461;uwp;xamarin</PackageTags>
<PackageReleaseNotes>https://github.com/AvaloniaUI/Avalonia/releases</PackageReleaseNotes>
<RepositoryType>git</RepositoryType>
Expand Down
3 changes: 2 additions & 1 deletion build/System.Drawing.Common.props
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
<PackageReference Condition="'$(TargetFramework)'!='netstandard2.0'" Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Condition="'$(TargetFramework)'=='netstandard2.0'" Include="System.Drawing.Common" Version="4.5.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions nukebuild/MicroComGen.cs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using System.IO;
using MicroComGenerator;
using MicroCom.CodeGenerator;
using Nuke.Common;

partial class Build : NukeBuild
{
Target GenerateCppHeaders => _ => _.Executes(() =>
{
var text = File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl");
var ast = AstParser.Parse(text);
var file = MicroComCodeGenerator.Parse(
File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl"));
File.WriteAllText(RootDirectory / "native" / "Avalonia.Native" / "inc" / "avalonia-native.h",
CppGen.GenerateCpp(ast));
file.GenerateCppHeader());
});
}
6 changes: 1 addition & 5 deletions nukebuild/_build.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="JetBrains.dotMemoryUnit" Version="3.0.20171219.105559" />
<PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
<PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
<PackageReference Include="MicroCom.CodeGenerator" Version="0.10.4" />
<!-- Keep in sync with Avalonia.Build.Tasks -->
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="Pharmacist.Core" Version="1.8.1" />
Expand All @@ -38,10 +38,6 @@
<None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
<Compile Remove="Numerge/**/*.*" />
<Compile Include="Numerge/Numerge/**/*.cs" />
<Compile Include="..\src\tools\MicroComGenerator\**\*.cs" Exclude="..\src\tools\MicroComGenerator\obj\**">
<Link>MicroComGenerator\%(Filename)%(Extension)</Link>
</Compile>
<Compile Remove="..\src\tools\MicroComGenerator\Program.cs" />
</ItemGroup>

</Project>
Loading

0 comments on commit 6351cfc

Please sign in to comment.