From 6d078a89652d74484a1a31bc2605faab4807b25b Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 22 Sep 2022 11:02:08 -0700
Subject: [PATCH 1/8] avn: update to latest Avalonia UI

---
 src/shared/Core.UI.Avalonia/Core.UI.Avalonia.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shared/Core.UI.Avalonia/Core.UI.Avalonia.csproj b/src/shared/Core.UI.Avalonia/Core.UI.Avalonia.csproj
index a7ade3aaa..961f67649 100644
--- a/src/shared/Core.UI.Avalonia/Core.UI.Avalonia.csproj
+++ b/src/shared/Core.UI.Avalonia/Core.UI.Avalonia.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.13" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" />
+    <PackageReference Include="Avalonia" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" />
   </ItemGroup>
 
   <ItemGroup>

From 4fb392fdf55c59d676d997703d00d17cfd2aadd2 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 22 Sep 2022 11:02:22 -0700
Subject: [PATCH 2/8] avn: workaround a macOS window focus bug

For some reason on macOS windows that are activated are not appearing on
top, and get lost behind other application windows. The platform
implementation on macOS is seemingly correctly calling the
`makeKeyAndOrderFront` native windowing API, but it's not being made
"key and front".

Setting the "topmost" flag true (and then false again) brings our
windows to the front, which is what we want.
---
 src/shared/Core.UI.Avalonia/AvaloniaUi.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/shared/Core.UI.Avalonia/AvaloniaUi.cs b/src/shared/Core.UI.Avalonia/AvaloniaUi.cs
index a7e698f58..0b0bea8fb 100644
--- a/src/shared/Core.UI.Avalonia/AvaloniaUi.cs
+++ b/src/shared/Core.UI.Avalonia/AvaloniaUi.cs
@@ -88,6 +88,15 @@ private static Task ShowWindowInternal(Func<Window> windowFunc, object dataConte
             window.Activate();
             window.Focus();
 
+            // Workaround an issue where "Activate()" and "Focus()" don't actually
+            // cause the window to become the top-most window. Avalonia is correctly
+            // calling 'makeKeyAndOrderFront' but this isn't working for some reason.
+            if (PlatformUtils.IsMacOS())
+            {
+                window.Topmost = true;
+                window.Topmost = false;
+            }
+
             return tcs.Task;
         }
 

From 2530c2814afe36de3ca3ec6a21fd0b4ee5b63894 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 22 Sep 2022 10:27:26 -0700
Subject: [PATCH 3/8] avnui: include images in app app views in Avaloina UIs

Include the images resource across all the Avalonia UI applications.
---
 src/shared/Core.UI.Avalonia/AvaloniaApp.axaml          | 1 +
 src/shared/Core.UI.Avalonia/Controls/AboutWindow.axaml | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/shared/Core.UI.Avalonia/AvaloniaApp.axaml b/src/shared/Core.UI.Avalonia/AvaloniaApp.axaml
index 05044ae2d..33e285d77 100644
--- a/src/shared/Core.UI.Avalonia/AvaloniaApp.axaml
+++ b/src/shared/Core.UI.Avalonia/AvaloniaApp.axaml
@@ -10,6 +10,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://gcmcoreuiavn/Assets/LightBase.axaml"/>
+                <ResourceInclude Source="avares://gcmcoreuiavn/Assets/Images.axaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/shared/Core.UI.Avalonia/Controls/AboutWindow.axaml b/src/shared/Core.UI.Avalonia/Controls/AboutWindow.axaml
index 1164a06d4..e05c0251f 100644
--- a/src/shared/Core.UI.Avalonia/Controls/AboutWindow.axaml
+++ b/src/shared/Core.UI.Avalonia/Controls/AboutWindow.axaml
@@ -7,13 +7,6 @@
         Title="About Git Credential Manager"
         CanResize="False" Width="300" SizeToContent="Height"
         Background="#F6F6F6">
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://gcmcoreuiavn/Assets/Images.axaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Window.Resources>
     <Window.Styles>
         <StyleInclude Source="avares://gcmcoreuiavn/Assets/Controls.axaml"/>
     </Window.Styles>
@@ -37,6 +30,6 @@
         <TextBlock HorizontalAlignment="Center"
                    Margin="0,10,0,0"
                    FontSize="11"
-                   Text="Copyright © Microsoft Corporation"/>
+                   Text="Copyright © GitHub"/>
     </StackPanel>
 </Window>

From 1be714c43b3380c9602f16d556a04afe2667a19c Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Tue, 26 Jul 2022 15:44:58 +0100
Subject: [PATCH 4/8] ui: add generic 'basic' credentials UI VM and command

Add a generic credentials prompt view model and command for collecting
username/passwords.
---
 .../Core.UI/Commands/CredentialsCommand.cs    | 81 +++++++++++++++++++
 .../ViewModels/CredentialsViewModel.cs        | 68 ++++++++++++++++
 2 files changed, 149 insertions(+)
 create mode 100644 src/shared/Core.UI/Commands/CredentialsCommand.cs
 create mode 100644 src/shared/Core.UI/ViewModels/CredentialsViewModel.cs

diff --git a/src/shared/Core.UI/Commands/CredentialsCommand.cs b/src/shared/Core.UI/Commands/CredentialsCommand.cs
new file mode 100644
index 000000000..02da8472f
--- /dev/null
+++ b/src/shared/Core.UI/Commands/CredentialsCommand.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.Threading;
+using System.Threading.Tasks;
+using GitCredentialManager.UI.ViewModels;
+
+namespace GitCredentialManager.UI.Commands
+{
+    public abstract class CredentialsCommand : HelperCommand
+    {
+        protected CredentialsCommand(ICommandContext context)
+            : base(context, "basic", "Show basic authentication prompt.")
+        {
+            AddOption(
+                new Option<string>("--title", "Window title (optional).")
+            );
+
+            AddOption(
+                new Option<string>("--resource", "Resource name or URL (optional).")
+            );
+
+            AddOption(
+                new Option<string>("--username", "User name (optional).")
+            );
+
+            AddOption(
+                new Option("--no-logo", "Hide the Git Credential Manager logo and logotype.")
+            );
+
+            Handler = CommandHandler.Create<CommandOptions>(ExecuteAsync);
+        }
+
+        private class CommandOptions
+        {
+            public string Title { get; set; }
+            public string Resource { get; set; }
+            public string UserName { get; set; }
+            public bool NoLogo { get; set; }
+        }
+
+        private async Task<int> ExecuteAsync(CommandOptions options)
+        {
+            var viewModel = new CredentialsViewModel();
+
+            viewModel.Title = !string.IsNullOrWhiteSpace(options.Title)
+                ? options.Title
+                : "Git Credential Manager";
+
+            viewModel.Description = !string.IsNullOrWhiteSpace(options.Resource)
+                ? $"Enter your credentials for '{options.Resource}'"
+                : "Enter your credentials";
+
+            if (!string.IsNullOrWhiteSpace(options.UserName))
+            {
+                viewModel.UserName = options.UserName;
+            }
+
+            viewModel.ShowProductHeader = !options.NoLogo;
+
+            await ShowAsync(viewModel, CancellationToken.None);
+
+            if (!viewModel.WindowResult)
+            {
+                throw new Exception("User cancelled dialog.");
+            }
+
+            WriteResult(
+                new Dictionary<string, string>
+                {
+                    ["username"] = viewModel.UserName,
+                    ["password"] = viewModel.Password
+                }
+            );
+            return 0;
+        }
+
+        protected abstract Task ShowAsync(CredentialsViewModel viewModel, CancellationToken ct);
+    }
+}
diff --git a/src/shared/Core.UI/ViewModels/CredentialsViewModel.cs b/src/shared/Core.UI/ViewModels/CredentialsViewModel.cs
new file mode 100644
index 000000000..c93c8ff29
--- /dev/null
+++ b/src/shared/Core.UI/ViewModels/CredentialsViewModel.cs
@@ -0,0 +1,68 @@
+using System.ComponentModel;
+
+namespace GitCredentialManager.UI.ViewModels
+{
+    public class CredentialsViewModel : WindowViewModel
+    {
+        private string _userName;
+        private string _password;
+        private string _description;
+        private bool _showProductHeader;
+        private RelayCommand _signInCommand;
+
+        public CredentialsViewModel()
+        {
+            SignInCommand = new RelayCommand(Accept, CanSignIn);
+            PropertyChanged += OnPropertyChanged;
+        }
+
+        private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(UserName):
+                case nameof(Password):
+                    SignInCommand.RaiseCanExecuteChanged();
+                    break;
+            }
+        }
+
+        private bool CanSignIn()
+        {
+            // Allow empty username or empty password, or both!
+            // This is what the older Windows API CredUIPromptForWindowsCredentials
+            // permitted so we should continue to support any possible scenarios.
+            return true;
+        }
+
+        public string UserName
+        {
+            get => _userName;
+            set => SetAndRaisePropertyChanged(ref _userName, value);
+        }
+
+        public string Password
+        {
+            get => _password;
+            set => SetAndRaisePropertyChanged(ref _password, value);
+        }
+
+        public string Description
+        {
+            get => _description;
+            set => SetAndRaisePropertyChanged(ref _description, value);
+        }
+
+        public bool ShowProductHeader
+        {
+            get => _showProductHeader;
+            set => _showProductHeader = value;
+        }
+
+        public RelayCommand SignInCommand
+        {
+            get => _signInCommand;
+            set => SetAndRaisePropertyChanged(ref _signInCommand, value);
+        }
+    }
+}

From b141c837dd7047aa08c907db2a221402ab80123f Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Tue, 26 Jul 2022 15:45:51 +0100
Subject: [PATCH 5/8] ui: add Avalonia-based UI for generic cred prompt

Add an Avalonia-based UI prompt for the generic/basic credential prompt.
---
 Git-Credential-Manager.sln                    | 19 ++++++
 .../Controls/DialogWindow.axaml               |  2 +-
 .../Commands/CredentialsCommandImpl.cs        | 17 +++++
 .../Controls/TesterWindow.axaml               | 49 ++++++++++++++
 .../Controls/TesterWindow.axaml.cs            | 40 ++++++++++++
 .../Git-Credential-Manager.UI.Avalonia.csproj | 26 ++++++++
 .../Program.cs                                | 65 +++++++++++++++++++
 .../Views/CredentialsView.axaml               | 50 ++++++++++++++
 .../Views/CredentialsView.axaml.cs            | 43 ++++++++++++
 9 files changed, 310 insertions(+), 1 deletion(-)
 create mode 100644 src/shared/Git-Credential-Manager.UI.Avalonia/Commands/CredentialsCommandImpl.cs
 create mode 100644 src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml
 create mode 100644 src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml.cs
 create mode 100644 src/shared/Git-Credential-Manager.UI.Avalonia/Git-Credential-Manager.UI.Avalonia.csproj
 create mode 100644 src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs
 create mode 100644 src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml
 create mode 100644 src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml.cs

diff --git a/Git-Credential-Manager.sln b/Git-Credential-Manager.sln
index 9b0e76ba8..7d51e983f 100644
--- a/Git-Credential-Manager.sln
+++ b/Git-Credential-Manager.sln
@@ -67,6 +67,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLab.UI.Avalonia", "src\s
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLab.UI.Windows", "src\windows\GitLab.UI.Windows\GitLab.UI.Windows.csproj", "{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Git-Credential-Manager.UI.Avalonia", "src\shared\Git-Credential-Manager.UI.Avalonia\Git-Credential-Manager.UI.Avalonia.csproj", "{35659127-8859-4DB9-8DD6-A08C1952632E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -469,6 +471,22 @@ Global
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.MacDebug|Any CPU.Build.0 = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.WindowsDebug|Any CPU.Build.0 = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.LinuxDebug|Any CPU.Build.0 = Debug|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.LinuxRelease|Any CPU.Build.0 = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.MacRelease|Any CPU.Build.0 = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{35659127-8859-4DB9-8DD6-A08C1952632E}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -505,6 +523,7 @@ Global
 		{9AFD88E2-7E2C-46DA-9D38-4342086426D3} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
 		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
+		{35659127-8859-4DB9-8DD6-A08C1952632E} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0EF9FC65-E6BA-45D4-A455-262A9EA4366B}
diff --git a/src/shared/Core.UI.Avalonia/Controls/DialogWindow.axaml b/src/shared/Core.UI.Avalonia/Controls/DialogWindow.axaml
index 3ca500e90..f995a8790 100644
--- a/src/shared/Core.UI.Avalonia/Controls/DialogWindow.axaml
+++ b/src/shared/Core.UI.Avalonia/Controls/DialogWindow.axaml
@@ -10,7 +10,7 @@
         ExtendClientAreaChromeHints="{Binding ShowCustomChrome, Converter={x:Static converters:WindowClientAreaConverters.BoolToChromeHints}}"
         Title="{Binding Title}"
         SizeToContent="Height" CanResize="False"
-        Width="420" MaxHeight="520" MinHeight="320"
+        Width="420" MaxHeight="520" MinHeight="280"
         WindowState="Normal" WindowStartupLocation="CenterScreen"
         ShowInTaskbar="True" ShowActivated="True"
         PointerPressed="Window_PointerPressed"
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Commands/CredentialsCommandImpl.cs b/src/shared/Git-Credential-Manager.UI.Avalonia/Commands/CredentialsCommandImpl.cs
new file mode 100644
index 000000000..876f95ab0
--- /dev/null
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Commands/CredentialsCommandImpl.cs
@@ -0,0 +1,17 @@
+using System.Threading;
+using System.Threading.Tasks;
+using GitCredentialManager.UI.ViewModels;
+using GitCredentialManager.UI.Views;
+
+namespace GitCredentialManager.UI.Commands
+{
+    public class CredentialsCommandImpl : CredentialsCommand
+    {
+        public CredentialsCommandImpl(ICommandContext context) : base(context) { }
+
+        protected override Task ShowAsync(CredentialsViewModel viewModel, CancellationToken ct)
+        {
+            return AvaloniaUi.ShowViewAsync<CredentialsView>(viewModel, GetParentHandle(), ct);
+        }
+    }
+}
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml b/src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml
new file mode 100644
index 000000000..e10e5c401
--- /dev/null
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml
@@ -0,0 +1,49 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="GitCredentialManager.UI.Controls.TesterWindow"
+        CanResize="False" Width="550" SizeToContent="Height"
+        Title="Git Credential Manager Dialog Tester">
+    <TabControl Margin="5,10">
+        <TabControl.Styles>
+            <Style Selector="TabItem">
+                <Setter Property="MinHeight" Value="30" />
+                <Setter Property="FontSize" Value="12"/>
+            </Style>
+            <Style Selector="TabItem > StackPanel">
+                <Setter Property="Margin" Value="0,10,0,0"/>
+            </Style>
+            <Style Selector="TabItem > StackPanel > Grid > Label">
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Margin" Value="0,0,10,0"/>
+            </Style>
+            <Style Selector="TabItem > StackPanel > Button">
+                <Setter Property="Margin" Value="0,10,0,0" />
+                <Setter Property="Padding" Value="14,10" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+            </Style>
+        </TabControl.Styles>
+        <TabItem Header="Basic">
+            <StackPanel>
+                <Grid RowDefinitions="Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*">
+                    <Label Grid.Row="0" Grid.Column="0"
+                           Content="Window Title" />
+                    <TextBox Grid.Row="0" Grid.Column="1"
+                             x:Name="title" Text="Git Credential Manager" />
+                    <Label Grid.Row="1" Grid.Column="0"
+                           Content="Description" />
+                    <TextBox Grid.Row="1" Grid.Column="1"
+                             x:Name="description" Text="Enter credentials for 'https://example.com'" />
+                    <Label Grid.Row="2" Grid.Column="0"
+                           Content="Username" />
+                    <TextBox Grid.Row="2" Grid.Column="1"
+                             x:Name="username" />
+                    <Label Grid.Row="3" Grid.Column="0"
+                           Content="Show Logo" />
+                    <CheckBox Grid.Row="3" Grid.Column="1"
+                             x:Name="showLogo" IsChecked="True" />
+                </Grid>
+                <Button Classes="accent" Content="Show" Click="ShowBasic" />
+            </StackPanel>
+        </TabItem>
+    </TabControl>
+</Window>
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml.cs b/src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml.cs
new file mode 100644
index 000000000..d6235d760
--- /dev/null
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Controls/TesterWindow.axaml.cs
@@ -0,0 +1,40 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using GitCredentialManager.UI.ViewModels;
+using GitCredentialManager.UI.Views;
+
+namespace GitCredentialManager.UI.Controls
+{
+    public class TesterWindow : Window
+    {
+        public TesterWindow()
+        {
+            InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void ShowBasic(object sender, RoutedEventArgs e)
+        {
+            var vm = new CredentialsViewModel
+            {
+                Title = this.FindControl<TextBox>("title").Text,
+                Description = this.FindControl<TextBox>("description").Text,
+                UserName = this.FindControl<TextBox>("username").Text,
+                ShowProductHeader = this.FindControl<CheckBox>("showLogo").IsChecked ?? false
+            };
+            var view = new CredentialsView();
+            var window = new DialogWindow(view) {DataContext = vm};
+            window.ShowDialog(this);
+        }
+    }
+}
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Git-Credential-Manager.UI.Avalonia.csproj b/src/shared/Git-Credential-Manager.UI.Avalonia/Git-Credential-Manager.UI.Avalonia.csproj
new file mode 100644
index 000000000..780a24386
--- /dev/null
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Git-Credential-Manager.UI.Avalonia.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifiers>osx-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
+    <AssemblyName>git-credential-manager-ui</AssemblyName>
+    <RootNamespace>GitCredentialManager.UI</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Core.UI.Avalonia\Core.UI.Avalonia.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Views\CredentialsView.axaml.cs">
+      <DependentUpon>CredentialsView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Controls\TesterWindow.axaml.cs">
+      <DependentUpon>TesterWindow.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs b/src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs
new file mode 100644
index 000000000..071ec4d01
--- /dev/null
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Threading;
+using Avalonia;
+using GitCredentialManager.UI.Commands;
+using GitCredentialManager.UI.Controls;
+
+namespace GitCredentialManager.UI
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            // If we have no arguments then just start the app with the test window.
+            if (args.Length == 0)
+            {
+                BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+                return;
+            }
+
+            // Create the dispatcher on the main thread. This is required
+            // for some platform UI services such as macOS that mandates
+            // all controls are created/accessed on the initial thread
+            // created by the process (the process entry thread).
+            Dispatcher.Initialize();
+
+            // Run AppMain in a new thread and keep the main thread free
+            // to process the dispatcher's job queue.
+            var appMain = new Thread(AppMain) {Name = nameof(AppMain)};
+            appMain.Start(args);
+
+            // Process the dispatcher job queue (aka: message pump, run-loop, etc...)
+            // We must ensure to run this on the same thread that it was created on
+            // (the main thread) so we cannot use any async/await calls between
+            // Dispatcher.Create and Run.
+            Dispatcher.MainThread.Run();
+
+            // Execution should never reach here as AppMain terminates the process on completion.
+            throw new InvalidOperationException("Main dispatcher job queue shutdown unexpectedly");
+        }
+
+        private static void AppMain(object o)
+        {
+            string[] args = (string[]) o;
+
+            string appPath = ApplicationBase.GetEntryApplicationPath();
+            using (var context = new CommandContext(appPath))
+            using (var app = new HelperApplication(context))
+            {
+                app.RegisterCommand(new CredentialsCommandImpl(context));
+
+                int exitCode = app.RunAsync(args)
+                    .ConfigureAwait(false)
+                    .GetAwaiter()
+                    .GetResult();
+
+                Environment.Exit(exitCode);
+            }
+        }
+
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure(() => new AvaloniaApp(() => new TesterWindow()))
+                .UsePlatformDetect()
+                .LogToTrace();
+    }
+}
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml b/src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml
new file mode 100644
index 000000000..5f2b0e0fa
--- /dev/null
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml
@@ -0,0 +1,50 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="clr-namespace:GitCredentialManager.UI.ViewModels;assembly=gcmcoreui"
+             xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcoreuiavn"
+             mc:Ignorable="d" d:DesignWidth="420"
+             x:Class="GitCredentialManager.UI.Views.CredentialsView">
+    <Design.DataContext>
+        <vm:CredentialsViewModel/>
+    </Design.DataContext>
+    <DockPanel>
+        <StackPanel DockPanel.Dock="Top" Margin="10,0,10,10">
+            <StackPanel Margin="0"
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Center"
+                        IsVisible="{Binding ShowProductHeader}">
+                <Image Margin="0,0,10,0"
+                       VerticalAlignment="Center"
+                       Source="{StaticResource GcmLogo}"
+                       Width="32" Height="32" />
+                <TextBlock Text="Git Credential Manager"
+                           VerticalAlignment="Center"
+                           FontSize="18"
+                           FontWeight="Light"/>
+            </StackPanel>
+
+            <TextBlock Text="{Binding Description}"
+                       FontSize="14"
+                       HorizontalAlignment="Center"
+                       TextWrapping="Wrap"
+                       Margin="0,15,0,15"/>
+        </StackPanel>
+
+        <StackPanel Margin="20,0">
+            <TextBox x:Name="userNameTextBox"
+                     Watermark="Username" Margin="0,0,0,10"
+                     Text="{Binding UserName}"/>
+            <TextBox x:Name="passwordTextBox"
+                     Watermark="Password" Margin="0,0,0,20"
+                     PasswordChar="●"
+                     Text="{Binding Password}"/>
+            <Button Content="Continue"
+                    IsDefault="True"
+                    Command="{Binding SignInCommand}"
+                    HorizontalAlignment="Center"
+                    Classes="accent"/>
+        </StackPanel>
+    </DockPanel>
+</UserControl>
diff --git a/src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml.cs b/src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml.cs
new file mode 100644
index 000000000..fd3525acc
--- /dev/null
+++ b/src/shared/Git-Credential-Manager.UI.Avalonia/Views/CredentialsView.axaml.cs
@@ -0,0 +1,43 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using GitCredentialManager.UI.Controls;
+using GitCredentialManager.UI.ViewModels;
+
+namespace GitCredentialManager.UI.Views
+{
+    public class CredentialsView : UserControl, IFocusable
+    {
+        private TextBox _userNameTextBox;
+        private TextBox _passwordTextBox;
+
+        public CredentialsView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            _userNameTextBox = this.FindControl<TextBox>("userNameTextBox");
+            _passwordTextBox = this.FindControl<TextBox>("passwordTextBox");
+        }
+
+        public void SetFocus()
+        {
+            if (!(DataContext is CredentialsViewModel vm))
+            {
+                return;
+            }
+
+            if (string.IsNullOrWhiteSpace(vm.UserName))
+            {
+                _userNameTextBox.Focus();
+            }
+            else
+            {
+                _passwordTextBox.Focus();
+            }
+        }
+    }
+}

From a1a358aa47a8a93c2f6733dc62a84ca75eb0bdbe Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Mon, 8 Aug 2022 17:04:59 +0100
Subject: [PATCH 6/8] wpfui: add a WPF-based UI for generic cred prompt

Add a WPF/Windows UI prompt for the generic/basic username and password
prompt.
---
 Git-Credential-Manager.sln                    | 13 ++++
 .../Core.UI.Windows/Assets/Styles.xaml        | 11 ++++
 .../Assets/Styles.xaml                        |  6 ++
 .../Commands/CredentialsCommandImpl.cs        | 17 ++++++
 .../Controls/TesterWindow.xaml                | 48 +++++++++++++++
 .../Controls/TesterWindow.xaml.cs             | 30 ++++++++++
 .../Git-Credential-Manager.UI.Windows.csproj  | 22 +++++++
 .../Program.cs                                | 35 +++++++++++
 .../Views/CredentialsView.xaml                | 59 +++++++++++++++++++
 .../Views/CredentialsView.xaml.cs             | 37 ++++++++++++
 10 files changed, 278 insertions(+)
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Assets/Styles.xaml
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Commands/CredentialsCommandImpl.cs
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml.cs
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Git-Credential-Manager.UI.Windows.csproj
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Program.cs
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml
 create mode 100644 src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml.cs

diff --git a/Git-Credential-Manager.sln b/Git-Credential-Manager.sln
index 7d51e983f..39248b52c 100644
--- a/Git-Credential-Manager.sln
+++ b/Git-Credential-Manager.sln
@@ -69,6 +69,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLab.UI.Windows", "src\wi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Git-Credential-Manager.UI.Avalonia", "src\shared\Git-Credential-Manager.UI.Avalonia\Git-Credential-Manager.UI.Avalonia.csproj", "{35659127-8859-4DB9-8DD6-A08C1952632E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Git-Credential-Manager.UI.Windows", "src\windows\Git-Credential-Manager.UI.Windows\Git-Credential-Manager.UI.Windows.csproj", "{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -487,6 +489,16 @@ Global
 		{35659127-8859-4DB9-8DD6-A08C1952632E}.MacRelease|Any CPU.Build.0 = Release|Any CPU
 		{35659127-8859-4DB9-8DD6-A08C1952632E}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{35659127-8859-4DB9-8DD6-A08C1952632E}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.WindowsDebug|Any CPU.Build.0 = Debug|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.WindowsRelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -524,6 +536,7 @@ Global
 		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 		{35659127-8859-4DB9-8DD6-A08C1952632E} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
+		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0EF9FC65-E6BA-45D4-A455-262A9EA4366B}
diff --git a/src/windows/Core.UI.Windows/Assets/Styles.xaml b/src/windows/Core.UI.Windows/Assets/Styles.xaml
index f005280da..8058cdb71 100644
--- a/src/windows/Core.UI.Windows/Assets/Styles.xaml
+++ b/src/windows/Core.UI.Windows/Assets/Styles.xaml
@@ -193,4 +193,15 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
+    <DrawingImage x:Key="GcmLogo">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Brush="#FFF05033" Geometry="m 127.74219 0 c -4.21881 0 -8.43843 1.6093415 -11.65821 4.828125 L 92.875 28.041016 122.31445 57.482422 c 6.84425 -2.310946 14.68947 -0.761046 20.14258 4.693359 5.48141 5.488392 7.0192 13.400136 4.65039 20.267578 l 28.37696 28.376951 c 6.86492 -2.36579 14.78398 -0.83727 20.26562 4.6543 7.66374 7.66179 7.66374 20.07642 0 27.74023 -7.66486 7.66631 -20.07893 7.66631 -27.74805 0 -5.76254 -5.76724 -7.18821 -14.23373 -4.26953 -21.33398 l -26.46289 -26.464844 -0.002 69.640624 c 1.8684 0.92496 3.63248 2.16064 5.18945 3.71094 7.66148 7.6609 7.66148 20.07236 0 27.74609 -7.66374 7.66066 -20.08459 7.66066 -27.74023 0 -7.66262 -7.67305 -7.66262 -20.08452 0 -27.74609 1.89369 -1.89039 4.08382 -3.32218 6.42187 -4.28125 V 94.199219 c -2.33912 -0.955028 -4.52734 -2.375687 -6.42383 -4.28125 -5.80409 -5.799832 -7.20125 -14.319608 -4.22461 -21.447266 L 81.466797 39.443359 4.8300781 116.08203 c -6.4393305 6.44252 -6.4393305 16.88229 0 23.32031 L 42.5 177.07227 V 162.70508 C 35.078345 157.16403 29.678851 149.02425 27.328125 140.07617 19.76286 115.647 40.902921 87.908596 66.359375 88.345703 76.747705 88.003924 87.132367 91.94485 94.875 98.837891 c 18.78493 15.372969 17.87151 47.496839 -0.888672 62.484379 l -2.566406 1.3457 0.222656 12.46503 -8.160156 8.24395 v 34.67578 l 33.119138 33.11915 c 6.43505 6.43757 16.87041 6.43757 23.31446 0 L 251.17188 139.92969 c 6.43732 -6.4407 6.43732 -16.88336 0 -23.32227 l 0.002 -0.01 L 139.39453 4.828125 C 136.1788 1.6093415 131.96099 0 127.74219 0 Z" />
+                    <GeometryDrawing Brush="#FF4D4D4D" Geometry="M 67.333984 94.333984 A 35.333332 35.333332 0 0 0 32 129.66602 A 35.333332 35.333332 0 0 0 48.5 159.54688 L 48.5 234.5 L 54.5 240 L 67 240 L 79 228 L 79 216.5 L 73 210 L 79 203.5 L 73 197 L 79 191 L 73 185.5 L 85.5 173 L 85.5 159.92188 A 35.333332 35.333332 0 0 0 102.66602 129.66602 A 35.333332 35.333332 0 0 0 67.333984 94.333984 z M 66.777344 109 A 9 9 0 0 1 75.777344 118 A 9 9 0 0 1 66.777344 127 A 9 9 0 0 1 57.777344 118 A 9 9 0 0 1 66.777344 109 z M 54.5 168 L 60.5 173 L 60.5 234.5 L 54.5 228 L 54.5 168 z " />
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
 </ResourceDictionary>
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Assets/Styles.xaml b/src/windows/Git-Credential-Manager.UI.Windows/Assets/Styles.xaml
new file mode 100644
index 000000000..67fe8a512
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Assets/Styles.xaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/gcmcoreuiwpf;component/Assets/Styles.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Commands/CredentialsCommandImpl.cs b/src/windows/Git-Credential-Manager.UI.Windows/Commands/CredentialsCommandImpl.cs
new file mode 100644
index 000000000..30029a827
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Commands/CredentialsCommandImpl.cs
@@ -0,0 +1,17 @@
+using System.Threading;
+using System.Threading.Tasks;
+using GitCredentialManager.UI.ViewModels;
+using GitCredentialManager.UI.Views;
+
+namespace GitCredentialManager.UI.Commands
+{
+    public class CredentialsCommandImpl : CredentialsCommand
+    {
+        public CredentialsCommandImpl(ICommandContext context) : base(context) { }
+
+        protected override Task ShowAsync(CredentialsViewModel viewModel, CancellationToken ct)
+        {
+            return Gui.ShowDialogWindow(viewModel, () => new CredentialsView(), GetParentHandle());
+        }
+    }
+}
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml b/src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml
new file mode 100644
index 000000000..28a76e4b1
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml
@@ -0,0 +1,48 @@
+<Window x:Class="GitCredentialManager.UI.Controls.TesterWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        mc:Ignorable="d"
+        ResizeMode="NoResize" Width="550" SizeToContent="Height"
+        Title="GitCredentialManager Authentication Dialog Tester">
+    <TabControl Margin="5,10">
+        <TabItem Header="Credentials">
+            <StackPanel>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Label Grid.Row="0" Grid.Column="0"
+                           Content="Window Title" />
+                    <TextBox Grid.Row="0" Grid.Column="1"
+                             x:Name="title" Text="Git Credential Manager" />
+                    <Label Grid.Row="1" Grid.Column="0"
+                           Content="Description" />
+                    <TextBox Grid.Row="1" Grid.Column="1"
+                             x:Name="description" Text="Enter credentials for 'https://example.com'" />
+                    <Label Grid.Row="2" Grid.Column="0"
+                           Content="Username" />
+                    <TextBox Grid.Row="2" Grid.Column="1"
+                             x:Name="username" />
+                    <Label Grid.Row="3" Grid.Column="0"
+                           Content="Show Logo" />
+                    <CheckBox Grid.Row="3" Grid.Column="1"
+                             x:Name="showLogo" IsChecked="True" />
+                </Grid>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right"
+                            Margin="0,10">
+                    <Button Content="Show" Click="ShowBasic"
+                            Padding="8,4"/>
+                </StackPanel>
+            </StackPanel>
+        </TabItem>
+    </TabControl>
+</Window>
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml.cs b/src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml.cs
new file mode 100644
index 000000000..63ef20718
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Controls/TesterWindow.xaml.cs
@@ -0,0 +1,30 @@
+using System.Windows;
+using GitCredentialManager.UI.ViewModels;
+using GitCredentialManager.UI.Views;
+using GitCredentialManager.Interop.Windows;
+using GitCredentialManager.UI.Controls;
+
+namespace GitCredentialManager.UI.Controls
+{
+    public partial class TesterWindow : Window
+    {
+        public TesterWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void ShowBasic(object sender, RoutedEventArgs e)
+        {
+            var vm = new CredentialsViewModel
+            {
+                Title = title.Text,
+                Description = description.Text,
+                UserName = username.Text,
+                ShowProductHeader = showLogo.IsChecked ?? false
+            };
+            var view = new CredentialsView();
+            var window = new DialogWindow(view) {DataContext = vm};
+            window.ShowDialog();
+        }
+    }
+}
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Git-Credential-Manager.UI.Windows.csproj b/src/windows/Git-Credential-Manager.UI.Windows/Git-Credential-Manager.UI.Windows.csproj
new file mode 100644
index 000000000..7162ba57f
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Git-Credential-Manager.UI.Windows.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net472</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <RootNamespace>GitCredentialManager.UI</RootNamespace>
+    <AssemblyName>git-credential-manager-ui</AssemblyName>
+    <ApplicationIcon>$(RepoAssetsPath)gcmicon.ico</ApplicationIcon>
+    <StartupObject>GitCredentialManager.UI.Program</StartupObject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\shared\Core.UI\Core.UI.csproj" />
+    <ProjectReference Include="..\Core.UI.Windows\Core.UI.Windows.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(OSPlatform)' != 'windows'">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Program.cs b/src/windows/Git-Credential-Manager.UI.Windows/Program.cs
new file mode 100644
index 000000000..ea8c9b662
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Program.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Threading.Tasks;
+using GitCredentialManager.UI.Commands;
+using GitCredentialManager.UI.Controls;
+using GitCredentialManager;
+using GitCredentialManager.UI;
+
+namespace GitCredentialManager.UI
+{
+    public static class Program
+    {
+        public static async Task Main(string[] args)
+        {
+            string appPath = ApplicationBase.GetEntryApplicationPath();
+            using (var context = new CommandContext(appPath))
+            using (var app = new HelperApplication(context))
+            {
+                if (args.Length == 0)
+                {
+                    await Gui.ShowWindow(() => new TesterWindow(), IntPtr.Zero);
+                    return;
+                }
+
+                app.RegisterCommand(new CredentialsCommandImpl(context));
+
+                int exitCode = app.RunAsync(args)
+                    .ConfigureAwait(false)
+                    .GetAwaiter()
+                    .GetResult();
+
+                Environment.Exit(exitCode);
+            }
+        }
+    }
+}
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml b/src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml
new file mode 100644
index 000000000..3abdbce6a
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml
@@ -0,0 +1,59 @@
+<UserControl x:Class="GitCredentialManager.UI.Views.CredentialsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcoreuiwpf"
+             xmlns:sharedControls="clr-namespace:GitCredentialManager.UI.Controls;assembly=gcmcoreuiwpf"
+             xmlns:viewModels="clr-namespace:GitCredentialManager.UI.ViewModels;assembly=gcmcoreui"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance viewModels:CredentialsViewModel}"
+             d:DesignWidth="300"
+             x:Name="view">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../Assets/Styles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <DockPanel>
+        <StackPanel DockPanel.Dock="Top" Margin="10,0,0,10">
+            <StackPanel Margin="0"
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Center"
+                        Visibility="{Binding ShowProductHeader, Converter={StaticResource BooleanToVisibilityConverter}}">
+                <Image Source="{StaticResource GcmLogo}"
+                       Height="32" VerticalAlignment="Center"
+                       Margin="0,0,10,0"/>
+                <TextBlock Text="Git Credential Manager"
+                           VerticalAlignment="Center"
+                           FontSize="18"
+                           FontWeight="Light" />
+            </StackPanel>
+
+            <TextBlock Text="{Binding Description}"
+                       HorizontalAlignment="Center"
+                       FontSize="14"
+                       Margin="0,15,0,15"/>
+        </StackPanel>
+
+        <StackPanel Margin="20,0">
+            <sharedControls:PromptTextBox x:Name="userNameTextBox"
+                                          Margin="0,0,0,10"
+                                          PromptText="Username"
+                                          Text="{Binding UserName}"/>
+            <sharedControls:PasswordPromptTextBox x:Name="passwordTextBox"
+                                                  Margin="0,0,0,20"
+                                                  PromptText="Password"
+                                                  Password="{Binding Password, UpdateSourceTrigger=PropertyChanged, Delay=50, Mode=OneWayToSource}"/>
+            <Button Content="Continue"
+                    IsDefault="True"
+                    Command="{Binding SignInCommand}"
+                    HorizontalAlignment="Center"
+                    Style="{StaticResource AccentButton}"/>
+        </StackPanel>
+    </DockPanel>
+</UserControl>
diff --git a/src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml.cs b/src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml.cs
new file mode 100644
index 000000000..b37be7ba7
--- /dev/null
+++ b/src/windows/Git-Credential-Manager.UI.Windows/Views/CredentialsView.xaml.cs
@@ -0,0 +1,37 @@
+using System.Windows.Controls;
+using System.Windows.Input;
+using GitCredentialManager.UI.Controls;
+using GitCredentialManager.UI.ViewModels;
+
+namespace GitCredentialManager.UI.Views
+{
+    public partial class CredentialsView : UserControl, IFocusable
+    {
+        public CredentialsView()
+        {
+            InitializeComponent();
+        }
+
+        public void SetFocus()
+        {
+            if (!(DataContext is CredentialsViewModel vm))
+            {
+                return;
+            }
+
+            //
+            // Select the best available authentication mechanism that is visible
+            // and make the textbox/button focused when it next made visible.
+            //
+            Control element = string.IsNullOrWhiteSpace(vm.UserName)
+                ? userNameTextBox
+                : passwordTextBox;
+
+            // Set logical focus
+            element.Focus();
+
+            // Set keyboard focus
+            Keyboard.Focus(element);
+        }
+    }
+}

From be9b83d679d81b288d56a42791f8939012af196b Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 22 Sep 2022 10:34:29 -0700
Subject: [PATCH 7/8] basic: replace system UI with new UI helper

Replace calls to the native system UI prompts with shelling out to the
generic helper UI.
---
 .../BasicAuthenticationTests.cs               | 114 ++++++++----------
 .../Core.Tests/GenericHostProviderTests.cs    |  28 ++---
 .../Authentication/BasicAuthentication.cs     |  52 ++++++--
 src/shared/Core/CommandContext.cs             |  13 --
 src/shared/Core/Constants.cs                  |   3 +
 src/shared/Core/GenericHostProvider.cs        |   2 +-
 .../Core/Interop/Linux/LinuxSystemPrompts.cs  |  13 --
 .../Core/Interop/MacOS/MacOSSystemPrompts.cs  |  13 --
 .../Objects/TestCommandContext.cs             |   4 -
 .../Objects/TestSystemPrompts.cs              |  17 ---
 10 files changed, 106 insertions(+), 153 deletions(-)
 delete mode 100644 src/shared/Core/Interop/Linux/LinuxSystemPrompts.cs
 delete mode 100644 src/shared/Core/Interop/MacOS/MacOSSystemPrompts.cs
 delete mode 100644 src/shared/TestInfrastructure/Objects/TestSystemPrompts.cs

diff --git a/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs b/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs
index a991108f4..7539a37c1 100644
--- a/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs
+++ b/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using GitCredentialManager.Authentication;
 using GitCredentialManager.Tests.Objects;
 using Moq;
@@ -14,11 +16,11 @@ public void BasicAuthentication_GetCredentials_NullResource_ThrowsException()
             var context = new TestCommandContext();
             var basicAuth = new BasicAuthentication(context);
 
-            Assert.Throws<ArgumentNullException>(() => basicAuth.GetCredentials(null));
+            Assert.ThrowsAsync<ArgumentNullException>(() => basicAuth.GetCredentialsAsync(null));
         }
 
         [Fact]
-        public void BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUserName_PasswordPromptReturnsCredentials()
+        public async Task BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUserName_PasswordPromptReturnsCredentials()
         {
             const string testResource = "https://example.com";
             const string testUserName = "john.doe";
@@ -29,14 +31,14 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUser
 
             var basicAuth = new BasicAuthentication(context);
 
-            ICredential credential = basicAuth.GetCredentials(testResource, testUserName);
+            ICredential credential = await basicAuth.GetCredentialsAsync(testResource, testUserName);
 
             Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
         }
 
         [Fact]
-        public void BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPassPromptReturnsCredentials()
+        public async Task BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPassPromptReturnsCredentials()
         {
             const string testResource = "https://example.com";
             const string testUserName = "john.doe";
@@ -48,7 +50,7 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPa
 
             var basicAuth = new BasicAuthentication(context);
 
-            ICredential credential = basicAuth.GetCredentials(testResource);
+            ICredential credential = await basicAuth.GetCredentialsAsync(testResource);
 
             Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
@@ -67,11 +69,11 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_NoTerminalPromp
 
             var basicAuth = new BasicAuthentication(context);
 
-            Assert.Throws<InvalidOperationException>(() => basicAuth.GetCredentials(testResource));
+            Assert.ThrowsAsync<InvalidOperationException>(() => basicAuth.GetCredentialsAsync(testResource));
         }
 
-        [PlatformFact(Platforms.Windows)]
-        public void BasicAuthentication_GetCredentials_DesktopSession_Resource_UserPassPromptReturnsCredentials()
+        [Fact]
+        public async Task BasicAuthentication_GetCredentials_DesktopSession_CallsHelper()
         {
             const string testResource = "https://example.com";
             const string testUserName = "john.doe";
@@ -79,88 +81,66 @@ public void BasicAuthentication_GetCredentials_DesktopSession_Resource_UserPassP
 
             var context = new TestCommandContext
             {
-                SessionManager = {IsDesktopSession = true},
-                SystemPrompts =
-                {
-                    CredentialPrompt = (resource, userName) =>
-                    {
-                        Assert.Equal(testResource, resource);
-                        Assert.Null(userName);
-
-                        return new GitCredential(testUserName, testPassword);
-                    }
-                }
+                SessionManager = {IsDesktopSession = true}
             };
 
-            var basicAuth = new BasicAuthentication(context);
-
-            ICredential credential = basicAuth.GetCredentials(testResource);
-
-            Assert.NotNull(credential);
-            Assert.Equal(testUserName, credential.Account);
-            Assert.Equal(testPassword, credential.Password);
-        }
-
-        [PlatformFact(Platforms.Windows)]
-        public void BasicAuthentication_GetCredentials_DesktopSession_ResourceAndUser_PassPromptReturnsCredentials()
-        {
-            const string testResource = "https://example.com";
-            const string testUserName = "john.doe";
-            const string testPassword = "letmein123"; // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Fake credential")]
-
-            var context = new TestCommandContext
-            {
-                SessionManager = {IsDesktopSession = true},
-                SystemPrompts =
-                {
-                    CredentialPrompt = (resource, userName) =>
+            context.FileSystem.Files["/usr/local/bin/git-credential-manager-ui"] = new byte[0];
+            context.FileSystem.Files[@"C:\Program Files\Git Credential Manager Core\git-credential-manager-ui.exe"] = new byte[0];
+
+            var auth = new Mock<BasicAuthentication>(MockBehavior.Strict, context);
+            auth.Setup(x => x.InvokeHelperAsync(
+                    It.IsAny<string>(),
+                    $"basic --resource {testResource}",
+                    It.IsAny<IDictionary<string, string>>(),
+                    It.IsAny<System.Threading.CancellationToken>()))
+                .ReturnsAsync(
+                    new Dictionary<string, string>
                     {
-                        Assert.Equal(testResource, resource);
-                        Assert.Equal(testUserName, userName);
-
-                        return new GitCredential(testUserName, testPassword);
+                        ["username"] = testUserName,
+                        ["password"] = testPassword
                     }
-                }
-            };
-
-            var basicAuth = new BasicAuthentication(context);
+                );
 
-            ICredential credential = basicAuth.GetCredentials(testResource, testUserName);
+            ICredential credential = await auth.Object.GetCredentialsAsync(testResource);
 
             Assert.NotNull(credential);
             Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
         }
 
-        [PlatformFact(Platforms.Windows)]
-        public void BasicAuthentication_GetCredentials_DesktopSession_ResourceAndUser_PassPromptDiffUserReturnsCredentials()
+        [Fact]
+        public async Task BasicAuthentication_GetCredentials_DesktopSession_UserName_CallsHelper()
         {
             const string testResource = "https://example.com";
             const string testUserName = "john.doe";
-            const string newUserName  = "jane.doe";
             const string testPassword = "letmein123"; // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Fake credential")]
 
             var context = new TestCommandContext
             {
-                SessionManager = {IsDesktopSession = true},
-                SystemPrompts =
-                {
-                    CredentialPrompt = (resource, userName) =>
-                    {
-                        Assert.Equal(testResource, resource);
-                        Assert.Equal(testUserName, userName);
-
-                        return new GitCredential(newUserName, testPassword);
-                    }
-                }
+                SessionManager = {IsDesktopSession = true}
             };
 
-            var basicAuth = new BasicAuthentication(context);
+            context.FileSystem.Files["/usr/local/bin/git-credential-manager-ui"] = new byte[0];
+            context.FileSystem.Files[@"C:\Program Files\Git Credential Manager Core\git-credential-manager-ui.exe"] = new byte[0];
+
+            var auth = new Mock<BasicAuthentication>(MockBehavior.Strict, context);
+            auth.Setup(x => x.InvokeHelperAsync(
+                    It.IsAny<string>(),
+                    $"basic --resource {testResource} --username {testUserName}",
+                    It.IsAny<IDictionary<string, string>>(),
+                    It.IsAny<System.Threading.CancellationToken>()))
+                .ReturnsAsync(
+                    new Dictionary<string, string>
+                    {
+                        ["username"] = testUserName,
+                        ["password"] = testPassword
+                    }
+                );
 
-            ICredential credential = basicAuth.GetCredentials(testResource, testUserName);
+            ICredential credential = await auth.Object.GetCredentialsAsync(testResource, testUserName);
 
             Assert.NotNull(credential);
-            Assert.Equal(newUserName, credential.Account);
+            Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
         }
     }
diff --git a/src/shared/Core.Tests/GenericHostProviderTests.cs b/src/shared/Core.Tests/GenericHostProviderTests.cs
index d118ff57e..42dc62177 100644
--- a/src/shared/Core.Tests/GenericHostProviderTests.cs
+++ b/src/shared/Core.Tests/GenericHostProviderTests.cs
@@ -83,8 +83,8 @@ public async Task GenericHostProvider_CreateCredentialAsync_WiaNotAllowed_Return
                 Settings = {IsWindowsIntegratedAuthenticationEnabled = false}
             };
             var basicAuthMock = new Mock<IBasicAuthentication>();
-            basicAuthMock.Setup(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()))
-                .Returns(basicCredential)
+            basicAuthMock.Setup(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()))
+                .ReturnsAsync(basicCredential)
                 .Verifiable();
             var wiaAuthMock = new Mock<IWindowsIntegratedAuthentication>();
 
@@ -96,7 +96,7 @@ public async Task GenericHostProvider_CreateCredentialAsync_WiaNotAllowed_Return
             Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
             wiaAuthMock.Verify(x => x.GetIsSupportedAsync(It.IsAny<Uri>()), Times.Never);
-            basicAuthMock.Verify(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+            basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         [Fact]
@@ -117,8 +117,8 @@ public async Task GenericHostProvider_CreateCredentialAsync_LegacyAuthorityBasic
                 Settings = {LegacyAuthorityOverride = "basic"}
             };
             var basicAuthMock = new Mock<IBasicAuthentication>();
-            basicAuthMock.Setup(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()))
-                .Returns(basicCredential)
+            basicAuthMock.Setup(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()))
+                .ReturnsAsync(basicCredential)
                 .Verifiable();
             var wiaAuthMock = new Mock<IWindowsIntegratedAuthentication>();
 
@@ -130,7 +130,7 @@ public async Task GenericHostProvider_CreateCredentialAsync_LegacyAuthorityBasic
             Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
             wiaAuthMock.Verify(x => x.GetIsSupportedAsync(It.IsAny<Uri>()), Times.Never);
-            basicAuthMock.Verify(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+            basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         [Fact]
@@ -148,8 +148,8 @@ public async Task GenericHostProvider_CreateCredentialAsync_NonHttpProtocol_Retu
 
             var context = new TestCommandContext();
             var basicAuthMock = new Mock<IBasicAuthentication>();
-            basicAuthMock.Setup(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()))
-                .Returns(basicCredential)
+            basicAuthMock.Setup(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()))
+                .ReturnsAsync(basicCredential)
                 .Verifiable();
             var wiaAuthMock = new Mock<IWindowsIntegratedAuthentication>();
 
@@ -161,7 +161,7 @@ public async Task GenericHostProvider_CreateCredentialAsync_NonHttpProtocol_Retu
             Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
             wiaAuthMock.Verify(x => x.GetIsSupportedAsync(It.IsAny<Uri>()), Times.Never);
-            basicAuthMock.Verify(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+            basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         [PlatformFact(Platforms.Posix)]
@@ -194,7 +194,7 @@ private static async Task TestCreateCredentialAsync_ReturnsEmptyCredential(bool
 
             var context = new TestCommandContext();
             var basicAuthMock = new Mock<IBasicAuthentication>();
-            basicAuthMock.Setup(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()))
+            basicAuthMock.Setup(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()))
                          .Verifiable();
             var wiaAuthMock = new Mock<IWindowsIntegratedAuthentication>();
             wiaAuthMock.Setup(x => x.GetIsSupportedAsync(It.IsAny<Uri>()))
@@ -207,7 +207,7 @@ private static async Task TestCreateCredentialAsync_ReturnsEmptyCredential(bool
             Assert.NotNull(credential);
             Assert.Equal(string.Empty, credential.Account);
             Assert.Equal(string.Empty, credential.Password);
-            basicAuthMock.Verify(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+            basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
         private static async Task TestCreateCredentialAsync_ReturnsBasicCredential(bool wiaSupported)
@@ -224,8 +224,8 @@ private static async Task TestCreateCredentialAsync_ReturnsBasicCredential(bool
 
             var context = new TestCommandContext();
             var basicAuthMock = new Mock<IBasicAuthentication>();
-            basicAuthMock.Setup(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()))
-                         .Returns(basicCredential)
+            basicAuthMock.Setup(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()))
+                         .ReturnsAsync(basicCredential)
                          .Verifiable();
             var wiaAuthMock = new Mock<IWindowsIntegratedAuthentication>();
             wiaAuthMock.Setup(x => x.GetIsSupportedAsync(It.IsAny<Uri>()))
@@ -238,7 +238,7 @@ private static async Task TestCreateCredentialAsync_ReturnsBasicCredential(bool
             Assert.NotNull(credential);
             Assert.Equal(testUserName, credential.Account);
             Assert.Equal(testPassword, credential.Password);
-            basicAuthMock.Verify(x => x.GetCredentials(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+            basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         #endregion
diff --git a/src/shared/Core/Authentication/BasicAuthentication.cs b/src/shared/Core/Authentication/BasicAuthentication.cs
index 0fac4d32b..83839fc23 100644
--- a/src/shared/Core/Authentication/BasicAuthentication.cs
+++ b/src/shared/Core/Authentication/BasicAuthentication.cs
@@ -1,17 +1,20 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace GitCredentialManager.Authentication
 {
     public interface IBasicAuthentication
     {
-        ICredential GetCredentials(string resource, string userName);
+        Task<ICredential> GetCredentialsAsync(string resource, string userName);
     }
 
     public static class BasicAuthenticationExtensions
     {
-        public static ICredential GetCredentials(this IBasicAuthentication basicAuth, string resource)
+        public static Task<ICredential> GetCredentialsAsync(this IBasicAuthentication basicAuth, string resource)
         {
-            return basicAuth.GetCredentials(resource, null);
+            return basicAuth.GetCredentialsAsync(resource, null);
         }
     }
 
@@ -25,17 +28,16 @@ public class BasicAuthentication : AuthenticationBase, IBasicAuthentication
         public BasicAuthentication(ICommandContext context)
             : base (context) { }
 
-        public ICredential GetCredentials(string resource, string userName)
+        public async Task<ICredential> GetCredentialsAsync(string resource, string userName)
         {
             EnsureArgument.NotNullOrWhiteSpace(resource, nameof(resource));
 
             ThrowIfUserInteractionDisabled();
 
-            // TODO: we only support system GUI prompts on Windows currently
             if (Context.Settings.IsGuiPromptsEnabled && Context.SessionManager.IsDesktopSession &&
-                PlatformUtils.IsWindows())
+                TryFindHelperExecutablePath(out string helperPath))
             {
-                return GetCredentialsByUi(resource, userName);
+                return await GetCredentialsByUiAsync(helperPath, resource, userName);
             }
 
             ThrowIfTerminalPromptsDisabled();
@@ -64,14 +66,42 @@ private ICredential GetCredentialsByTty(string resource, string userName)
             return new GitCredential(userName, password);
         }
 
-        private ICredential GetCredentialsByUi(string resource, string userName)
+        private async Task<ICredential> GetCredentialsByUiAsync(string helperPath, string resource, string userName)
         {
-            if (!Context.SystemPrompts.ShowCredentialPrompt(resource, userName, out ICredential credential))
+            var promptArgs = new StringBuilder("basic");
+
+            if (!string.IsNullOrWhiteSpace(resource))
+            {
+                promptArgs.AppendFormat(" --resource {0}", QuoteCmdArg(resource));
+            }
+
+            if (!string.IsNullOrWhiteSpace(userName))
+            {
+                promptArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));
+            }
+
+            IDictionary<string, string> resultDict = await InvokeHelperAsync(helperPath, promptArgs.ToString(), null);
+
+            if (!resultDict.TryGetValue("username", out userName))
+            {
+                throw new Exception("Missing 'username' in response");
+            }
+
+            if (!resultDict.TryGetValue("password", out string password))
             {
-                throw new Exception("User cancelled the authentication prompt.");
+                throw new Exception("Missing 'password' in response");
             }
 
-            return credential;
+            return new GitCredential(userName, password);
+        }
+
+        private bool TryFindHelperExecutablePath(out string path)
+        {
+            return TryFindHelperExecutablePath(
+                Constants.EnvironmentVariables.GcmUiHelper,
+                Constants.GitConfiguration.Credential.UiHelper,
+                Constants.DefaultUiHelper,
+                out path);
         }
     }
 }
diff --git a/src/shared/Core/CommandContext.cs b/src/shared/Core/CommandContext.cs
index 397d57bbb..0e784992a 100644
--- a/src/shared/Core/CommandContext.cs
+++ b/src/shared/Core/CommandContext.cs
@@ -66,11 +66,6 @@ public interface ICommandContext : IDisposable
         /// The current process environment.
         /// </summary>
         IEnvironment Environment { get; }
-
-        /// <summary>
-        /// Native UI prompts.
-        /// </summary>
-        ISystemPrompts SystemPrompts { get; }
     }
 
     /// <summary>
@@ -90,7 +85,6 @@ public CommandContext(string appPath)
             {
                 FileSystem        = new WindowsFileSystem();
                 SessionManager    = new WindowsSessionManager();
-                SystemPrompts     = new WindowsSystemPrompts();
                 Environment       = new WindowsEnvironment(FileSystem);
                 Terminal          = new WindowsTerminal(Trace);
                 string gitPath    = GetGitPath(Environment, FileSystem, Trace);
@@ -106,7 +100,6 @@ public CommandContext(string appPath)
             {
                 FileSystem        = new MacOSFileSystem();
                 SessionManager    = new MacOSSessionManager();
-                SystemPrompts     = new MacOSSystemPrompts();
                 Environment       = new MacOSEnvironment(FileSystem);
                 Terminal          = new MacOSTerminal(Trace);
                 string gitPath    = GetGitPath(Environment, FileSystem, Trace);
@@ -123,7 +116,6 @@ public CommandContext(string appPath)
                 FileSystem        = new LinuxFileSystem();
                 // TODO: support more than just 'Posix' or X11
                 SessionManager    = new PosixSessionManager();
-                SystemPrompts     = new LinuxSystemPrompts();
                 Environment       = new PosixEnvironment(FileSystem);
                 Terminal          = new LinuxTerminal(Trace);
                 string gitPath    = GetGitPath(Environment, FileSystem, Trace);
@@ -142,9 +134,6 @@ public CommandContext(string appPath)
 
             HttpClientFactory = new HttpClientFactory(FileSystem, Trace, Settings, Streams);
             CredentialStore   = new CredentialStore(this);
-
-            // Set the parent window handle/ID
-            SystemPrompts.ParentWindowId = Settings.ParentWindowId;
         }
 
         private static string GetGitPath(IEnvironment environment, IFileSystem fileSystem, ITrace trace)
@@ -203,8 +192,6 @@ private static string GetGitPath(IEnvironment environment, IFileSystem fileSyste
 
         public IEnvironment Environment { get; }
 
-        public ISystemPrompts SystemPrompts { get; }
-
         #endregion
 
         #region IDisposable
diff --git a/src/shared/Core/Constants.cs b/src/shared/Core/Constants.cs
index e3a1d7d9d..665d99b23 100644
--- a/src/shared/Core/Constants.cs
+++ b/src/shared/Core/Constants.cs
@@ -8,6 +8,7 @@ public static class Constants
         public const string PersonalAccessTokenUserName = "PersonalAccessToken";
         public const string DefaultCredentialNamespace = "git";
         public const int DefaultAutoDetectProviderTimeoutMs = 2000; // 2 seconds
+        public const string DefaultUiHelper = "git-credential-manager-ui";
 
         public const string ProviderIdAuto  = "auto";
         public const string AuthorityIdAuto = "auto";
@@ -87,6 +88,7 @@ public static class EnvironmentVariables
             public const string GpgExecutablePath     = "GCM_GPG_PATH";
             public const string GcmAutoDetectTimeout  = "GCM_AUTODETECT_TIMEOUT";
             public const string GcmGuiPromptsEnabled  = "GCM_GUI_PROMPT";
+            public const string GcmUiHelper           = "GCM_UI_HELPER";
         }
 
         public static class Http
@@ -122,6 +124,7 @@ public static class Credential
                 public const string UserName = "username";
                 public const string AutoDetectTimeout = "autoDetectTimeout";
                 public const string GuiPromptsEnabled = "guiPrompt";
+                public const string UiHelper = "uiHelper";
             }
 
             public static class Http
diff --git a/src/shared/Core/GenericHostProvider.cs b/src/shared/Core/GenericHostProvider.cs
index c0e794d4d..3f98eab0f 100644
--- a/src/shared/Core/GenericHostProvider.cs
+++ b/src/shared/Core/GenericHostProvider.cs
@@ -87,7 +87,7 @@ public override async Task<ICredential> GenerateCredentialAsync(InputArguments i
             }
 
             Context.Trace.WriteLine("Prompting for basic credentials...");
-            return _basicAuth.GetCredentials(uri.AbsoluteUri, input.UserName);
+            return await _basicAuth.GetCredentialsAsync(uri.AbsoluteUri, input.UserName);
         }
 
         /// <summary>
diff --git a/src/shared/Core/Interop/Linux/LinuxSystemPrompts.cs b/src/shared/Core/Interop/Linux/LinuxSystemPrompts.cs
deleted file mode 100644
index 05342b0bf..000000000
--- a/src/shared/Core/Interop/Linux/LinuxSystemPrompts.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-namespace GitCredentialManager.Interop.Linux
-{
-    public class LinuxSystemPrompts : ISystemPrompts
-    {
-        public object ParentWindowId { get; set; }
-
-        public bool ShowCredentialPrompt(string resource, string userName, out ICredential credential)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/shared/Core/Interop/MacOS/MacOSSystemPrompts.cs b/src/shared/Core/Interop/MacOS/MacOSSystemPrompts.cs
deleted file mode 100644
index 9cbac2583..000000000
--- a/src/shared/Core/Interop/MacOS/MacOSSystemPrompts.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-namespace GitCredentialManager.Interop.MacOS
-{
-    public class MacOSSystemPrompts : ISystemPrompts
-    {
-        public object ParentWindowId { get; set; }
-
-        public bool ShowCredentialPrompt(string resource, string userName, out ICredential credential)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/shared/TestInfrastructure/Objects/TestCommandContext.cs b/src/shared/TestInfrastructure/Objects/TestCommandContext.cs
index 21ec0216c..9a0d30936 100644
--- a/src/shared/TestInfrastructure/Objects/TestCommandContext.cs
+++ b/src/shared/TestInfrastructure/Objects/TestCommandContext.cs
@@ -23,7 +23,6 @@ public TestCommandContext()
             HttpClientFactory = new TestHttpClientFactory();
             Git = new TestGit();
             Environment = new TestEnvironment(FileSystem);
-            SystemPrompts = new TestSystemPrompts();
 
             Settings = new TestSettings {Environment = Environment, GitConfiguration = Git.Configuration};
         }
@@ -39,7 +38,6 @@ public TestCommandContext()
         public TestHttpClientFactory HttpClientFactory { get; set; }
         public TestGit Git { get; set; }
         public TestEnvironment Environment { get; set; }
-        public TestSystemPrompts SystemPrompts { get; set; }
 
         #region ICommandContext
 
@@ -65,8 +63,6 @@ public TestCommandContext()
 
         IEnvironment ICommandContext.Environment => Environment;
 
-        ISystemPrompts ICommandContext.SystemPrompts => SystemPrompts;
-
         #endregion
 
         #region IDisposable
diff --git a/src/shared/TestInfrastructure/Objects/TestSystemPrompts.cs b/src/shared/TestInfrastructure/Objects/TestSystemPrompts.cs
deleted file mode 100644
index a73fd18f3..000000000
--- a/src/shared/TestInfrastructure/Objects/TestSystemPrompts.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace GitCredentialManager.Tests.Objects
-{
-    public class TestSystemPrompts : ISystemPrompts
-    {
-        public Func<string, string, ICredential> CredentialPrompt { get; set; } = (resource, user) => null;
-
-        public object ParentWindowId { get; set; }
-
-        public bool ShowCredentialPrompt(string resource, string userName, out ICredential credential)
-        {
-            credential = CredentialPrompt(resource, userName);
-            return credential != null;
-        }
-    }
-}

From feb02cef1ea62afff3557a1244fd2446b8244a2f Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 22 Sep 2022 10:31:13 -0700
Subject: [PATCH 8/8] install: include core UI app in all installers

---
 src/linux/Packaging.Linux/build.sh       | 10 ++++++++++
 src/osx/Installer.Mac/layout.sh          | 11 +++++++++++
 src/windows/Installer.Windows/layout.ps1 |  8 ++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/linux/Packaging.Linux/build.sh b/src/linux/Packaging.Linux/build.sh
index a9430850d..7509be929 100755
--- a/src/linux/Packaging.Linux/build.sh
+++ b/src/linux/Packaging.Linux/build.sh
@@ -47,6 +47,7 @@ ROOT="$( cd "$THISDIR"/../../.. ; pwd -P )"
 SRC="$ROOT/src"
 OUT="$ROOT/out"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
+GCM_UI_SRC="$SRC/shared/Git-Credential-Manager.UI.Avalonia"
 BITBUCKET_UI_SRC="$SRC/shared/Atlassian.Bitbucket.UI.Avalonia"
 GITHUB_UI_SRC="$SRC/shared/GitHub.UI.Avalonia"
 GITLAB_UI_SRC="$SRC/shared/GitLab.UI.Avalonia"
@@ -120,6 +121,15 @@ $DOTNET_ROOT/dotnet publish "$GCM_SRC" \
 	-p:PublishSingleFile=true \
 	--output="$(make_absolute "$PAYLOAD")" || exit 1
 
+echo "Publishing core UI helper..."
+$DOTNET_ROOT/dotnet publish "$GCM_UI_SRC" \
+	--configuration="$CONFIGURATION" \
+	--framework="$FRAMEWORK" \
+	--runtime="$RUNTIME" \
+	--self-contained=true \
+	-p:PublishSingleFile=true \
+	--output="$(make_absolute "$PAYLOAD")" || exit 1
+
 echo "Publishing Bitbucket UI helper..."
 $DOTNET_ROOT/dotnet publish "$BITBUCKET_UI_SRC" \
 	--configuration="$CONFIGURATION" \
diff --git a/src/osx/Installer.Mac/layout.sh b/src/osx/Installer.Mac/layout.sh
index b9991713d..179f1f0be 100755
--- a/src/osx/Installer.Mac/layout.sh
+++ b/src/osx/Installer.Mac/layout.sh
@@ -21,6 +21,7 @@ SRC="$ROOT/src"
 OUT="$ROOT/out"
 INSTALLER_SRC="$SRC/osx/Installer.Mac"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
+GCM_UI_SRC="$SRC/shared/Git-Credential-Manager.UI.Avalonia"
 BITBUCKET_UI_SRC="$SRC/shared/Atlassian.Bitbucket.UI.Avalonia"
 GITHUB_UI_SRC="$SRC/shared/GitHub.UI.Avalonia"
 GITLAB_UI_SRC="$SRC/shared/GitLab.UI.Avalonia"
@@ -104,6 +105,16 @@ dotnet publish "$GCM_SRC" \
 	--self-contained \
 	--output="$(make_absolute "$PAYLOAD")" || exit 1
 
+echo "Publishing core UI helper..."
+dotnet publish "$GCM_UI_SRC" \
+	--no-restore \
+	-m:1 \
+	--configuration="$CONFIGURATION" \
+	--framework="$FRAMEWORK" \
+	--runtime="$RUNTIME" \
+	--self-contained \
+	--output="$(make_absolute "$PAYLOAD")" || exit 1
+
 echo "Publishing Bitbucket UI helper..."
 dotnet publish "$BITBUCKET_UI_SRC" \
 	--no-restore \
diff --git a/src/windows/Installer.Windows/layout.ps1 b/src/windows/Installer.Windows/layout.ps1
index 6b43a2cb9..37e4a6955 100644
--- a/src/windows/Installer.Windows/layout.ps1
+++ b/src/windows/Installer.Windows/layout.ps1
@@ -8,6 +8,7 @@ $THISDIR = $pwd.path
 $ROOT = (Get-Item $THISDIR).parent.parent.parent.FullName
 $SRC = "$ROOT/src"
 $GCM_SRC = "$SRC/shared/Git-Credential-Manager"
+$GCM_UI_SRC = "$SRC/windows/Git-Credential-Manager.UI.Windows"
 $BITBUCKET_UI_SRC = "$SRC/windows/Atlassian.Bitbucket.UI.Windows"
 $GITHUB_UI_SRC = "$SRC/windows/GitHub.UI.Windows"
 $GITLAB_UI_SRC = "$SRC/windows/GitLab.UI.Windows"
@@ -45,6 +46,13 @@ dotnet publish "$GCM_SRC" `
 	--runtime win-x86 `
 	--output "$PAYLOAD"
 
+Write-Output "Publishing core UI helper..."
+dotnet publish "$GCM_UI_SRC" `
+	--framework net472 `
+	--configuration "$CONFIGURATION" `
+	--runtime win-x86 `
+	--output "$PAYLOAD"
+
 Write-Output "Publishing Bitbucket UI helper..."
 dotnet publish "$BITBUCKET_UI_SRC" `
 	--configuration "$CONFIGURATION" `