Skip to content

Commit 9ffdc5e

Browse files
authored
Merge pull request #101 from mjcheetham/github-oauth-ui
Support OAuth based authentication on GitHub; include a UI refresh
2 parents 0b0752d + 5f9d449 commit 9ffdc5e

File tree

136 files changed

+4140
-3871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+4140
-3871
lines changed
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
steps:
2-
- task: DotNetCoreInstaller@0
3-
displayName: Install .NET Core SDK 2.2.100
4-
inputs:
5-
packageType: sdk
6-
version: '2.2.100'
2+
- task: UseDotNet@2
3+
displayName: Use .NET Core SDK 3.1.x
4+
inputs:
5+
packageType: sdk
6+
version: 3.1.x
77

8-
- task: DotNetCoreCLI@2
9-
displayName: Compile common code and macOS Helpers
10-
inputs:
11-
command: build
12-
projects: 'Git-Credential-Manager.sln'
13-
arguments: '--configuration=Mac$(configuration)'
8+
- task: DotNetCoreCLI@2
9+
displayName: Compile common code and macOS Helpers
10+
inputs:
11+
command: build
12+
projects: 'Git-Credential-Manager.sln'
13+
arguments: '--configuration=Mac$(configuration)'
1414

15-
- task: DotNetCoreCLI@2
16-
displayName: Run common unit tests
17-
inputs:
18-
command: test
19-
projects: 'Git-Credential-Manager.sln'
20-
arguments: '--configuration=Mac$(configuration)'
21-
publishTestResults: true
22-
testRunTitle: 'Unit tests - common (macOS)'
15+
- task: DotNetCoreCLI@2
16+
displayName: Run common unit tests
17+
inputs:
18+
command: test
19+
projects: 'Git-Credential-Manager.sln'
20+
arguments: '--configuration=Mac$(configuration)'
21+
publishTestResults: true
22+
testRunTitle: 'Unit tests (macOS)'

.azure-pipelines/templates/osx/pack.signed/step3-pack.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ steps:
66
artifactName: 'tmp.macpayload_signed'
77
downloadPath: '$(Build.StagingDirectory)/payload'
88

9-
- task: DotNetCoreInstaller@0
10-
displayName: Install .NET Core SDK 2.2.100
9+
- task: UseDotNet@2
10+
displayName: Use .NET Core SDK 3.1.x
1111
inputs:
1212
packageType: sdk
13-
version: '2.2.100'
13+
version: 3.1.x
1414

1515
- script: dotnet tool install --global nbgv
1616
displayName: Install Nerdbank.GitVersioning tool
Lines changed: 24 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,29 @@
11
steps:
2-
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
3-
displayName: Install signing plugin
4-
condition: and(succeeded(), eq(variables['SignType'], 'real'))
5-
inputs:
6-
signType: '$(SignType)'
2+
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
3+
displayName: Install signing plugin
4+
condition: and(succeeded(), eq(variables['SignType'], 'real'))
5+
inputs:
6+
signType: '$(SignType)'
77

8-
- task: DotNetCoreInstaller@0
9-
displayName: Install .NET Core SDK 2.2.100
10-
inputs:
11-
packageType: sdk
12-
version: '2.2.100'
8+
- task: UseDotNet@2
9+
displayName: Use .NET Core SDK 3.1.x
10+
inputs:
11+
packageType: sdk
12+
version: 3.1.x
1313

14-
- task: NuGetToolInstaller@0
15-
displayName: Install NuGet tool >=4.3.0
16-
inputs:
17-
versionSpec: '>=4.3.0'
14+
- task: DotNetCoreCLI@2
15+
displayName: Compile common code and Windows Helpers
16+
inputs:
17+
command: build
18+
projects: 'Git-Credential-Manager.sln'
19+
arguments: '--configuration=Windows$(configuration)'
1820

19-
- task: NuGetCommand@2
20-
displayName: Restore packages
21-
inputs:
22-
command: restore
23-
restoreSolution: 'Git-Credential-Manager.sln'
24-
configuration: 'Windows$(configuration)'
25-
26-
- task: MSBuild@1
27-
displayName: Compile common code and Windows helpers
28-
inputs:
29-
solution: 'Git-Credential-Manager.sln'
30-
configuration: 'Windows$(configuration)'
31-
32-
- task: VSTest@2
33-
displayName: Run common unit tests
34-
inputs:
35-
testAssemblyVer2: |
36-
out\shared\*.Tests\bin\**\*.Tests.dll
37-
configuration: 'Windows$(configuration)'
38-
otherConsoleOptions: '/Framework:.NETCoreApp,Version=2.1'
39-
testRunTitle: 'Unit tests - common (Windows)'
40-
41-
# Uncomment once Windows helpers have unit tests
42-
# - task: VSTest@2
43-
# displayName: Run helpers unit tests
44-
# inputs:
45-
# testAssemblyVer2: |
46-
# out\windows\*.Tests\bin\**\*.Tests.dll
47-
# configuration: 'Windows$(configuration)'
48-
# otherConsoleOptions: '/Framework:.NETFramework,Version=v4.6.1'
49-
# testRunTitle: 'Unit tests - helpers (Windows)'
21+
- task: DotNetCoreCLI@2
22+
displayName: Run common unit tests
23+
inputs:
24+
command: test
25+
projects: 'Git-Credential-Manager.sln'
26+
arguments: '--configuration=Mac$(configuration)'
27+
publishTestResults: true
28+
testRunTitle: 'Unit tests (Windows)'
5029

.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-core.dll",
13+
"program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp3.1/git-credential-manager-core.dll",
1414
"args": ["get"],
1515
"cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
1616
"console": "integratedTerminal",

0 commit comments

Comments
 (0)