Merge pull request #274 from mjcheetham/drop-osx-helper

Drop the native macOS ADAL-based Microsoft Authentication component

Git-Credential-Manager.sln

@@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Tests", "src\shared\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "osx", "osx", "{3D279E2D-E011-45CF-8EA8-3D71D1300443}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Authentication.Helper.Mac", "src\osx\Microsoft.Authentication.Helper.Mac\Microsoft.Authentication.Helper.Mac.csproj", "{206430B1-CEED-4C84-8D49-D0A399632202}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Mac", "src\osx\Installer.Mac\Installer.Mac.csproj", "{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Windows", "src\windows\Installer.Windows\Installer.Windows.csproj", "{85903170-9E52-4B53-A6E4-3F416F684FAE}"
@@ -215,16 +213,6 @@ Global
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD}.LinuxDebug|Any CPU.Build.0 = Debug|Any CPU
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD}.LinuxRelease|Any CPU.Build.0 = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacDebug|Any CPU.Build.0 = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacRelease|Any CPU.Build.0 = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}.MacDebug|Any CPU.Build.0 = Debug|Any CPU
@@ -343,7 +331,6 @@ Global
 		{D5277A0E-997E-453A-8CB9-4EFCC8B16A29} = {A7FC1234-95E3-4496-B5F7-4306F41E6A0E}
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
 		{3D279E2D-E011-45CF-8EA8-3D71D1300443} = {A7FC1234-95E3-4496-B5F7-4306F41E6A0E}
-		{206430B1-CEED-4C84-8D49-D0A399632202} = {3D279E2D-E011-45CF-8EA8-3D71D1300443}
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715} = {3D279E2D-E011-45CF-8EA8-3D71D1300443}
 		{85903170-9E52-4B53-A6E4-3F416F684FAE} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}

docs/configuration.md

@@ -235,8 +235,6 @@ Specify which authentication flow should be used when performing Microsoft authe
 
 Defaults to the value `auto`.
 
-**Note:** This setting will be ignored if a native authentication helper is configured and available. See [`credential.msauthHelper`](#credentialmsauthhelper) for more information.
-
 Value|Credential Store
 -|-
 `auto` _(default)_|Select the best option depending on the current environment and platform.
@@ -251,21 +249,3 @@ git config --global credential.msauthFlow devicecode
 ```
 
 **Also see: [GCM_MSAUTH_FLOW](environment.md#GCM_MSAUTH_FLOW)**
-
----
-
-### credential.msauthHelper
-
-Full path to an external 'helper' tool to which Microsoft authentication should be delegated.
-
-On macOS this defaults to the included native `Microsoft.Authentication.Helper` tool. On all other platforms this is not set.
-
-**Note:** If a helper is set and available then all Microsoft authentication will be delegated to this helper and the [`credential.msauthFlow`](#credentialmsauthflow) setting will be ignored. Setting the value to the empty string (`""`) will unset any default helper.
-
-#### Example
-
-```shell
-git config --global credential.msauthHelper "C:\path\to\helper.exe"
-```
-
-**Also see: [GCM_MSAUTH_HELPER](environment.md#GCM_MSAUTH_HELPER)**

docs/environment.md

@@ -382,8 +382,6 @@ Specify which authentication flow should be used when performing Microsoft authe
 
 Defaults to the value `auto`.
 
-**Note:** This setting will be ignored if a native authentication helper is configured and available. See [`GCM_MSAUTH_HELPER`](#gcm_msauth_helper) for more information.
-
 Value|Credential Store
 -|-
 `auto` _(default)_|Select the best option depending on the current environment and platform.
@@ -404,27 +402,3 @@ export GCM_MSAUTH_FLOW="devicecode"
 ```
 
 **Also see: [credential.msauthFlow](configuration.md#credentialmsauthflow)**
-
----
-
-### GCM_MSAUTH_HELPER
-
-Full path to an external 'helper' tool to which Microsoft authentication should be delegated.
-
-On macOS this defaults to the included native `Microsoft.Authentication.Helper` tool. On all other platforms this is not set.
-
-**Note:** If a helper is set and available then all Microsoft authentication will be delegated to this helper and the [`GCM_MSAUTH_FLOW`](#gcm_msauth_flow) setting will be ignored. Setting the value to the empty string (`""`) will unset any default helper.
-
-##### Windows
-
-```batch
-SET GCM_MSAUTH_HELPER="C:\path\to\helper.exe"
-```
-
-##### macOS/Linux
-
-```bash
-export GCM_MSAUTH_HELPER="/usr/local/bin/msauth-helper"
-```
-
-**Also see: [credential.msauthHelper](configuration.md#credentialmsauthhelper)**

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

@@ -12,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Microsoft.Authentication.Helper.Mac/Microsoft.Authentication.Helper.Mac.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="../../shared/Git-Credential-Manager/Git-Credential-Manager.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 

src/osx/Installer.Mac/layout.sh

@@ -20,7 +20,6 @@ ROOT="$( cd "$THISDIR"/../../.. ; pwd -P )"
 SRC="$ROOT/src"
 OUT="$ROOT/out"
 INSTALLER_SRC="$SRC/osx/Installer.Mac"
-MSAUTH_OUT="$OUT/osx/Microsoft.Authentication.Helper.Mac"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
 
 # Build parameters
@@ -57,12 +56,6 @@ if [ -z "$SYMBOLOUT" ]; then
     SYMBOLOUT="$PAYLOAD.sym"
 fi
 
-MSAUTH_BIN="$MSAUTH_OUT/bin/$CONFIGURATION/native"
-MSAUTH_SYM="$MSAUTH_OUT/bin/$CONFIGURATION/native.sym"
-if [ ! -d "$MSAUTH_BIN" ]; then
-	die "No native helper binaries found. Did you build?"
-fi
-
 # Cleanup any old payload directory
 if [ -d "$PAYLOAD" ]; then
     echo "Cleaning old payload directory '$PAYLOAD'..."
@@ -76,10 +69,6 @@ mkdir -p "$PAYLOAD" "$SYMBOLOUT"
 echo "Copying uninstall script..."
 cp "$INSTALLER_SRC/uninstall.sh" "$PAYLOAD" || exit 1
 
-# Copy native authentication helper executables
-echo "Copying native helpers..."
-cp -R "$MSAUTH_BIN/" "$PAYLOAD" || exit 1
-
 # Publish core application executables
 echo "Publishing core application..."
 dotnet publish "$GCM_SRC" \
@@ -91,8 +80,6 @@ dotnet publish "$GCM_SRC" \
 # Collect symbols
 echo "Collecting managed symbols..."
 mv "$PAYLOAD"/*.pdb "$SYMBOLOUT" || exit 1
-echo "Collecting native symbols..."
-cp -R "$MSAUTH_SYM/" "$SYMBOLOUT" || exit 1
 
 # Remove any unwanted .DS_Store files
 echo "Removing unnecessary files..."