From b5fe9833da3da828d7c34942396739662c2161f1 Mon Sep 17 00:00:00 2001 From: Will Smythe Date: Thu, 15 Nov 2018 16:03:02 -0500 Subject: [PATCH 1/2] Updates for Azure Pipelines --- appveyor.yml | 39 --------- devops-tt.yml => azure-pipelines-common.yml | 10 +-- vsts-pr.yml => azure-pipelines-pr.yml | 6 +- vsts-rs.yml => azure-pipelines-signed.yml | 6 +- vsts-ci.yml => azure-pipelines.yml | 6 +- devops-ci.yml | 79 ------------------ devops-pr.yml | 56 ------------- devops-rs.yml | 91 --------------------- vsts-tt.yml | 85 ------------------- 9 files changed, 14 insertions(+), 364 deletions(-) delete mode 100644 appveyor.yml rename devops-tt.yml => azure-pipelines-common.yml (96%) rename vsts-pr.yml => azure-pipelines-pr.yml (96%) rename vsts-rs.yml => azure-pipelines-signed.yml (97%) rename vsts-ci.yml => azure-pipelines.yml (97%) delete mode 100644 devops-ci.yml delete mode 100644 devops-pr.yml delete mode 100644 devops-rs.yml delete mode 100644 vsts-tt.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 9d1a39b31..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: "{build}" - -image: - - Visual Studio 2017 - -configuration: - - Release - -platform: Any CPU - -before_build: - - nuget restore - -build: - parallel: true - verbosity: minimal - -build_script: - - msbuild "GitCredentialManager.sln" /bl:GitCredentialManager.binlog /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /consoleloggerparameters:Verbosity=minimal /maxcpucount /nodeReuse:false /target:"Build" /property:Configuration="%configuration%";Platform="%platform%" - -cache: - - packages -> **\packages.config - -matrix: - fast_finish: true - -test: - assemblies: - - '**\*.Test.dll' - -artifacts: - - path: GitCredentialManager.binlog - name: MSBuild Log - - path: Deploy\*.* - name: Build Results - type: zip - -on_failure: - - appveyor PushArtifact GitCredentialManager.binlog diff --git a/devops-tt.yml b/azure-pipelines-common.yml similarity index 96% rename from devops-tt.yml rename to azure-pipelines-common.yml index 5189fa0de..cddc10eab 100644 --- a/devops-tt.yml +++ b/azure-pipelines-common.yml @@ -27,17 +27,17 @@ # Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts parameters: - QueueName: '' + PoolName: '' CoreBuild: [] MicrobuildSetup: [] MicrobuildClean: [] NugetCommand: [] PublishArtifacts: [] -phases: - - phase: Build - queue: - name: ${{ parameters.QueueName }} +jobs: + - job: Build + pool: + vmImage: ${{ parameters.PoolName }} demands: - msbuild - visualstudio diff --git a/vsts-pr.yml b/azure-pipelines-pr.yml similarity index 96% rename from vsts-pr.yml rename to azure-pipelines-pr.yml index 9b48f1f1b..c78c04350 100644 --- a/vsts-pr.yml +++ b/azure-pipelines-pr.yml @@ -27,10 +27,10 @@ # Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts # https://microsoft-git-tools.visualstudio.com/Git-Credential-Manager-for-Windows -phases: - - template: vsts-tt.yml +jobs: + - template: azure-pipelines-common.yml parameters: - QueueName: 'Hosted VS2017' + PoolName: 'vs2017-win2016' CoreBuild: - task: MSBuild@1 diff --git a/vsts-rs.yml b/azure-pipelines-signed.yml similarity index 97% rename from vsts-rs.yml rename to azure-pipelines-signed.yml index 3e7a9e387..e329ef85c 100644 --- a/vsts-rs.yml +++ b/azure-pipelines-signed.yml @@ -26,10 +26,10 @@ # # Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts -phases: - - template: vsts-tt.yml +jobs: + - template: azure-pipelines-common.yml parameters: - QueueName: 'VSEng-MicroBuildVS2017' + PoolName: 'VSEng-MicroBuildVS2017' CoreBuild: - task: MSBuild@1 diff --git a/vsts-ci.yml b/azure-pipelines.yml similarity index 97% rename from vsts-ci.yml rename to azure-pipelines.yml index b1aaa3c39..1d2396eb6 100644 --- a/vsts-ci.yml +++ b/azure-pipelines.yml @@ -27,10 +27,10 @@ # Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts # https://microsoft-git-tools.visualstudio.com/Git-Credential-Manager-for-Windows -phases: - - template: vsts-tt.yml +jobs: + - template: azure-pipelines-common.yml parameters: - QueueName: 'Hosted VS2017' + PoolName: 'vs2017-win2016' CoreBuild: - task: MSBuild@1 diff --git a/devops-ci.yml b/devops-ci.yml deleted file mode 100644 index df0d3c845..000000000 --- a/devops-ci.yml +++ /dev/null @@ -1,79 +0,0 @@ -# ** Git Credential Manager for Windows ** -# -# Copyright (c) Microsoft Corporation -# All rights reserved. -# -# MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the """"Software""""), to deal -# in the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -# the Software, and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." -# -# == Continuous Integration Pipeline == -# -# Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts -# https://microsoft-git-tools.visualstudio.com/Git-Credential-Manager-for-Windows - -phases: - - template: devops-tt.yml - parameters: - QueueName: 'Hosted VS2017' - - CoreBuild: - - task: MSBuild@1 - displayName: 'Core Build' - inputs: - solution: 'Installer/Installer.proj' - msbuildArguments: '/nologo /verbosity:$(Build.Verbosity) /binaryLogger:$(Build.SourcesDirectory)/$(build.buildNumber).binlog' - platform: '$(Build.Platform)' - configuration: '$(Build.Configuration)' - maximumCpuCount: false - msbuildArchitecture: '$(Build.Architecture)' - - MicrobuildSetup: [] - MicrobuildClean: [] - - NugetCommand: - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - restoreSolution: 'GitCredentialManager.sln' - verbosityRestore: 'quiet' - - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - command: custom - arguments: restore "$(Build.SourcesDirectory)\Installer\packages.config" -PackagesDirectory "$(Build.SourcesDirectory)\packages" -SolutionDirectory "$(Build.SourcesDirectory)" -Verbosity Quiet - - PublishArtifacts: - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: Binary Log' - continueOnError: true - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - pathtoPublish: '$(Build.SourcesDirectory)\$(build.buildNumber).binlog' - artifactName: '$(build.buildNumber).binlog' - publishLocation: Container - - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: Binaries' - continueOnError: true - condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) - inputs: - pathtoPublish: '$(Build.SourcesDirectory)\Deploy\' - artifactName: '$(Build.BuildNumber).output' - publishLocation: Container diff --git a/devops-pr.yml b/devops-pr.yml deleted file mode 100644 index e8476a367..000000000 --- a/devops-pr.yml +++ /dev/null @@ -1,56 +0,0 @@ -# ** Git Credential Manager for Windows ** -# -# Copyright (c) Microsoft Corporation -# All rights reserved. -# -# MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the """"Software""""), to deal -# in the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -# the Software, and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." -# -# == Pull Request Validtion Pipeline == -# -# Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts -# https://dev.azure.com/microsoft-git-tools/Git-Credential-Manager-for-Windows - -phases: - - template: devops-tt.yml - parameters: - QueueName: 'Hosted VS2017' - - CoreBuild: - - task: MSBuild@1 - displayName: 'Core Build' - inputs: - solution: "GitCredentialManager.sln" - msbuildArguments: /nologo /verbosity:$(Build.Verbosity) "/binaryLogger:$(Build.SourcesDirectory)/$(build.buildNumber).binlog" - platform: '$(Build.Platform)' - configuration: '$(Build.Configuration)' - maximumCpuCount: false - msbuildArchitecture: '$(Build.Architecture)' - - MicrobuildSetup: [] - MicrobuildClean: [] - - NugetCommand: - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - restoreSolution: 'GitCredentialManager.sln' - verbosityRestore: 'quiet' - - PublishArtifacts: [] diff --git a/devops-rs.yml b/devops-rs.yml deleted file mode 100644 index c1086db79..000000000 --- a/devops-rs.yml +++ /dev/null @@ -1,91 +0,0 @@ -# ** Git Credential Manager for Windows ** -# -# Copyright (c) Microsoft Corporation -# All rights reserved. -# -# MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the """"Software""""), to deal -# in the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -# the Software, and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." -# -# == RealSign and Release Pipeline == -# -# Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts - -phases: - - template: devops-tt.yml - parameters: - QueueName: 'VSEng-MicroBuildVS2017' - - CoreBuild: - - task: MSBuild@1 - displayName: 'Core Build' - inputs: - solution: 'Installer/Installer.proj' - msbuildArguments: '/nologo /verbosity:$(Build.Verbosity) "/binaryLogger:$(Build.SourcesDirectory)/$(build.buildNumber).binlog"' - platform: '$(Build.Platform)' - configuration: '$(Build.Configuration)' - maximumCpuCount: false - msbuildArchitecture: '$(Build.Architecture)' - - MicrobuildSetup: - - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1 - displayName: Setup MicroBuild Signing - condition: and(succeeded(), or(eq(variables['signType'],'real'), eq(variables['signType'],'test'))) - continueOnError: true - inputs: - feedSource: https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json - signType: '$(SignType)' - zipSources: true - - MicrobuildClean: - - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1 - displayName: MicroBuild Cleanup - condition: or(eq(variables['signType'],'real'), eq(variables['signType'],'test')) - continueOnError: true - - NugetCommand: - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - restoreSolution: 'GitCredentialManager.sln' - verbosityRestore: 'quiet' - - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - command: custom - arguments: restore "$(Build.SourcesDirectory)\Installer\packages.config" -PackagesDirectory "$(Build.SourcesDirectory)\packages" -SolutionDirectory "$(Build.SourcesDirectory)" -Verbosity Quiet - - PublishArtifacts: - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: Binary Log' - continueOnError: true - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - pathtoPublish: $(Build.SourcesDirectory)\$(build.buildNumber).binlog - artifactName: $(build.buildNumber).binlog - publishLocation: Container - - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: Binaries' - continueOnError: true - condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) - inputs: - pathtoPublish: $(Build.SourcesDirectory)\Deploy\ - artifactName: $(Build.BuildNumber).output - publishLocation: Container diff --git a/vsts-tt.yml b/vsts-tt.yml deleted file mode 100644 index 5189fa0de..000000000 --- a/vsts-tt.yml +++ /dev/null @@ -1,85 +0,0 @@ -# ** Git Credential Manager for Windows ** -# -# Copyright (c) Microsoft Corporation -# All rights reserved. -# -# MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the """"Software""""), to deal -# in the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -# the Software, and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." -# -# == Pipeline Template == -# -# Learn more at https://docs.microsoft.com/en-us/vsts/pipelines/get-started-yaml?view=vsts&tabs=gitvsts - -parameters: - QueueName: '' - CoreBuild: [] - MicrobuildSetup: [] - MicrobuildClean: [] - NugetCommand: [] - PublishArtifacts: [] - -phases: - - phase: Build - queue: - name: ${{ parameters.QueueName }} - demands: - - msbuild - - visualstudio - - vstest - - steps: - - task: NuGetToolInstaller@0 - displayName: 'Use NuGet 4.4.0' - inputs: - versionSpec: 4.4.0 - - - ${{ parameters.NugetCommand }} - - - ${{ parameters.MicrobuildSetup }} - - - ${{ parameters.CoreBuild }} - - - task: VSTest@2 - displayName: 'Execute Tests (Xunit)' - inputs: - testAssemblyVer2: | - **\*Test.dll - !**\xunit.*.dll - !**\obj\** - searchFolder: '$(Build.SourcesDirectory)' - runInParallel: true - runTestsInIsolation: true - codeCoverageEnabled: true - platform: '$(Build.Platform)' - configuration: '$(Build.Configuration)' - - - ${{ parameters.PublishArtifacts }} - - - task: DeleteFiles@1 - displayName: 'Delete Artifacts from Agent' - inputs: - sourceFolder: '$(Build.SourcesDirectory)' - contents: | - *.binlog - Deploy\*.* - **\bin\**\*.* - **\obj\**\*.* - - - ${{ parameters.MicrobuildClean }} - \ No newline at end of file From 860633bdb4c57280e77c3dbd5332381949f1cf30 Mon Sep 17 00:00:00 2001 From: Will Smythe Date: Thu, 15 Nov 2018 16:23:48 -0500 Subject: [PATCH 2/2] Add build badge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index edb698ec3..4b7ddbb72 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # Git Credential Manager for Windows +[![Build Status](https://dev.azure.com/ms/Git-Credential-Manager-for-Windows/_apis/build/status/Microsoft.Git-Credential-Manager-for-Windows)](https://dev.azure.com/ms/Git-Credential-Manager-for-Windows/_build/latest?definitionId=9) [![GitHub Release](https://img.shields.io/github/release/microsoft/git-credential-manager-for-windows.svg?style=flat-square)](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases) -[![Build status](https://img.shields.io/appveyor/ci/whoisj/git-credential-manager-for-windows.svg?style=flat-square)](https://ci.appveyor.com/project/whoisj/git-credential-manager-for-windows/branch/master) [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/11371.svg?style=flat-square)](https://scan.coverity.com/projects/git-credential-manager-for-windows) [![GitHub Downloads](https://img.shields.io/github/downloads/Microsoft/Git-Credential-Manager-for-Windows/total.svg?style=flat-square)](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases) + [![@MicrosoftGit on Twitter](https://img.shields.io/twitter/follow/microsoftgit.svg?style=social&label=Follow%20%40microsoftgit)](https://twitter.com/microsoftgit) * * *