Browse Source

Merge branch 'master' into fixes/10367-virtualization-improvements-2

pull/10892/head
Steven Kirk 4 years ago
committed by GitHub
parent
commit
2340a30c2b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Controls/SystemDialog.cs
  2. 4
      src/Avalonia.Fonts.Inter/AppBuilderExtension.cs
  3. 2
      src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

2
src/Avalonia.Controls/SystemDialog.cs

@ -18,7 +18,7 @@ namespace Avalonia.Controls
/// Gets or sets a collection of filters which determine the types of files displayed in an
/// <see cref="OpenFileDialog"/> or an <see cref="SaveFileDialog"/>.
/// </summary>
public List<FileDialogFilter>? Filters { get; set; } = new List<FileDialogFilter>();
public List<FileDialogFilter> Filters { get; set; } = new List<FileDialogFilter>();
/// <summary>
/// Gets or sets initial file name that is displayed when the dialog is opened.

4
src/Avalonia.Fonts.Inter/AppBuilderExtension.cs

@ -1,4 +1,6 @@
namespace Avalonia.Fonts.Inter
using Avalonia.Fonts.Inter;
namespace Avalonia
{
public static class AppBuilderExtension
{

2
src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Tmds.DBus.Protocol" Version="0.14.0" />
<PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.5" />
<PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.5" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save