Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Git Credential Manager for Windows #377

Merged
merged 8 commits into from
Sep 8, 2021
22 changes: 3 additions & 19 deletions installer/install.iss
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,7 @@ const

// Git Credential Manager settings.
GCM_None = 1;
GCM_Classic = 2;
GCM_Core = 3;
GCM_Core = 2;

// Extra options
GP_FSCache = 1;
Expand Down Expand Up @@ -2265,32 +2264,22 @@ begin
// Git Credential Manager Core
RdbGitCredentialManager[GCM_Core]:=CreateRadioButton(GitCredentialManagerPage,'Git Credential Manager Core','<RED>(NEW!)</RED> Use the new, <A HREF=https://github.com/microsoft/Git-Credential-Manager-Core>cross-platform version of the Git Credential Manager</A>.'+#13+'See more information about the future of Git Credential Manager <A HREF=https://github.com/microsoft/Git-Credential-Manager-Core/blob/master/docs/faq.md#about-the-project>here</A>.',TabOrder,Top,Left);

// Git Credential Manager for Windows
RdbGitCredentialManager[GCM_Classic]:=CreateRadioButton(GitCredentialManagerPage,'Git Credential Manager','(DEPRECATED) The <A HREF=https://github.com/Microsoft/Git-Credential-Manager-for-Windows>Git Credential Manager for Windows</A> handles credentials e.g.'+#13+'for Azure DevOps and GitHub (requires .NET framework v4.5.1 or later).',TabOrder,Top,Left);

// No credential helper
RdbGitCredentialManager[GCM_None]:=CreateRadioButton(GitCredentialManagerPage,'None','Do not use a credential helper.',TabOrder,Top,Left);

// Restore the settings chosen during a previous install, if .NET 4.5.1
// or later is available.
if DetectNetFxVersion()<378675 then begin
RdbGitCredentialManager[GCM_Classic].Checked:=False;
RdbGitCredentialManager[GCM_Classic].Enabled:=False;
RdbGitCredentialManager[GCM_Core].Checked:=False;
RdbGitCredentialManager[GCM_Core].Enabled:=False;
end else begin
case ReplayChoice('Use Credential Manager','Core') of
'Disabled': RdbGitCredentialManager[GCM_None].Checked:=True;
'Enabled': RdbGitCredentialManager[GCM_Classic].Checked:=True;
'Enabled': RdbGitCredentialManager[GCM_Core].Checked:=True;
'Core': RdbGitCredentialManager[GCM_Core].Checked:=True;
else
RdbGitCredentialManager[GCM_Core].Checked:=True;
end;
// Auto-upgrade GCM to GCM Core in version v2.29.0
if RdbGitCredentialManager[GCM_Classic].Checked and ((PreviousGitForWindowsVersion='') or IsUpgrade('2.29.0')) then begin
RdbGitCredentialManager[GCM_Core].Checked:=True;
AddToSet(CustomPagesWithUnseenOptions,GitCredentialManagerPage.ID);
end;
end;

(*
Expand Down Expand Up @@ -3111,9 +3100,6 @@ begin
if RdbGitCredentialManager[GCM_None].checked then begin
GitSystemConfigSet('credential.helper',#0);
GitSystemConfigSet('credential.https://dev.azure.com.useHttpPath',#0);
end else if RdbGitCredentialManager[GCM_Classic].checked then begin
GitSystemConfigSet('credential.helper','manager');
GitSystemConfigSet('credential.https://dev.azure.com.useHttpPath',#0);
end else if RdbGitCredentialManager[GCM_Core].checked then begin
GitSystemConfigSet('credential.helper','manager-core');
GitSystemConfigSet('credential.https://dev.azure.com.useHttpPath','true');
Expand Down Expand Up @@ -3554,9 +3540,7 @@ begin

// Credential helper.
Data:='Disabled';
if RdbGitCredentialManager[GCM_Classic].Checked then begin
Data:='Enabled';
end else if RdbGitCredentialManager[GCM_Core].Checked then begin;
if RdbGitCredentialManager[GCM_Core].Checked then begin;
Data:='Core';
end;
RecordChoice(PreviousDataKey,'Use Credential Manager',Data);
Expand Down