Merge pull request #472 from mjcheetham/combined-ui

Combine WPF and Avalonia UI view models and commands

Author: mjcheetham

Git-Credential-Manager.sln

@@ -44,8 +44,8 @@ ROOT="$( cd "$THISDIR"/../../.. ; pwd -P )"
 SRC="$ROOT/src"
 OUT="$ROOT/out"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
-BITBUCKET_UI_SRC="$SRC/shared/Atlassian.Bitbucket.UI"
-GITHUB_UI_SRC="$SRC/shared/GitHub.UI"
+BITBUCKET_UI_SRC="$SRC/shared/Atlassian.Bitbucket.UI.Avalonia"
+GITHUB_UI_SRC="$SRC/shared/GitHub.UI.Avalonia"
 PROJ_OUT="$OUT/linux/Packaging.Linux"
 
 # Build parameters

src/linux/Packaging.Linux/build.sh

@@ -21,8 +21,8 @@ SRC="$ROOT/src"
 OUT="$ROOT/out"
 INSTALLER_SRC="$SRC/osx/Installer.Mac"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
-BITBUCKET_UI_SRC="$SRC/shared/Atlassian.Bitbucket.UI"
-GITHUB_UI_SRC="$SRC/shared/GitHub.UI"
+BITBUCKET_UI_SRC="$SRC/shared/Atlassian.Bitbucket.UI.Avalonia"
+GITHUB_UI_SRC="$SRC/shared/GitHub.UI.Avalonia"
 
 # Build parameters
 FRAMEWORK=net5.0

src/osx/Installer.Mac/layout.sh

@@ -22,9 +22,11 @@
     <FilesToSign Include="
       $(OutDir)\Atlassian.Bitbucket.dll;
       $(OutDir)\Atlassian.Bitbucket.UI.dll;
+      $(OutDir)\Atlassian.Bitbucket.UI.Shared.dll;
       $(OutDir)\git-credential-manager-core.dll;
       $(OutDir)\GitHub.dll;
       $(OutDir)\GitHub.UI.dll;
+      $(OutDir)\GitHub.UI.Shared.dll;
       $(OutDir)\Microsoft.AzureRepos.dll;
       $(OutDir)\Microsoft.Git.CredentialManager.dll;">
       <Authenticode>Microsoft400</Authenticode>

src/osx/SignFiles.Mac/SignFiles.Mac.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RuntimeIdentifiers>osx-x64;linux-x64</RuntimeIdentifiers>
+    <RootNamespace>Atlassian.Bitbucket.UI</RootNamespace>
+    <AssemblyName>Atlassian.Bitbucket.UI</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Atlassian.Bitbucket.UI\Atlassian.Bitbucket.UI.csproj" />
+    <ProjectReference Include="..\Microsoft.Git.CredentialManager.UI.Avalonia\Microsoft.Git.CredentialManager.UI.Avalonia.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Controls\TesterWindow.axaml.cs">
+      <DependentUpon>TesterWindow.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <AvaloniaResource Include="Assets\**" />
+  </ItemGroup>
+
+</Project>

src/shared/Atlassian.Bitbucket.UI/Assets/atlassian-logo.png renamed to src/shared/Atlassian.Bitbucket.UI.Avalonia/Assets/atlassian-logo.png

@@ -0,0 +1,19 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Atlassian.Bitbucket.UI.ViewModels;
+using Atlassian.Bitbucket.UI.Views;
+using Microsoft.Git.CredentialManager;
+using Microsoft.Git.CredentialManager.UI;
+
+namespace Atlassian.Bitbucket.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);
+        }
+    }
+}

src/shared/Atlassian.Bitbucket.UI.Avalonia/Atlassian.Bitbucket.UI.Avalonia.csproj

@@ -0,0 +1,19 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Atlassian.Bitbucket.UI.ViewModels;
+using Atlassian.Bitbucket.UI.Views;
+using Microsoft.Git.CredentialManager;
+using Microsoft.Git.CredentialManager.UI;
+
+namespace Atlassian.Bitbucket.UI.Commands
+{
+    public class OAuthCommandImpl : OAuthCommand
+    {
+        public OAuthCommandImpl(CommandContext context) : base(context) { }
+
+        protected override Task ShowAsync(OAuthViewModel viewModel, CancellationToken ct)
+        {
+            return AvaloniaUi.ShowViewAsync<OAuthView>(viewModel, GetParentHandle(), ct);
+        }
+    }
+}