osx: include new Avalonia helpers on macOS

Author: mjcheetham

src/osx/Installer.Mac/Installer.Mac.csproj

@@ -13,6 +13,8 @@
 
   <ItemGroup>
     <ProjectReference Include="../../shared/Git-Credential-Manager/Git-Credential-Manager.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="../../shared/Atlassian.Bitbucket.UI/Atlassian.Bitbucket.UI.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="../../shared/GitHub.UI/GitHub.UI.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <!-- Implicit SDK targets import (so we can override the default targets below) -->

src/osx/Installer.Mac/layout.sh

@@ -21,6 +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"
 
 # Build parameters
 FRAMEWORK=net5.0
@@ -77,6 +79,20 @@ dotnet publish "$GCM_SRC" \
 	--runtime="$RUNTIME" \
 	--output="$(make_absolute "$PAYLOAD")" || exit 1
 
+echo "Publishing Bitbucket UI helper..."
+dotnet publish "$BITBUCKET_UI_SRC" \
+	--configuration="$CONFIGURATION" \
+	--framework="$FRAMEWORK" \
+	--runtime="$RUNTIME" \
+	--output="$(make_absolute "$PAYLOAD")" || exit 1
+
+echo "Publishing GitHub UI helper..."
+dotnet publish "$GITHUB_UI_SRC" \
+	--configuration="$CONFIGURATION" \
+	--framework="$FRAMEWORK" \
+	--runtime="$RUNTIME" \
+	--output="$(make_absolute "$PAYLOAD")" || exit 1
+
 # Collect symbols
 echo "Collecting managed symbols..."
 mv "$PAYLOAD"/*.pdb "$SYMBOLOUT" || exit 1

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

@@ -20,15 +20,20 @@
 
   <ItemGroup>
     <FilesToSign Include="
+      $(OutDir)\Atlassian.Bitbucket.dll;
+      $(OutDir)\Atlassian.Bitbucket.UI.dll;
       $(OutDir)\git-credential-manager-core.dll;
       $(OutDir)\GitHub.dll;
+      $(OutDir)\GitHub.UI.dll;
       $(OutDir)\Microsoft.AzureRepos.dll;
       $(OutDir)\Microsoft.Git.CredentialManager.dll;">
       <Authenticode>Microsoft400</Authenticode>
       <InProject>false</InProject>
     </FilesToSign>
     <MacFilesToSign Include="
-      $(OutDir)\git-credential-manager-core;">
+      $(OutDir)\git-credential-manager-core;
+      $(OutDir)\GitHub.UI;
+      $(OutDir)\Atlassian.Bitbucket.UI;">
       <InProject>false</InProject>
     </MacFilesToSign>
   </ItemGroup>