From fd3cbbfd91ace0ceab15c3607ddcb7828f839e18 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 20 Apr 2023 14:27:02 -0700
Subject: [PATCH] gitlab: merge .UI.Avn and .UI in to GitLab

---
 Git-Credential-Manager.sln                    | 38 ---------
 .../Packaging.Linux/Packaging.Linux.csproj    |  1 -
 src/linux/Packaging.Linux/layout.sh           | 10 ---
 src/osx/Installer.Mac/Installer.Mac.csproj    |  1 -
 src/osx/Installer.Mac/layout.sh               |  9 ---
 src/shared/DotnetTool/layout.sh               |  8 --
 .../Commands/CredentialsCommandImpl.cs        | 19 -----
 .../Controls/TesterWindow.axaml               | 49 ------------
 .../Controls/TesterWindow.axaml.cs            | 67 ----------------
 .../GitLab.UI.Avalonia.csproj                 | 30 --------
 src/shared/GitLab.UI.Avalonia/Program.cs      | 77 -------------------
 src/shared/GitLab.UI/GitLab.UI.csproj         | 14 ----
 .../UI}/Commands/CredentialsCommand.cs        |  0
 .../UI}/ViewModels/CredentialsViewModel.cs    |  0
 .../UI}/Views/CredentialsView.axaml           |  3 +-
 .../UI}/Views/CredentialsView.axaml.cs        |  0
 .../GitLab.UI.Windows.csproj                  |  2 +-
 .../Views/CredentialsView.xaml                |  2 +-
 18 files changed, 3 insertions(+), 327 deletions(-)
 delete mode 100644 src/shared/GitLab.UI.Avalonia/Commands/CredentialsCommandImpl.cs
 delete mode 100644 src/shared/GitLab.UI.Avalonia/Controls/TesterWindow.axaml
 delete mode 100644 src/shared/GitLab.UI.Avalonia/Controls/TesterWindow.axaml.cs
 delete mode 100644 src/shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj
 delete mode 100644 src/shared/GitLab.UI.Avalonia/Program.cs
 delete mode 100644 src/shared/GitLab.UI/GitLab.UI.csproj
 rename src/shared/{GitLab.UI => GitLab/UI}/Commands/CredentialsCommand.cs (100%)
 rename src/shared/{GitLab.UI => GitLab/UI}/ViewModels/CredentialsViewModel.cs (100%)
 rename src/shared/{GitLab.UI.Avalonia => GitLab/UI}/Views/CredentialsView.axaml (97%)
 rename src/shared/{GitLab.UI.Avalonia => GitLab/UI}/Views/CredentialsView.axaml.cs (100%)

diff --git a/Git-Credential-Manager.sln b/Git-Credential-Manager.sln
index e9667b6b7..75e1254b7 100644
--- a/Git-Credential-Manager.sln
+++ b/Git-Credential-Manager.sln
@@ -49,10 +49,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLab", "src\shared\GitLab
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLab.Tests", "src\shared\GitLab.Tests\GitLab.Tests.csproj", "{1AF9F7C5-FA2E-48F1-B216-4D5E9A27F393}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLab.UI", "src\shared\GitLab.UI\GitLab.UI.csproj", "{9AFD88E2-7E2C-46DA-9D38-4342086426D3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLab.UI.Avalonia", "src\shared\GitLab.UI.Avalonia\GitLab.UI.Avalonia.csproj", "{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}"
-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.Windows", "src\windows\Git-Credential-Manager.UI.Windows\Git-Credential-Manager.UI.Windows.csproj", "{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C}"
@@ -321,38 +317,6 @@ Global
 		{1AF9F7C5-FA2E-48F1-B216-4D5E9A27F393}.MacRelease|Any CPU.Build.0 = Release|Any CPU
 		{1AF9F7C5-FA2E-48F1-B216-4D5E9A27F393}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{1AF9F7C5-FA2E-48F1-B216-4D5E9A27F393}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.MacDebug|Any CPU.Build.0 = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.WindowsDebug|Any CPU.Build.0 = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.LinuxDebug|Any CPU.Build.0 = Debug|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.LinuxRelease|Any CPU.Build.0 = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.MacRelease|Any CPU.Build.0 = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{9AFD88E2-7E2C-46DA-9D38-4342086426D3}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.MacDebug|Any CPU.Build.0 = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.WindowsDebug|Any CPU.Build.0 = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.LinuxDebug|Any CPU.Build.0 = Debug|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.LinuxRelease|Any CPU.Build.0 = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.MacRelease|Any CPU.Build.0 = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{47186A50-8889-4FC7-8A05-F9FCE7F8F4AE}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83EAC1F9-8E1F-41FC-8FC9-2C452452D64E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -400,8 +364,6 @@ Global
 		{3F015046-DAF2-4D2A-96EC-F9782F169E45} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 		{570897DC-A85C-4598-B793-9A00CF710119} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
 		{1AF9F7C5-FA2E-48F1-B216-4D5E9A27F393} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
-		{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}
 		{01BF56EC-AAC1-4BCA-8204-EE51D968DF5C} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 	EndGlobalSection
diff --git a/src/linux/Packaging.Linux/Packaging.Linux.csproj b/src/linux/Packaging.Linux/Packaging.Linux.csproj
index 0afb03062..edb7ef314 100644
--- a/src/linux/Packaging.Linux/Packaging.Linux.csproj
+++ b/src/linux/Packaging.Linux/Packaging.Linux.csproj
@@ -17,7 +17,6 @@
 
   <ItemGroup>
     <ProjectReference Include="../../shared/Git-Credential-Manager/Git-Credential-Manager.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="../../shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <!-- Implicit SDK targets import (so we can override the default targets below) -->
diff --git a/src/linux/Packaging.Linux/layout.sh b/src/linux/Packaging.Linux/layout.sh
index c43e19ba2..74b76a313 100755
--- a/src/linux/Packaging.Linux/layout.sh
+++ b/src/linux/Packaging.Linux/layout.sh
@@ -35,7 +35,6 @@ ROOT="$( cd "$THISDIR"/../../.. ; pwd -P )"
 SRC="$ROOT/src"
 OUT="$ROOT/out"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
-GITLAB_UI_SRC="$SRC/shared/GitLab.UI.Avalonia"
 PROJ_OUT="$OUT/linux/Packaging.Linux"
 
 # Build parameters
@@ -78,15 +77,6 @@ $DOTNET_ROOT/dotnet publish "$GCM_SRC" \
 	-p:PublishSingleFile=true \
 	--output="$(make_absolute "$PAYLOAD")" || exit 1
 
-echo "Publishing GitLab UI helper..."
-$DOTNET_ROOT/dotnet publish "$GITLAB_UI_SRC" \
-	--configuration="$CONFIGURATION" \
-	--framework="$FRAMEWORK" \
-	--runtime="$RUNTIME" \
-	--self-contained=true \
-	-p:PublishSingleFile=true \
-	--output="$(make_absolute "$PAYLOAD")" || exit 1
-
 # Collect symbols
 echo "Collecting managed symbols..."
 mv "$PAYLOAD"/*.pdb "$SYMBOLOUT" || exit 1
diff --git a/src/osx/Installer.Mac/Installer.Mac.csproj b/src/osx/Installer.Mac/Installer.Mac.csproj
index c108f09a3..e55f211e2 100644
--- a/src/osx/Installer.Mac/Installer.Mac.csproj
+++ b/src/osx/Installer.Mac/Installer.Mac.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="../../shared/Git-Credential-Manager/Git-Credential-Manager.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="../../shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <!-- Implicit SDK targets import (so we can override the default targets below) -->
diff --git a/src/osx/Installer.Mac/layout.sh b/src/osx/Installer.Mac/layout.sh
index b3dc017c0..a95eb1f0d 100755
--- a/src/osx/Installer.Mac/layout.sh
+++ b/src/osx/Installer.Mac/layout.sh
@@ -22,7 +22,6 @@ 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"
-GITLAB_UI_SRC="$SRC/shared/GitLab.UI.Avalonia"
 
 # Build parameters
 FRAMEWORK=net6.0
@@ -101,14 +100,6 @@ dotnet publish "$GCM_SRC" \
 	--self-contained \
 	--output="$(make_absolute "$PAYLOAD")" || exit 1
 
-echo "Publishing GitLab UI helper..."
-dotnet publish "$GITLAB_UI_SRC" \
-	--configuration="$CONFIGURATION" \
-	--framework="$FRAMEWORK" \
-	--runtime="$RUNTIME" \
-	--self-contained \
-	--output="$(make_absolute "$PAYLOAD")" || exit 1
-
 # Collect symbols
 echo "Collecting managed symbols..."
 mv "$PAYLOAD"/*.pdb "$SYMBOLOUT" || exit 1
diff --git a/src/shared/DotnetTool/layout.sh b/src/shared/DotnetTool/layout.sh
index 7ef96ed53..b7335abc0 100755
--- a/src/shared/DotnetTool/layout.sh
+++ b/src/shared/DotnetTool/layout.sh
@@ -33,7 +33,6 @@ ROOT="$( cd "$THISDIR"/../../.. ; pwd -P )"
 SRC="$ROOT/src"
 OUT="$ROOT/out"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
-GITLAB_UI_SRC="$SRC/shared/GitLab.UI.Avalonia"
 DOTNET_TOOL="shared/DotnetTool"
 PROJ_OUT="$OUT/$DOTNET_TOOL"
 
@@ -69,13 +68,6 @@ $DOTNET_ROOT/dotnet publish "$GCM_SRC" \
     --output="$(make_absolute "$PAYLOAD")" \
     -p:UseAppHost=false || exit 1
 
-echo "Publishing GitLab UI helper..."
-$DOTNET_ROOT/dotnet publish "$GITLAB_UI_SRC" \
-    --configuration="$CONFIGURATION" \
-    --framework="$FRAMEWORK" \
-    --output="$(make_absolute "$PAYLOAD")" \
-    -p:UseAppHost=false || exit 1
-
 # Collect symbols
 echo "Collecting managed symbols..."
 mv "$PAYLOAD"/*.pdb "$SYMBOLOUT" || exit 1
diff --git a/src/shared/GitLab.UI.Avalonia/Commands/CredentialsCommandImpl.cs b/src/shared/GitLab.UI.Avalonia/Commands/CredentialsCommandImpl.cs
deleted file mode 100644
index cca0e50e8..000000000
--- a/src/shared/GitLab.UI.Avalonia/Commands/CredentialsCommandImpl.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using GitLab.UI.ViewModels;
-using GitLab.UI.Views;
-using GitCredentialManager;
-using GitCredentialManager.UI;
-
-namespace GitLab.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/GitLab.UI.Avalonia/Controls/TesterWindow.axaml b/src/shared/GitLab.UI.Avalonia/Controls/TesterWindow.axaml
deleted file mode 100644
index c524d40d1..000000000
--- a/src/shared/GitLab.UI.Avalonia/Controls/TesterWindow.axaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="GitLab.UI.Controls.TesterWindow"
-        CanResize="False" Width="550" SizeToContent="Height"
-        Title="GitLab Authentication 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="Credentials">
-            <StackPanel>
-                <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,*">
-                    <Label Grid.Row="0" Grid.Column="0"
-                           Content="Auth Modes" />
-                    <StackPanel Grid.Row="0" Grid.Column="1"
-                                Orientation="Horizontal" VerticalAlignment="Center">
-                        <CheckBox Content="Browser" x:Name="useBrowser" MinWidth="90" IsChecked="True" />
-                        <CheckBox Content="PAT" x:Name="usePat" MinWidth="80" IsChecked="True" />
-                        <CheckBox Content="Basic" x:Name="useBasic" MinWidth="80" />
-                    </StackPanel>
-                    <Label Grid.Row="1" Grid.Column="0"
-                           Content="Instance URL" />
-                    <TextBox Grid.Row="1" Grid.Column="1"
-                             x:Name="instanceUrl" />
-                    <Label Grid.Row="2" Grid.Column="0"
-                           Content="Username" />
-                    <TextBox Grid.Row="2" Grid.Column="1"
-                             x:Name="username" />
-                </Grid>
-                <Button Classes="accent" Content="Show" Click="ShowCredentials" />
-            </StackPanel>
-        </TabItem>
-    </TabControl>
-</Window>
diff --git a/src/shared/GitLab.UI.Avalonia/Controls/TesterWindow.axaml.cs b/src/shared/GitLab.UI.Avalonia/Controls/TesterWindow.axaml.cs
deleted file mode 100644
index d494dfec8..000000000
--- a/src/shared/GitLab.UI.Avalonia/Controls/TesterWindow.axaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using GitLab.UI.ViewModels;
-using GitLab.UI.Views;
-using GitCredentialManager;
-using GitCredentialManager.Interop.Linux;
-using GitCredentialManager.Interop.MacOS;
-using GitCredentialManager.Interop.Posix;
-using GitCredentialManager.Interop.Windows;
-using GitCredentialManager.UI.Controls;
-
-namespace GitLab.UI.Controls
-{
-    public class TesterWindow : Window
-    {
-        private readonly IEnvironment _environment;
-
-        public TesterWindow()
-        {
-            InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
-            if (PlatformUtils.IsWindows())
-            {
-                _environment = new WindowsEnvironment(new WindowsFileSystem());
-            }
-            else
-            {
-                IFileSystem fs;
-                if (PlatformUtils.IsMacOS())
-                {
-                    fs = new MacOSFileSystem();
-                }
-                else
-                {
-                    fs = new LinuxFileSystem();
-                }
-
-                _environment = new PosixEnvironment(fs);
-            }
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        private void ShowCredentials(object sender, RoutedEventArgs e)
-        {
-            var vm = new CredentialsViewModel(_environment)
-            {
-                ShowBrowserLogin = this.FindControl<CheckBox>("useBrowser").IsChecked ?? false,
-                ShowTokenLogin = this.FindControl<CheckBox>("usePat").IsChecked ?? false,
-                ShowBasicLogin = this.FindControl<CheckBox>("useBasic").IsChecked ?? false,
-                Url = this.FindControl<TextBox>("instanceUrl").Text,
-                UserName = this.FindControl<TextBox>("username").Text
-            };
-            var view = new CredentialsView();
-            var window = new DialogWindow(view) {DataContext = vm};
-            window.ShowDialog(this);
-        }
-    }
-}
diff --git a/src/shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj b/src/shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj
deleted file mode 100644
index f4464abea..000000000
--- a/src/shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifiers>osx-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
-    <RootNamespace>GitLab.UI</RootNamespace>
-    <AssemblyName>GitLab.UI</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\GitLab.UI\GitLab.UI.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Windows\CredentialsWindow.axaml.cs">
-      <DependentUpon>CredentialsWindow.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Windows\TesterWindow.axaml.cs">
-      <DependentUpon>Tester.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/GitLab.UI.Avalonia/Program.cs b/src/shared/GitLab.UI.Avalonia/Program.cs
deleted file mode 100644
index a3ce47799..000000000
--- a/src/shared/GitLab.UI.Avalonia/Program.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using Avalonia;
-using GitLab.UI.Controls;
-using GitLab.UI.Commands;
-using GitCredentialManager;
-using GitCredentialManager.UI;
-
-namespace GitLab.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.Initialize 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;
-
-            // Set the session id (sid) for the helper process, to be
-            // used when TRACE2 tracing is enabled.
-            ProcessManager.CreateSid();
-            using (var context = new CommandContext())
-            using (var app = new HelperApplication(context))
-            {
-                // Initialize TRACE2 system
-                context.Trace2.Initialize(DateTimeOffset.UtcNow);
-
-                // Write the start and version events
-                context.Trace2.Start(context.ApplicationPath, args);
-
-                app.RegisterCommand(new CredentialsCommandImpl(context));
-
-                int exitCode = app.RunAsync(args)
-                    .ConfigureAwait(false)
-                    .GetAwaiter()
-                    .GetResult();
-
-                context.Trace2.Stop(exitCode);
-                Environment.Exit(exitCode);
-            }
-        }
-
-        public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure(() => new AvaloniaApp(() => new TesterWindow()))
-                .UsePlatformDetect()
-                .LogToTrace();
-    }
-}
diff --git a/src/shared/GitLab.UI/GitLab.UI.csproj b/src/shared/GitLab.UI/GitLab.UI.csproj
deleted file mode 100644
index 9793a1c8f..000000000
--- a/src/shared/GitLab.UI/GitLab.UI.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
-    <RootNamespace>GitLab.UI</RootNamespace>
-    <AssemblyName>GitLab.UI.Shared</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\GitLab\GitLab.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/shared/GitLab.UI/Commands/CredentialsCommand.cs b/src/shared/GitLab/UI/Commands/CredentialsCommand.cs
similarity index 100%
rename from src/shared/GitLab.UI/Commands/CredentialsCommand.cs
rename to src/shared/GitLab/UI/Commands/CredentialsCommand.cs
diff --git a/src/shared/GitLab.UI/ViewModels/CredentialsViewModel.cs b/src/shared/GitLab/UI/ViewModels/CredentialsViewModel.cs
similarity index 100%
rename from src/shared/GitLab.UI/ViewModels/CredentialsViewModel.cs
rename to src/shared/GitLab/UI/ViewModels/CredentialsViewModel.cs
diff --git a/src/shared/GitLab.UI.Avalonia/Views/CredentialsView.axaml b/src/shared/GitLab/UI/Views/CredentialsView.axaml
similarity index 97%
rename from src/shared/GitLab.UI.Avalonia/Views/CredentialsView.axaml
rename to src/shared/GitLab/UI/Views/CredentialsView.axaml
index b1c26d08d..f10da18b2 100644
--- a/src/shared/GitLab.UI.Avalonia/Views/CredentialsView.axaml
+++ b/src/shared/GitLab/UI/Views/CredentialsView.axaml
@@ -2,8 +2,7 @@
              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:controls="clr-namespace:GitLab.UI.Controls"
-             xmlns:vm="clr-namespace:GitLab.UI.ViewModels;assembly=GitLab.UI.Shared"
+             xmlns:vm="clr-namespace:GitLab.UI.ViewModels"
              xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
              x:Class="GitLab.UI.Views.CredentialsView"
diff --git a/src/shared/GitLab.UI.Avalonia/Views/CredentialsView.axaml.cs b/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
similarity index 100%
rename from src/shared/GitLab.UI.Avalonia/Views/CredentialsView.axaml.cs
rename to src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
diff --git a/src/windows/GitLab.UI.Windows/GitLab.UI.Windows.csproj b/src/windows/GitLab.UI.Windows/GitLab.UI.Windows.csproj
index dd94edf7a..f9f017c6d 100644
--- a/src/windows/GitLab.UI.Windows/GitLab.UI.Windows.csproj
+++ b/src/windows/GitLab.UI.Windows/GitLab.UI.Windows.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\shared\GitLab.UI\GitLab.UI.csproj" />
+    <ProjectReference Include="..\..\shared\GitLab\GitLab.csproj" />
     <ProjectReference Include="..\Core.UI.Windows\Core.UI.Windows.csproj" />
   </ItemGroup>
   
diff --git a/src/windows/GitLab.UI.Windows/Views/CredentialsView.xaml b/src/windows/GitLab.UI.Windows/Views/CredentialsView.xaml
index 02b4ca1c0..bfb71130b 100644
--- a/src/windows/GitLab.UI.Windows/Views/CredentialsView.xaml
+++ b/src/windows/GitLab.UI.Windows/Views/CredentialsView.xaml
@@ -3,7 +3,7 @@
              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:viewModels="clr-namespace:GitLab.UI.ViewModels;assembly=GitLab.UI.Shared"
+             xmlns:viewModels="clr-namespace:GitLab.UI.ViewModels;assembly=GitLab"
              xmlns:converters="clr-namespace:GitCredentialManager.UI.Windows.Converters;assembly=gcmcoreuiwpf"
              xmlns:sharedControls="clr-namespace:GitCredentialManager.UI.Windows.Controls;assembly=gcmcoreuiwpf"
              mc:Ignorable="d"