Skip to content

Commit d097b41

Browse files
mjcheethammjcheetham
authored
Merge pull request #70 from mjcheetham/rename-exec
New Install 2/6: Rename main executable to GCM Core to make SxS easier
2 parents 1e69000 + d5d25f5 commit d097b41

File tree

10 files changed

+33
-31
lines changed

10 files changed

+33
-31
lines changed

‎.github/ISSUE_TEMPLATE/auth-problem.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88

99
**Which version of GCM Core are you using?**
1010

11-
From a terminal, run `git-credential-manager version` and paste the output.
11+
From a terminal, run `git-credential-manager-core version` and paste the output.
1212

1313
<!-- Ex:
1414
Git Credential Manager version 2.0.8-beta+e1f8492d04 (macOS, .NET Core 4.6.27129.04)

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp2.1/git-credential-manager.dll",
13+
"program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp2.1/git-credential-manager-core.dll",
1414
"args": ["get"],
1515
"cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
1616
"console": "integratedTerminal",

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To use GCM Core, you can download the [latest installer](https://github.com/Micr
4646

4747
### Git Credential Manager for Mac and Linux (Java-based GCM)
4848

49-
If you have an existing installation of the 'Java GCM' on macOS and you have installed this using Homebrew, this installation will be unlinked (`brew unlink git-credential-manager`) when GCM Core is installed. Additionally any symlinks or files previously located at `/usr/local/bin/git-credential-manager` will be replaced with a GCM Core symlink.
49+
If you have an existing installation of the 'Java GCM' on macOS and you have installed this using Homebrew, this installation will be unlinked (`brew unlink git-credential-manager`) when GCM Core is installed.
5050

5151
## How to use
5252

‎src/osx/Installer.Mac/scripts/configure-git.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88
PATH=""
99
eval $(/usr/libexec/path_helper -s)
1010

11-
git config --system credential.helper /usr/local/share/gcm-core/git-credential-manager
11+
git config --system credential.helper /usr/local/share/gcm-core/git-credential-manager-core
1212
git config --system credential.https://dev.azure.com.useHttpPath true
1313

1414
exit 0

‎src/osx/Installer.Mac/scripts/postinstall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
fi
2525

2626
# Create symlink to GCM in /usr/local/bin
27-
/bin/ln -Fs /usr/local/share/gcm-core/git-credential-manager /usr/local/bin/git-credential-manager
27+
/bin/ln -Fs /usr/local/share/gcm-core/git-credential-manager-core /usr/local/bin/git-credential-manager-core
2828

2929
# Set system gitconfig for the current user
3030
USER_ID="$(id -u "${USER}")"

‎src/osx/Installer.Mac/uninstall.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Unconfigure GCM
44
HELPER="$(git config --system credential.helper)"
5-
if [ "$HELPER" = "/usr/local/share/gcm-core/git-credential-manager" ]
5+
if [ "$HELPER" = "/usr/local/share/gcm-core/git-credential-manager-core" ]
66
then
77
echo "Resetting credential helper to 'osxkeychain'..."
88
sudo git config --system credential.helper osxkeychain
@@ -11,10 +11,10 @@ else
1111
fi
1212

1313
# Remove GCM symlink
14-
if [ -L /usr/local/bin/git-credential-manager ]
14+
if [ -L /usr/local/bin/git-credential-manager-core ]
1515
then
1616
echo "Deleting GCM symlink..."
17-
rm /usr/local/bin/git-credential-manager
17+
rm /usr/local/bin/git-credential-manager-core
1818
else
1919
echo "No GCM symlink found."
2020
fi

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020

2121
<ItemGroup>
2222
<FilesToSign Include="
23-
$(OutDir)\git-credential-manager.dll;
23+
$(OutDir)\git-credential-manager-core.dll;
2424
$(OutDir)\GitHub.dll;
2525
$(OutDir)\Microsoft.AzureRepos.dll;
2626
$(OutDir)\Microsoft.Git.CredentialManager.dll;">
2727
<Authenticode>Microsoft</Authenticode>
2828
<InProject>false</InProject>
2929
</FilesToSign>
3030
<MacFilesToSign Include="
31-
$(OutDir)\git-credential-manager;
31+
$(OutDir)\git-credential-manager-core;
3232
$(OutDir)\Microsoft.Authentication.Helper;">
3333
<InProject>false</InProject>
3434
</MacFilesToSign>

‎src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
66
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netcoreapp2.1;net461</TargetFrameworks>
77
<RuntimeIdentifiers>win-x64;osx-x64</RuntimeIdentifiers>
8-
<AssemblyName>git-credential-manager</AssemblyName>
8+
<AssemblyName>git-credential-manager-core</AssemblyName>
99
<RootNamespace>Microsoft.Git.CredentialManager</RootNamespace>
1010
<ApplicationIcon>$(RepoAssetsPath)gcmicon.ico</ApplicationIcon>
1111
<IsTestProject>false</IsTestProject>
1212
<LangVersion>latest</LangVersion>
13+
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
1314
</PropertyGroup>
1415

1516
<ItemGroup>

‎src/windows/Installer.Windows/Setup.iss‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#error Payload directory path property 'PayloadDir' must be specified
1212
#endif
1313

14-
#ifnexist PayloadDir + "\git-credential-manager.exe"
14+
#ifnexist PayloadDir + "\git-credential-manager-core.exe"
1515
#error Payload files are missing
1616
#endif
1717

1818
; Define core properties
19-
#define GcmName "Git Credential Manager"
19+
#define GcmName "Git Credential Manager Core"
2020
#define GcmPublisher "Microsoft Corporation"
2121
#define GcmPublisherUrl "https://www.microsoft.com"
2222
#define GcmCopyright "Copyright (c) Microsoft 2019"
@@ -30,7 +30,7 @@
3030
#define VerMinor
3131
#define VerBuild
3232
#define VerRevision
33-
#expr ParseVersion(PayloadDir + "\git-credential-manager.exe", VerMajor, VerMinor, VerBuild, VerRevision)
33+
#expr ParseVersion(PayloadDir + "\git-credential-manager-core.exe", VerMajor, VerMinor, VerBuild, VerRevision)
3434
#define GcmVersion str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild) + "." + str(VerRevision)
3535

3636
[Setup]
@@ -49,37 +49,38 @@ VersionInfoVersion={#GcmVersion}
4949
LicenseFile={#GcmRepoRoot}\LICENSE
5050
OutputBaseFilename=gcmcore-windows-{#GcmVersion}
5151
DefaultDirName={pf}\{#GcmName}
52-
DisableReadyPage=yes
5352
Compression=lzma2
5453
SolidCompression=yes
5554
MinVersion=6.1.7600
5655
DisableDirPage=yes
5756
ArchitecturesInstallIn64BitMode=x64
58-
UninstallDisplayIcon={app}\git-credential-manager.exe
57+
UninstallDisplayIcon={app}\git-credential-manager-core.exe
5958
SetupIconFile={#GcmAssets}\gcmicon.ico
6059
WizardImageFile={#GcmAssets}\gcmicon128.bmp
6160
WizardSmallImageFile={#GcmAssets}\gcmicon64.bmp
61+
WizardStyle=modern
6262
WizardImageStretch=no
6363
WindowResizable=no
64+
ChangesEnvironment=yes
6465

6566
[Languages]
66-
Name: "english"; MessagesFile: "compiler:Default.isl";
67+
Name: english; MessagesFile: "compiler:Default.isl";
6768

6869
[Types]
69-
Name: "full"; Description: "Full installation"; Flags: iscustom;
70+
Name: full; Description: "Full installation"; Flags: iscustom;
7071

7172
[Components]
7273
; TODO
7374

7475
[Files]
75-
Source: "{#PayloadDir}\git-credential-manager.exe"; DestDir: "{app}"; Flags: ignoreversion
76-
Source: "{#PayloadDir}\GitHub.dll"; DestDir: "{app}"; Flags: ignoreversion
77-
Source: "{#PayloadDir}\GitHub.UI.dll"; DestDir: "{app}"; Flags: ignoreversion
78-
Source: "{#PayloadDir}\GitHub.Authentication.Helper.exe"; DestDir: "{app}"; Flags: ignoreversion
79-
Source: "{#PayloadDir}\git2-572e4d8.dll"; DestDir: "{app}"; Flags: ignoreversion
80-
Source: "{#PayloadDir}\Microsoft.Authentication.Helper.exe"; DestDir: "{app}"; Flags: ignoreversion
81-
Source: "{#PayloadDir}\Microsoft.Authentication.Helper.exe.config"; DestDir: "{app}"; Flags: ignoreversion
82-
Source: "{#PayloadDir}\Microsoft.AzureRepos.dll"; DestDir: "{app}"; Flags: ignoreversion
83-
Source: "{#PayloadDir}\Microsoft.Git.CredentialManager.dll"; DestDir: "{app}"; Flags: ignoreversion
84-
Source: "{#PayloadDir}\Microsoft.Identity.Client.dll"; DestDir: "{app}"; Flags: ignoreversion
76+
Source: "{#PayloadDir}\git-credential-manager-core.exe"; DestDir: "{app}"; Flags: ignoreversion
77+
Source: "{#PayloadDir}\GitHub.dll"; DestDir: "{app}"; Flags: ignoreversion
78+
Source: "{#PayloadDir}\GitHub.UI.dll"; DestDir: "{app}"; Flags: ignoreversion
79+
Source: "{#PayloadDir}\GitHub.Authentication.Helper.exe"; DestDir: "{app}"; Flags: ignoreversion
80+
Source: "{#PayloadDir}\git2-572e4d8.dll"; DestDir: "{app}"; Flags: ignoreversion
81+
Source: "{#PayloadDir}\Microsoft.Authentication.Helper.exe"; DestDir: "{app}"; Flags: ignoreversion
82+
Source: "{#PayloadDir}\Microsoft.Authentication.Helper.exe.config"; DestDir: "{app}"; Flags: ignoreversion
83+
Source: "{#PayloadDir}\Microsoft.AzureRepos.dll"; DestDir: "{app}"; Flags: ignoreversion
84+
Source: "{#PayloadDir}\Microsoft.Git.CredentialManager.dll"; DestDir: "{app}"; Flags: ignoreversion
85+
Source: "{#PayloadDir}\Microsoft.Identity.Client.dll"; DestDir: "{app}"; Flags: ignoreversion
8586
Source: "{#PayloadDir}\Microsoft.Identity.Client.Extensions.Msal.dll"; DestDir: "{app}"; Flags: ignoreversion

‎src/windows/Payload.Windows/Payload.Windows.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ProjectReference Include="..\GitHub.Authentication.Helper.Windows\GitHub.Authentication.Helper.Windows.csproj" />
1414
<ProjectReference Include="..\Microsoft.Authentication.Helper.Windows\Microsoft.Authentication.Helper.Windows.csproj" />
1515
</ItemGroup>
16-
16+
1717
<ItemGroup>
1818
<PackageReference Include="MicroBuild.Core" Version="0.2.0">
1919
<PrivateAssets>all</PrivateAssets>
@@ -22,7 +22,7 @@
2222

2323
<ItemGroup>
2424
<FilesToSign Include="
25-
$(OutDir)git-credential-manager.exe;
25+
$(OutDir)git-credential-manager-core.exe;
2626
$(OutDir)GitHub.dll;
2727
$(OutDir)GitHub.UI.dll;
2828
$(OutDir)GitHub.Authentication.Helper.exe;
@@ -51,7 +51,7 @@
5151

5252
<!-- We don't want to produce a binary with this project -->
5353
<Target Name="CoreCompile" />
54-
54+
5555
<!-- We only want to copy the dependent projects' outputs; no binary is produced for this project -->
5656
<Target Name="CopyFilesToOutputDirectory"
5757
DependsOnTargets="

0 commit comments

Comments
 (0)