Skip to content

Commit

Permalink
Merge pull request #101 from mjcheetham/github-oauth-ui
Browse files Browse the repository at this point in the history
Support OAuth based authentication on GitHub; include a UI refresh
  • Loading branch information
mjcheetham authored Apr 22, 2020
2 parents 0b0752d + 5f9d449 commit 9ffdc5e
Show file tree
Hide file tree
Showing 136 changed files with 4,140 additions and 3,871 deletions.
38 changes: 19 additions & 19 deletions .azure-pipelines/templates/osx/compile.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
steps:
- task: DotNetCoreInstaller@0
displayName: Install .NET Core SDK 2.2.100
inputs:
packageType: sdk
version: '2.2.100'
- task: UseDotNet@2
displayName: Use .NET Core SDK 3.1.x
inputs:
packageType: sdk
version: 3.1.x

- task: DotNetCoreCLI@2
displayName: Compile common code and macOS Helpers
inputs:
command: build
projects: 'Git-Credential-Manager.sln'
arguments: '--configuration=Mac$(configuration)'
- task: DotNetCoreCLI@2
displayName: Compile common code and macOS Helpers
inputs:
command: build
projects: 'Git-Credential-Manager.sln'
arguments: '--configuration=Mac$(configuration)'

- task: DotNetCoreCLI@2
displayName: Run common unit tests
inputs:
command: test
projects: 'Git-Credential-Manager.sln'
arguments: '--configuration=Mac$(configuration)'
publishTestResults: true
testRunTitle: 'Unit tests - common (macOS)'
- task: DotNetCoreCLI@2
displayName: Run common unit tests
inputs:
command: test
projects: 'Git-Credential-Manager.sln'
arguments: '--configuration=Mac$(configuration)'
publishTestResults: true
testRunTitle: 'Unit tests (macOS)'
6 changes: 3 additions & 3 deletions .azure-pipelines/templates/osx/pack.signed/step3-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ steps:
artifactName: 'tmp.macpayload_signed'
downloadPath: '$(Build.StagingDirectory)/payload'

- task: DotNetCoreInstaller@0
displayName: Install .NET Core SDK 2.2.100
- task: UseDotNet@2
displayName: Use .NET Core SDK 3.1.x
inputs:
packageType: sdk
version: '2.2.100'
version: 3.1.x

- script: dotnet tool install --global nbgv
displayName: Install Nerdbank.GitVersioning tool
Expand Down
69 changes: 24 additions & 45 deletions .azure-pipelines/templates/windows/compile.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,29 @@
steps:
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
displayName: Install signing plugin
condition: and(succeeded(), eq(variables['SignType'], 'real'))
inputs:
signType: '$(SignType)'
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
displayName: Install signing plugin
condition: and(succeeded(), eq(variables['SignType'], 'real'))
inputs:
signType: '$(SignType)'

- task: DotNetCoreInstaller@0
displayName: Install .NET Core SDK 2.2.100
inputs:
packageType: sdk
version: '2.2.100'
- task: UseDotNet@2
displayName: Use .NET Core SDK 3.1.x
inputs:
packageType: sdk
version: 3.1.x

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

- task: NuGetCommand@2
displayName: Restore packages
inputs:
command: restore
restoreSolution: 'Git-Credential-Manager.sln'
configuration: 'Windows$(configuration)'

- task: MSBuild@1
displayName: Compile common code and Windows helpers
inputs:
solution: 'Git-Credential-Manager.sln'
configuration: 'Windows$(configuration)'

- task: VSTest@2
displayName: Run common unit tests
inputs:
testAssemblyVer2: |
out\shared\*.Tests\bin\**\*.Tests.dll
configuration: 'Windows$(configuration)'
otherConsoleOptions: '/Framework:.NETCoreApp,Version=2.1'
testRunTitle: 'Unit tests - common (Windows)'

# Uncomment once Windows helpers have unit tests
# - task: VSTest@2
# displayName: Run helpers unit tests
# inputs:
# testAssemblyVer2: |
# out\windows\*.Tests\bin\**\*.Tests.dll
# configuration: 'Windows$(configuration)'
# otherConsoleOptions: '/Framework:.NETFramework,Version=v4.6.1'
# testRunTitle: 'Unit tests - helpers (Windows)'
- task: DotNetCoreCLI@2
displayName: Run common unit tests
inputs:
command: test
projects: 'Git-Credential-Manager.sln'
arguments: '--configuration=Mac$(configuration)'
publishTestResults: true
testRunTitle: 'Unit tests (Windows)'

2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp2.1/git-credential-manager-core.dll",
"program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp3.1/git-credential-manager-core.dll",
"args": ["get"],
"cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
"console": "integratedTerminal",
Expand Down
Loading

0 comments on commit 9ffdc5e

Please sign in to comment.