ui: target latest version of AvaloniaUI

mjcheetham · mjcheetham · commit 2cd5d696c0a4 · 2023-04-24T15:44:18.000-07:00
diff --git a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs
@@ -5,7 +5,7 @@
 
 namespace Atlassian.Bitbucket.UI.Views
 {
-    public class CredentialsView : UserControl, IFocusable
+    public partial class CredentialsView : UserControl, IFocusable
     {
         private TabControl _tabControl;
         private Button _oauthLoginButton;
diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj
@@ -21,12 +21,13 @@
     <PackageReference Include="Microsoft.Identity.Client" Version="4.52.0" />
     <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.28.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
-    <PackageReference Include="Avalonia" Version="0.10.18" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageReference Include="Avalonia" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/shared/Core/UI/AvaloniaApp.axaml b/src/shared/Core/UI/AvaloniaApp.axaml
@@ -3,7 +3,7 @@
              x:Class="GitCredentialManager.UI.AvaloniaApp"
              Name="Git Credential Manager">
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme/>
         <StyleInclude Source="avares://gcmcore/UI/Assets/Controls.axaml"/>
     </Application.Styles>
     <Application.Resources>
diff --git a/src/shared/Core/UI/Controls/AboutWindow.axaml.cs b/src/shared/Core/UI/Controls/AboutWindow.axaml.cs
@@ -6,7 +6,7 @@
 
 namespace GitCredentialManager.UI.Controls
 {
-    public class AboutWindow : Window
+    public partial class AboutWindow : Window
     {
         public AboutWindow()
         {
diff --git a/src/shared/Core/UI/Controls/DialogWindow.axaml.cs b/src/shared/Core/UI/Controls/DialogWindow.axaml.cs
@@ -9,7 +9,7 @@
 
 namespace GitCredentialManager.UI.Controls
 {
-    public class DialogWindow : Window
+    public partial class DialogWindow : Window
     {
         private readonly Control _view;
         private ContentControl _contentHolder;
@@ -46,7 +46,7 @@ protected override void OnDataContextChanged(EventArgs e)
                 // Send a focus request to the child view on idle
                 if (_view is IFocusable focusable)
                 {
-                    Avalonia.Threading.Dispatcher.UIThread.Post(() => focusable.SetFocus(), DispatcherPriority.ApplicationIdle);
+                    Avalonia.Threading.Dispatcher.UIThread.Post(() => focusable.SetFocus(), DispatcherPriority.Normal);
                 }
             }
         }
diff --git a/src/shared/Core/UI/Views/CredentialsView.axaml.cs b/src/shared/Core/UI/Views/CredentialsView.axaml.cs
@@ -5,7 +5,7 @@
 
 namespace GitCredentialManager.UI.Views
 {
-    public class CredentialsView : UserControl, IFocusable
+    public partial class CredentialsView : UserControl, IFocusable
     {
         private TextBox _userNameTextBox;
         private TextBox _passwordTextBox;
diff --git a/src/shared/Core/UI/Views/DeviceCodeView.axaml.cs b/src/shared/Core/UI/Views/DeviceCodeView.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace GitCredentialManager.UI.Views
 {
-    public class DeviceCodeView : UserControl
+    public partial class DeviceCodeView : UserControl
     {
         public DeviceCodeView()
         {
diff --git a/src/shared/Core/UI/Views/OAuthView.axaml.cs b/src/shared/Core/UI/Views/OAuthView.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace GitCredentialManager.UI.Views
 {
-    public class OAuthView : UserControl
+    public partial class OAuthView : UserControl
     {
         public OAuthView()
         {
diff --git a/src/shared/GitHub/UI/Controls/HorizontalShadowDivider.axaml.cs b/src/shared/GitHub/UI/Controls/HorizontalShadowDivider.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace GitHub.UI.Controls
 {
-    public class HorizontalShadowDivider : UserControl
+    public partial class HorizontalShadowDivider : UserControl
     {
         public HorizontalShadowDivider()
         {
diff --git a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
@@ -12,7 +12,7 @@
 
 namespace GitHub.UI.Controls
 {
-    public class SixDigitInput : UserControl, IFocusable
+    public partial class SixDigitInput : UserControl, IFocusable
     {
         public static readonly DirectProperty<SixDigitInput, string> TextProperty =
             AvaloniaProperty.RegisterDirect<SixDigitInput, string>(
diff --git a/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs b/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs
@@ -5,7 +5,7 @@
 
 namespace GitHub.UI.Views
 {
-    public class CredentialsView : UserControl, IFocusable
+    public partial class CredentialsView : UserControl, IFocusable
     {
         private TabControl _tabControl;
         private Button _browserButton;
diff --git a/src/shared/GitHub/UI/Views/DeviceCodeView.axaml.cs b/src/shared/GitHub/UI/Views/DeviceCodeView.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace GitHub.UI.Views
 {
-    public class DeviceCodeView : UserControl
+    public partial class DeviceCodeView : UserControl
     {
         public DeviceCodeView()
         {
diff --git a/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs b/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs
@@ -5,7 +5,7 @@
 
 namespace GitHub.UI.Views
 {
-    public class TwoFactorView : UserControl, IFocusable
+    public partial class TwoFactorView : UserControl, IFocusable
     {
         private SixDigitInput _codeInput;
 
diff --git a/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs b/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
@@ -5,7 +5,7 @@
 
 namespace GitLab.UI.Views
 {
-    public class CredentialsView : UserControl, IFocusable
+    public partial class CredentialsView : UserControl, IFocusable
     {
         private TabControl _tabControl;
         private Button _browserButton;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Atlassian.Bitbucket.UI.Views`
`7`	`7`	`{`
`8`		`- public class CredentialsView : UserControl, IFocusable`
	`8`	`+ public partial class CredentialsView : UserControl, IFocusable`
`9`	`9`	`{`
`10`	`10`	`private TabControl _tabControl;`
`11`	`11`	`private Button _oauthLoginButton;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace GitCredentialManager.UI.Controls`
`8`	`8`	`{`
`9`		`- public class AboutWindow : Window`
	`9`	`+ public partial class AboutWindow : Window`
`10`	`10`	`{`
`11`	`11`	`public AboutWindow()`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace GitCredentialManager.UI.Controls`
`11`	`11`	`{`
`12`		`- public class DialogWindow : Window`
	`12`	`+ public partial class DialogWindow : Window`
`13`	`13`	`{`
`14`	`14`	`private readonly Control _view;`
`15`	`15`	`private ContentControl _contentHolder;`
`@@ -46,7 +46,7 @@ protected override void OnDataContextChanged(EventArgs e)`
`46`	`46`	`// Send a focus request to the child view on idle`
`47`	`47`	`if (_view is IFocusable focusable)`
`48`	`48`	`{`
`49`		`- Avalonia.Threading.Dispatcher.UIThread.Post(() => focusable.SetFocus(), DispatcherPriority.ApplicationIdle);`
	`49`	`+ Avalonia.Threading.Dispatcher.UIThread.Post(() => focusable.SetFocus(), DispatcherPriority.Normal);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace GitCredentialManager.UI.Views`
`7`	`7`	`{`
`8`		`- public class CredentialsView : UserControl, IFocusable`
	`8`	`+ public partial class CredentialsView : UserControl, IFocusable`
`9`	`9`	`{`
`10`	`10`	`private TextBox _userNameTextBox;`
`11`	`11`	`private TextBox _passwordTextBox;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace GitCredentialManager.UI.Views`
`5`	`5`	`{`
`6`		`- public class DeviceCodeView : UserControl`
	`6`	`+ public partial class DeviceCodeView : UserControl`
`7`	`7`	`{`
`8`	`8`	`public DeviceCodeView()`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace GitCredentialManager.UI.Views`
`5`	`5`	`{`
`6`		`- public class OAuthView : UserControl`
	`6`	`+ public partial class OAuthView : UserControl`
`7`	`7`	`{`
`8`	`8`	`public OAuthView()`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace GitHub.UI.Controls`
`5`	`5`	`{`
`6`		`- public class HorizontalShadowDivider : UserControl`
	`6`	`+ public partial class HorizontalShadowDivider : UserControl`
`7`	`7`	`{`
`8`	`8`	`public HorizontalShadowDivider()`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace GitHub.UI.Controls`
`14`	`14`	`{`
`15`		`- public class SixDigitInput : UserControl, IFocusable`
	`15`	`+ public partial class SixDigitInput : UserControl, IFocusable`
`16`	`16`	`{`
`17`	`17`	`public static readonly DirectProperty<SixDigitInput, string> TextProperty =`
`18`	`18`	`AvaloniaProperty.RegisterDirect<SixDigitInput, string>(`