Merge pull request #8451 from workgroupengineering/fixes/Warnings/FreeDesktop

Avalonia.sln

@@ -38,6 +38,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DEF5-D50F-4975-8B72-124C9EB54066}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		src\Shared\IsExternalInit.cs = src\Shared\IsExternalInit.cs
 		src\Shared\ModuleInitializer.cs = src\Shared\ModuleInitializer.cs
 		src\Shared\SourceGeneratorAttributes.cs = src\Shared\SourceGeneratorAttributes.cs
 	EndProjectSection

src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

@@ -5,6 +5,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />

src/Avalonia.FreeDesktop/DBusCallQueue.cs

@@ -8,10 +8,9 @@ namespace Avalonia.FreeDesktop
     {
         private readonly Func<Exception, Task> _errorHandler;
 
-        class Item
+        record Item(Func<Task> Callback)
         {
-            public Func<Task> Callback;
-            public Action<Exception> OnFinish;
+            public Action<Exception?>? OnFinish;
         }
         private Queue<Item> _q = new Queue<Item>();
         private bool _processing;
@@ -23,19 +22,15 @@ namespace Avalonia.FreeDesktop
         
         public void Enqueue(Func<Task> cb)
         {
-            _q.Enqueue(new Item
-            {
-                Callback = cb
-            });
+            _q.Enqueue(new Item(cb));
             Process();
         }
 
         public Task EnqueueAsync(Func<Task> cb)
         {
             var tcs = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
-            _q.Enqueue(new Item
+            _q.Enqueue(new Item(cb)
             {
-                Callback = cb,
                 OnFinish = e =>
                 {
                     if (e == null)
@@ -51,13 +46,12 @@ namespace Avalonia.FreeDesktop
         public Task<T> EnqueueAsync<T>(Func<Task<T>> cb)
         {
             var tcs = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
-            _q.Enqueue(new Item
-            {
-                Callback = async () =>
+            _q.Enqueue(new Item(async () =>
                 {
                     var res = await cb();
                     tcs.TrySetResult(res);
-                },
+                })
+            {
                 OnFinish = e =>
                 {
                     if (e != null)

src/Avalonia.FreeDesktop/DBusHelper.cs

@@ -17,7 +17,7 @@ namespace Avalonia.FreeDesktop
             private readonly object _lock = new();
             private SynchronizationContext? _ctx;
 
-            public override void Post(SendOrPostCallback d, object state)
+            public override void Post(SendOrPostCallback d, object? state)
             {
                 lock (_lock)
                 {
@@ -29,7 +29,7 @@ namespace Avalonia.FreeDesktop
                 }
             }
 
-            public override void Send(SendOrPostCallback d, object state)
+            public override void Send(SendOrPostCallback d, object? state)
             {
                 lock (_lock)
                 {

src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
-using Avalonia.FreeDesktop.DBusIme.Fcitx;
 using Avalonia.Input.Raw;
 using Avalonia.Input.TextInput;
 using Avalonia.Logging;
@@ -26,7 +24,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             return (im, im);
         }
     }
-    
+
     internal abstract class DBusTextInputMethodBase : IX11InputMethodControl, ITextInputMethodImpl
     {
         private List<IDisposable> _disposables = new List<IDisposable>();
@@ -34,7 +32,7 @@ namespace Avalonia.FreeDesktop.DBusIme
         protected Connection Connection { get; }
         private readonly string[] _knownNames;
         private bool _connecting;
-        private string _currentName;
+        private string? _currentName;
         private DBusCallQueue _queue;
         private bool _controlActive, _windowActive;
         private bool? _imeActive;
@@ -42,9 +40,9 @@ namespace Avalonia.FreeDesktop.DBusIme
         private PixelRect? _lastReportedRect;
         private double _scaling = 1;
         private PixelPoint _windowPosition;
-        
+
         protected bool IsConnected => _currentName != null;
-        
+
         public DBusTextInputMethodBase(Connection connection, params string[] knownNames)
         {
             _queue = new DBusCallQueue(QueueOnError);
@@ -58,18 +56,18 @@ namespace Avalonia.FreeDesktop.DBusIme
             foreach (var name in _knownNames)
                 _disposables.Add(await Connection.ResolveServiceOwnerAsync(name, OnNameChange));
         }
-        
+
         protected abstract Task<bool> Connect(string name);
 
         protected string GetAppName() =>
-            Application.Current.Name ?? Assembly.GetEntryAssembly()?.GetName()?.Name ?? "Avalonia";
-        
+            Application.Current?.Name ?? Assembly.GetEntryAssembly()?.GetName()?.Name ?? "Avalonia";
+
         private async void OnNameChange(ServiceOwnerChangedEventArgs args)
         {
             if (args.NewOwner != null && _currentName == null)
             {
                 _onlineNamesQueue.Enqueue(args.ServiceName);
-                if(!_connecting)
+                if (!_connecting)
                 {
                     _connecting = true;
                     try
@@ -98,25 +96,25 @@ namespace Avalonia.FreeDesktop.DBusIme
                         _connecting = false;
                     }
                 }
-                
+
             }
-            
+
             // IME has crashed
             if (args.NewOwner == null && args.ServiceName == _currentName)
             {
                 _currentName = null;
-                foreach(var s in _disposables)
+                foreach (var s in _disposables)
                     s.Dispose();
                 _disposables.Clear();
-                
+
                 OnDisconnected();
                 Reset();
-                
+
                 // Watch again
                 Watch();
             }
         }
-        
+
         protected virtual Task Disconnect()
         {
             return Task.CompletedTask;
@@ -124,7 +122,7 @@ namespace Avalonia.FreeDesktop.DBusIme
 
         protected virtual void OnDisconnected()
         {
-            
+
         }
 
         protected virtual void Reset()
@@ -149,10 +147,14 @@ namespace Avalonia.FreeDesktop.DBusIme
             OnDisconnected();
             _currentName = null;
         }
-        
+
         protected void Enqueue(Func<Task> cb) => _queue.Enqueue(cb);
 
-        protected void AddDisposable(IDisposable d) => _disposables.Add(d);
+        protected void AddDisposable(IDisposable? d)
+        {
+            if(d is { })
+                _disposables.Add(d);
+        }
         
         public void Dispose()
         {
@@ -198,7 +200,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             UpdateActive();
         }
         
-        void ITextInputMethodImpl.SetClient(ITextInputMethodClient client)
+        void ITextInputMethodImpl.SetClient(ITextInputMethodClient? client)
         {
             _controlActive = client is { };
             UpdateActive();
@@ -225,7 +227,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             }
         }
 
-        private Action<string> _onCommit;
+        private Action<string>? _onCommit;
         event Action<string> IX11InputMethodControl.Commit
         {
             add => _onCommit += value;
@@ -234,7 +236,7 @@ namespace Avalonia.FreeDesktop.DBusIme
 
         protected void FireCommit(string s) => _onCommit?.Invoke(s);
         
-        private Action<X11InputMethodForwardedKey> _onForward;
+        private Action<X11InputMethodForwardedKey>? _onForward;
         event Action<X11InputMethodForwardedKey> IX11InputMethodControl.ForwardKey
         {
             add => _onForward += value;

src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxDBus.cs

@@ -31,15 +31,15 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
         Task SetSurroundingTextPositionAsync(uint Cursor, uint Anchor);
         Task DestroyICAsync();
         Task<int> ProcessKeyEventAsync(uint Keyval, uint Keycode, uint State, int Type, uint Time);
-        Task<IDisposable> WatchEnableIMAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCloseIMAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCommitStringAsync(Action<string> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdatePreeditAsync(Action<(string str, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateClientSideUIAsync(Action<(string auxup, string auxdown, string preedit, string candidateword, string imname, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchEnableIMAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCloseIMAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable?> WatchCommitStringAsync(Action<string> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdatePreeditAsync(Action<(string str, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateClientSideUIAsync(Action<(string auxup, string auxdown, string preedit, string candidateword, string imname, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable?> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception>? onError = null);
     }
     
     [DBusInterface("org.fcitx.Fcitx.InputContext1")]
@@ -54,11 +54,11 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
         Task SetSurroundingTextPositionAsync(uint Cursor, uint Anchor);
         Task DestroyICAsync();
         Task<bool> ProcessKeyEventAsync(uint Keyval, uint Keycode, uint State, bool Type, uint Time);
-        Task<IDisposable> WatchCommitStringAsync(Action<string> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchForwardKeyAsync(Action<(uint keyval, uint state, bool type)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception> onError = null);
+        Task<IDisposable?> WatchCommitStringAsync(Action<string> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCurrentIMAsync(Action<(string name, string uniqueName, string langCode)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateFormattedPreeditAsync(Action<((string, int)[] str, int cursorpos)> handler, Action<Exception>? onError = null);
+        Task<IDisposable?> WatchForwardKeyAsync(Action<(uint keyval, uint state, bool type)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchar)> handler, Action<Exception>? onError = null);
     }
 
     [DBusInterface("org.fcitx.Fcitx.InputMethod1")]

src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxICWrapper.cs

@@ -5,8 +5,8 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
 {
     internal class FcitxICWrapper
     {
-        private readonly IFcitxInputContext1 _modern;
-        private readonly IFcitxInputContext _old;
+        private readonly IFcitxInputContext1? _modern;
+        private readonly IFcitxInputContext? _old;
 
         public FcitxICWrapper(IFcitxInputContext old)
         {
@@ -18,34 +18,37 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
             _modern = modern;
         }
 
-        public Task FocusInAsync() => _old?.FocusInAsync() ?? _modern.FocusInAsync();
+        public Task FocusInAsync() => _old?.FocusInAsync() ?? _modern?.FocusInAsync() ?? Task.CompletedTask;
 
-        public Task FocusOutAsync() => _old?.FocusOutAsync() ?? _modern.FocusOutAsync();
+        public Task FocusOutAsync() => _old?.FocusOutAsync() ?? _modern?.FocusOutAsync() ?? Task.CompletedTask;
         
-        public Task ResetAsync() => _old?.ResetAsync() ?? _modern.ResetAsync();
+        public Task ResetAsync() => _old?.ResetAsync() ?? _modern?.ResetAsync() ?? Task.CompletedTask;
 
         public Task SetCursorRectAsync(int x, int y, int w, int h) =>
-            _old?.SetCursorRectAsync(x, y, w, h) ?? _modern.SetCursorRectAsync(x, y, w, h);
-        public Task DestroyICAsync() => _old?.DestroyICAsync() ?? _modern.DestroyICAsync();
+            _old?.SetCursorRectAsync(x, y, w, h) ?? _modern?.SetCursorRectAsync(x, y, w, h) ?? Task.CompletedTask;
+        public Task DestroyICAsync() => _old?.DestroyICAsync() ?? _modern?.DestroyICAsync() ?? Task.CompletedTask;
 
         public async Task<bool> ProcessKeyEventAsync(uint keyVal, uint keyCode, uint state, int type, uint time)
         {
             if(_old!=null)
                 return await _old.ProcessKeyEventAsync(keyVal, keyCode, state, type, time) != 0;
-            return await _modern.ProcessKeyEventAsync(keyVal, keyCode, state, type > 0, time);
+            return await (_modern?.ProcessKeyEventAsync(keyVal, keyCode, state, type > 0, time) ?? Task.FromResult(false));
         }
 
-        public Task<IDisposable> WatchCommitStringAsync(Action<string> handler) =>
-            _old?.WatchCommitStringAsync(handler) ?? _modern.WatchCommitStringAsync(handler);
+        public Task<IDisposable?> WatchCommitStringAsync(Action<string> handler) =>
+            _old?.WatchCommitStringAsync(handler) 
+                ?? _modern?.WatchCommitStringAsync(handler) 
+                    ?? Task.FromResult(default(IDisposable?));
 
-        public Task<IDisposable> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler)
+        public Task<IDisposable?> WatchForwardKeyAsync(Action<(uint keyval, uint state, int type)> handler)
         {
             return _old?.WatchForwardKeyAsync(handler)
-                   ?? _modern.WatchForwardKeyAsync(ev =>
-                       handler((ev.keyval, ev.state, ev.type ? 1 : 0)));
+                   ?? _modern?.WatchForwardKeyAsync(ev =>
+                       handler((ev.keyval, ev.state, ev.type ? 1 : 0)))
+                    ?? Task.FromResult(default(IDisposable?));
         }
 
         public Task SetCapacityAsync(uint flags) =>
-            _old?.SetCapacityAsync(flags) ?? _modern.SetCapabilityAsync(flags);
+            _old?.SetCapacityAsync(flags) ?? _modern?.SetCapabilityAsync(flags) ?? Task.CompletedTask;
     }
 }

src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs

@@ -12,7 +12,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
 {
     internal class FcitxX11TextInputMethod : DBusTextInputMethodBase
     {
-        private FcitxICWrapper _context;
+        private FcitxICWrapper? _context;
         private FcitxCapabilityFlags? _lastReportedFlags;
 
         public FcitxX11TextInputMethod(Connection connection) : base(connection,
@@ -49,7 +49,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
             return true;
         }
 
-        protected override Task Disconnect() => _context.DestroyICAsync();
+        protected override Task Disconnect() => _context?.DestroyICAsync() ?? Task.CompletedTask;
 
         protected override void OnDisconnected() => _context = null;
 
@@ -60,18 +60,18 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
         }
 
         protected override Task SetCursorRectCore(PixelRect cursorRect) =>
-            _context.SetCursorRectAsync(cursorRect.X, cursorRect.Y, Math.Max(1, cursorRect.Width),
-                Math.Max(1, cursorRect.Height));
-
-        protected override Task SetActiveCore(bool active)
-        {
-            if (active)
-                return _context.FocusInAsync();
-            else
-                return _context.FocusOutAsync();
-        }
+            _context?.SetCursorRectAsync(cursorRect.X, cursorRect.Y, Math.Max(1, cursorRect.Width),
+                Math.Max(1, cursorRect.Height))
+            ?? Task.CompletedTask;
+
+        protected override Task SetActiveCore(bool active)=> (active 
+                ? _context?.FocusInAsync()
+                : _context?.FocusOutAsync())
+             ?? Task.CompletedTask;
+        
 
-        protected override Task ResetContextCore() => _context.ResetAsync();
+        protected override Task ResetContextCore() => _context?.ResetAsync() 
+            ?? Task.CompletedTask;
 
         protected override async Task<bool> HandleKeyCore(RawKeyEventArgs args, int keyVal, int keyCode)
         {
@@ -88,9 +88,15 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
             var type = args.Type == RawKeyEventType.KeyDown ?
                 FcitxKeyEventType.FCITX_PRESS_KEY :
                 FcitxKeyEventType.FCITX_RELEASE_KEY;
-            
-            return await _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state, (int)type,
-                (uint)args.Timestamp).ConfigureAwait(false);
+            if (_context is { })
+            {
+                return await _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state, (int)type,
+                    (uint)args.Timestamp).ConfigureAwait(false);
+            }
+            else
+            {
+                return false;
+            }
         }
         
         public override void SetOptions(TextInputOptions options) =>

src/Avalonia.FreeDesktop/DBusIme/IBus/IBusDBus.cs

@@ -22,25 +22,25 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
         Task<object> GetEngineAsync();
         Task DestroyAsync();
         Task SetSurroundingTextAsync(object Text, uint CursorPos, uint AnchorPos);
-        Task<IDisposable> WatchCommitTextAsync(Action<object> cb, Action<Exception> onError = null);
-        Task<IDisposable> WatchForwardKeyEventAsync(Action<(uint keyval, uint keycode, uint state)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchRequireSurroundingTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchars)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdatePreeditTextAsync(Action<(object text, uint cursorPos, bool visible)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchShowPreeditTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchHidePreeditTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateAuxiliaryTextAsync(Action<(object text, bool visible)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchShowAuxiliaryTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchHideAuxiliaryTextAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdateLookupTableAsync(Action<(object table, bool visible)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchShowLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchHideLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchPageUpLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchPageDownLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCursorUpLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchCursorDownLookupTableAsync(Action handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchRegisterPropertiesAsync(Action<object> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchUpdatePropertyAsync(Action<object> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchCommitTextAsync(Action<object> cb, Action<Exception>? onError = null);
+        Task<IDisposable> WatchForwardKeyEventAsync(Action<(uint keyval, uint keycode, uint state)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchRequireSurroundingTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchDeleteSurroundingTextAsync(Action<(int offset, uint nchars)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdatePreeditTextAsync(Action<(object text, uint cursorPos, bool visible)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchShowPreeditTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchHidePreeditTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateAuxiliaryTextAsync(Action<(object text, bool visible)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchShowAuxiliaryTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchHideAuxiliaryTextAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdateLookupTableAsync(Action<(object table, bool visible)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchShowLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchHideLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchPageUpLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchPageDownLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCursorUpLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchCursorDownLookupTableAsync(Action handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchRegisterPropertiesAsync(Action<object> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchUpdatePropertyAsync(Action<object> handler, Action<Exception>? onError = null);
     }
     
     

src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs

@@ -9,7 +9,7 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
 {
     internal class IBusX11TextInputMethod : DBusTextInputMethodBase
     {
-        private IIBusInputContext _context;
+        private IIBusInputContext? _context;
 
         public IBusX11TextInputMethod(Connection connection) : base(connection, 
             "org.freedesktop.portal.IBus")
@@ -53,16 +53,16 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
         private void OnCommitText(object wtf)
         {
             // Hello darkness, my old friend
-            var prop = wtf.GetType().GetField("Item3");
-            if (prop != null)
+            if (wtf.GetType().GetField("Item3") is { } prop)
             {
-                var text = (string)prop.GetValue(wtf);
+                var text = prop.GetValue(wtf) as string;
                 if (!string.IsNullOrEmpty(text))
-                    FireCommit(text);
+                    FireCommit(text!);
             }
         }
 
-        protected override Task Disconnect() => _context.DestroyAsync();
+        protected override Task Disconnect() => _context?.DestroyAsync()
+            ?? Task.CompletedTask;
 
         protected override void OnDisconnected()
         {
@@ -71,13 +71,15 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
         }
 
         protected override Task SetCursorRectCore(PixelRect rect) 
-            => _context.SetCursorLocationAsync(rect.X, rect.Y, rect.Width, rect.Height);
+            => _context?.SetCursorLocationAsync(rect.X, rect.Y, rect.Width, rect.Height)
+            ?? Task.CompletedTask;
 
         protected override Task SetActiveCore(bool active)
-            => active ? _context.FocusInAsync() : _context.FocusOutAsync();
+            => (active ? _context?.FocusInAsync() : _context?.FocusOutAsync())
+                ?? Task.CompletedTask;
 
         protected override Task ResetContextCore()
-            => _context.ResetAsync();
+            => _context?.ResetAsync() ?? Task.CompletedTask;
 
         protected override Task<bool> HandleKeyCore(RawKeyEventArgs args, int keyVal, int keyCode)
         {
@@ -94,7 +96,15 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
             if (args.Type == RawKeyEventType.KeyUp)
                 state |= IBusModifierMask.ReleaseMask;
 
-            return _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state);
+            if(_context is { })
+            {
+                return _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state);
+            }
+            else
+            {
+                return Task.FromResult(false);
+            }
+            
         }
 
         public override void SetOptions(TextInputOptions options)

src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs

@@ -17,7 +17,7 @@ namespace Avalonia.FreeDesktop.DBusIme
                     new DBusInputMethodFactory<IBusX11TextInputMethod>(_ => new IBusX11TextInputMethod(conn))
             };
         
-        static Func<Connection, IX11InputMethodFactory> DetectInputMethod()
+        static Func<Connection, IX11InputMethodFactory>? DetectInputMethod()
         {
             foreach (var name in new[] { "AVALONIA_IM_MODULE", "GTK_IM_MODULE", "QT_IM_MODULE" })
             {

src/Avalonia.FreeDesktop/DBusMenu.cs

@@ -28,18 +28,18 @@ namespace Avalonia.FreeDesktop.DBusMenu
         Task<int[]> EventGroupAsync((int id, string eventId, object data, uint timestamp)[] events);
         Task<bool> AboutToShowAsync(int Id);
         Task<(int[] updatesNeeded, int[] idErrors)> AboutToShowGroupAsync(int[] Ids);
-        Task<IDisposable> WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception>? onError = null);
     }
 
     [Dictionary]
     class DBusMenuProperties
     {
         public uint Version { get; set; } = default (uint);
-        public string TextDirection { get; set; } = default (string);
-        public string Status { get; set; } = default (string);
-        public string[] IconThemePath { get; set; } = default (string[]);
+        public string? TextDirection { get; set; } = default (string);
+        public string? Status { get; set; } = default (string);
+        public string[]? IconThemePath { get; set; } = default (string[]);
     }
 
 
@@ -50,7 +50,7 @@ namespace Avalonia.FreeDesktop.DBusMenu
         Task UnregisterWindowAsync(uint WindowId);
         Task<(string service, ObjectPath menuObjectPath)> GetMenuForWindowAsync(uint WindowId);
         Task<(uint, string, ObjectPath)[]> GetMenusAsync();
-        Task<IDisposable> WatchWindowRegisteredAsync(Action<(uint windowId, string service, ObjectPath menuObjectPath)> handler, Action<Exception> onError = null);
-        Task<IDisposable> WatchWindowUnregisteredAsync(Action<uint> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchWindowRegisteredAsync(Action<(uint windowId, string service, ObjectPath menuObjectPath)> handler, Action<Exception>? onError = null);
+        Task<IDisposable> WatchWindowUnregisteredAsync(Action<uint> handler, Action<Exception>? onError = null);
     }
 }

src/Avalonia.FreeDesktop/DBusMenuExporter.cs

@@ -17,7 +17,7 @@ namespace Avalonia.FreeDesktop
 {
     public class DBusMenuExporter
     {
-        public static ITopLevelNativeMenuExporter TryCreateTopLevelNativeMenu(IntPtr xid)
+        public static ITopLevelNativeMenuExporter? TryCreateTopLevelNativeMenu(IntPtr xid)
         {
             if (DBusHelper.Connection == null)
                 return null;
@@ -37,10 +37,10 @@ namespace Avalonia.FreeDesktop
         {
             private readonly Connection _dbus;
             private readonly uint _xid;
-            private IRegistrar _registrar;
+            private IRegistrar? _registrar;
             private bool _disposed;
             private uint _revision = 1;
-            private NativeMenu _menu;
+            private NativeMenu? _menu;
             private readonly Dictionary<int, NativeMenuItemBase> _idsToItems = new Dictionary<int, NativeMenuItemBase>();
             private readonly Dictionary<NativeMenuItemBase, int> _itemsToIds = new Dictionary<NativeMenuItemBase, int>();
             private readonly HashSet<NativeMenu> _menus = new HashSet<NativeMenu>();
@@ -73,10 +73,10 @@ namespace Avalonia.FreeDesktop
                     if (_appMenu)
                     {
                         await _dbus.RegisterObjectAsync(this);
-                        _registrar = DBusHelper.Connection.CreateProxy<IRegistrar>(
+                        _registrar = DBusHelper.Connection?.CreateProxy<IRegistrar>(
                             "com.canonical.AppMenu.Registrar",
                             "/com/canonical/AppMenu/Registrar");
-                        if (!_disposed)
+                        if (!_disposed && _registrar is { })
                             await _registrar.RegisterWindowAsync(_xid, ObjectPath);
                     }
                     else
@@ -109,9 +109,9 @@ namespace Avalonia.FreeDesktop
 
 
             public bool IsNativeMenuExported { get; private set; }
-            public event EventHandler OnIsNativeMenuExportedChanged;
+            public event EventHandler? OnIsNativeMenuExportedChanged;
 
-            public void SetNativeMenu(NativeMenu menu)
+            public void SetNativeMenu(NativeMenu? menu)
             {
                 if (menu == null)
                     menu = new NativeMenu();
@@ -153,7 +153,7 @@ namespace Avalonia.FreeDesktop
                 Dispatcher.UIThread.Post(DoLayoutReset, DispatcherPriority.Background);
             }
 
-            private (NativeMenuItemBase item, NativeMenu menu) GetMenu(int id)
+            private (NativeMenuItemBase? item, NativeMenu? menu) GetMenu(int id)
             {
                 if (id == 0)
                     return (null, _menu);
@@ -161,7 +161,7 @@ namespace Avalonia.FreeDesktop
                 return (item, (item as NativeMenuItem)?.Menu);
             }
 
-            private void EnsureSubscribed(NativeMenu menu)
+            private void EnsureSubscribed(NativeMenu? menu)
             {
                 if(menu!=null && _menus.Add(menu))
                     ((INotifyCollectionChanged)menu.Items).CollectionChanged += OnMenuItemsChanged;
@@ -180,12 +180,12 @@ namespace Avalonia.FreeDesktop
                 return id;
             }
 
-            private void OnMenuItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+            private void OnMenuItemsChanged(object? sender, NotifyCollectionChangedEventArgs e)
             {
                 QueueReset();
             }
 
-            private void OnItemPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+            private void OnItemPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
             {
                 QueueReset();
             }
@@ -216,7 +216,7 @@ namespace Avalonia.FreeDesktop
                 "type", "label", "enabled", "visible", "shortcut", "toggle-type", "children-display", "toggle-state", "icon-data"
             };
             
-            object GetProperty((NativeMenuItemBase item, NativeMenu menu) i, string name)
+            object? GetProperty((NativeMenuItemBase? item, NativeMenu? menu) i, string name)
             {
                 var (it, menu) = i;
 
@@ -302,7 +302,7 @@ namespace Avalonia.FreeDesktop
             }
 
             private List<KeyValuePair<string, object>> _reusablePropertyList = new List<KeyValuePair<string, object>>();
-            KeyValuePair<string, object>[] GetProperties((NativeMenuItemBase item, NativeMenu menu) i, string[] names)
+            KeyValuePair<string, object>[] GetProperties((NativeMenuItemBase? item, NativeMenu? menu) i, string[] names)
             {
                 if (names?.Length > 0 != true)
                     names = AllProperties;
@@ -336,7 +336,7 @@ namespace Avalonia.FreeDesktop
                 return Task.FromResult(rv);
             }
 
-            (int, KeyValuePair<string, object>[], object[]) GetLayout(NativeMenuItemBase item, NativeMenu menu, int depth, string[] propertyNames)
+            (int, KeyValuePair<string, object>[], object[]) GetLayout(NativeMenuItemBase? item, NativeMenu? menu, int depth, string[] propertyNames)
             {
                 var id = item == null ? 0 : GetId(item);
                 var props = GetProperties((item, menu), propertyNames);
@@ -414,22 +414,22 @@ namespace Avalonia.FreeDesktop
 
             private event Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)>
                 ItemsPropertiesUpdated { add { } remove { } }
-            private event Action<(uint revision, int parent)> LayoutUpdated;
+            private event Action<(uint revision, int parent)>? LayoutUpdated;
             private event Action<(int id, uint timestamp)> ItemActivationRequested { add { } remove { } }
             private event Action<PropertyChanges> PropertiesChanged { add { } remove { } }
 
-            async Task<IDisposable> IDBusMenu.WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception> onError)
+            async Task<IDisposable> IDBusMenu.WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception>? onError)
             {
                 ItemsPropertiesUpdated += handler;
                 return Disposable.Create(() => ItemsPropertiesUpdated -= handler);
             }
-            async Task<IDisposable> IDBusMenu.WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception> onError)
+            async Task<IDisposable> IDBusMenu.WatchLayoutUpdatedAsync(Action<(uint revision, int parent)> handler, Action<Exception>? onError)
             {
                 LayoutUpdated += handler;
                 return Disposable.Create(() => LayoutUpdated -= handler);
             }
 
-            async Task<IDisposable> IDBusMenu.WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception> onError)
+            async Task<IDisposable> IDBusMenu.WatchItemActivationRequestedAsync(Action<(int id, uint timestamp)> handler, Action<Exception>? onError)
             {
                 ItemActivationRequested+= handler;
                 return Disposable.Create(() => ItemActivationRequested -= handler);

src/Avalonia.FreeDesktop/DBusRequest.cs

@@ -11,6 +11,6 @@ namespace Avalonia.FreeDesktop
     internal interface IRequest : IDBusObject
     {
         Task CloseAsync();
-        Task<IDisposable> WatchResponseAsync(Action<(uint response, IDictionary<string, object> results)> handler, Action<Exception> onError = null);
+        Task<IDisposable> WatchResponseAsync(Action<(uint response, IDictionary<string, object> results)> handler, Action<Exception>? onError = null);
     }
 }

src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs

@@ -10,7 +10,7 @@ namespace Avalonia.FreeDesktop
         public IDisposable Listen(ObservableCollection<MountedVolumeInfo> mountedDrives)
         {
             Contract.Requires<ArgumentNullException>(mountedDrives != null);
-            return new LinuxMountedVolumeInfoListener(ref mountedDrives);
+            return new LinuxMountedVolumeInfoListener(ref mountedDrives!);
         }
     }
 }

src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj

@@ -11,6 +11,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+    <Compile Include="..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
     <Compile Include="..\Shared\SourceGeneratorAttributes.cs" />
   </ItemGroup>
 

src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs

@@ -133,7 +133,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             var device = gbm_create_device(card.Fd);
             _gbmTargetSurface = gbm_surface_create(device, modeInfo.Resolution.Width, modeInfo.Resolution.Height,
                 GbmColorFormats.GBM_FORMAT_XRGB8888, GbmBoFlags.GBM_BO_USE_SCANOUT | GbmBoFlags.GBM_BO_USE_RENDERING);
-            if(_gbmTargetSurface == null)
+            if(_gbmTargetSurface == IntPtr.Zero)
                 throw new InvalidOperationException("Unable to create GBM surface");
 
             _eglDisplay = new EglDisplay(new EglInterface(eglGetProcAddress), false, 0x31D7, device, null);