From c82bbbd9ffe25d1a4fa5b21dbf168bd4ccd3928c Mon Sep 17 00:00:00 2001 From: Roman Kozachenko Date: Wed, 20 Feb 2019 18:09:12 +0300 Subject: [PATCH 1/5] Add Gitlink support --- src/progaudi.tarantool/progaudi.tarantool.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/progaudi.tarantool/progaudi.tarantool.csproj b/src/progaudi.tarantool/progaudi.tarantool.csproj index a568dcb2..08220075 100644 --- a/src/progaudi.tarantool/progaudi.tarantool.csproj +++ b/src/progaudi.tarantool/progaudi.tarantool.csproj @@ -28,6 +28,10 @@ + + runtime; build; native; contentfiles; analyzers + all + From 5f9e058b340f77bb218b327f66d0cedf7da2be1f Mon Sep 17 00:00:00 2001 From: Roman Kozachenko Date: Sat, 2 Mar 2019 21:16:16 +0300 Subject: [PATCH 2/5] Use Microsoft.SourceLink.GitHub instead of Gitlink --- src/progaudi.tarantool/progaudi.tarantool.csproj | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/progaudi.tarantool/progaudi.tarantool.csproj b/src/progaudi.tarantool/progaudi.tarantool.csproj index 08220075..e5c2e98d 100644 --- a/src/progaudi.tarantool/progaudi.tarantool.csproj +++ b/src/progaudi.tarantool/progaudi.tarantool.csproj @@ -27,14 +27,22 @@ true + + + true + + true + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + - - runtime; build; native; contentfiles; analyzers - all - + + all + From 9db5387338db44691c07dbe7fb3377f559c881a9 Mon Sep 17 00:00:00 2001 From: Roman Kozachenko Date: Sat, 2 Mar 2019 21:16:28 +0300 Subject: [PATCH 3/5] Switch to common azure-pipelines --- .azure/build.yml | 11 --------- .azure/test.yml | 19 --------------- .azure/tests.yml | 25 ------------------- azure-pipelines.yml | 59 +++++++++------------------------------------ 4 files changed, 11 insertions(+), 103 deletions(-) delete mode 100644 .azure/build.yml delete mode 100644 .azure/test.yml delete mode 100644 .azure/tests.yml diff --git a/.azure/build.yml b/.azure/build.yml deleted file mode 100644 index 6779f719..00000000 --- a/.azure/build.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - netcore1Global: true - -steps: -- task: DotNetCoreCLI@2 - displayName: dotnet build - inputs: - command: build - projects: progaudi.tarantool.sln - arguments: -c Release - verbosityRestore: minimal diff --git a/.azure/test.yml b/.azure/test.yml deleted file mode 100644 index 3c527e3c..00000000 --- a/.azure/test.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - path: '' - framework: '' - frameworkGlobal: true - -steps: -- ${{ if eq(parameters.frameworkGlobal, 'false') }}: - - script: ${{ format('/home/vsts/.dotnet/dotnet test -f {0} --no-build --logger trx -c Release {1}', parameters.framework, parameters.path) }} - displayName: ${{ format('dotnet test -f {0}', parameters.framework) }} - -- ${{ if eq(parameters.frameworkGlobal, 'true') }}: - - task: DotNetCoreCLI@2 - displayName: ${{ format('dotnet test -f {0}', parameters.framework) }} - inputs: - command: test - nobuild: true - projects: ${{ parameters.path }} - arguments: ${{ format(' -f {0} -c Release', parameters.framework) }} - publishTestResults: true diff --git a/.azure/tests.yml b/.azure/tests.yml deleted file mode 100644 index 058959b9..00000000 --- a/.azure/tests.yml +++ /dev/null @@ -1,25 +0,0 @@ -parameters: - netcore1Global: true - -steps: -- task: Bash@3 - inputs: - targetType: inline - script: docker-compose up -d - -- template: test.yml - parameters: - path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj - framework: netcoreapp1.0 - frameworkGlobal: ${{ parameters.netcore1Global }} - -- template: test.yml - parameters: - path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj - framework: netcoreapp1.1 - frameworkGlobal: ${{ parameters.netcore1Global }} - -- template: test.yml - parameters: - path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj - framework: netcoreapp2.0 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 38f422a7..9ef64c71 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,50 +1,13 @@ -jobs: -- job: macOs - pool: - name: Hosted macOS - steps: - - template: .azure/build.yml - -- job: linux - pool: - name: Hosted Ubuntu 1604 - steps: - - template: .azure/build.yml - - - script: curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -channel 1.1 - displayName: Installing .netcore 1.1 - - - template: .azure/tests.yml - parameters: - netcore1Global: false +variables: + sln: progaudi.tarantool.sln + tests: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj -- job: win - dependsOn: - - macOs - - linux - pool: - name: Hosted VS2017 - steps: - - template: .azure/build.yml +resources: + repositories: + - repository: templates + type: github + name: progaudi/azure-pipelines + endpoint: progaudi - - task: PowerShell@2 - displayName: pack nuget package - inputs: - targetType: inline - script: | - $version = $(git describe --tags | %{$_ -replace '-([^g])', '.$1'}) - dotnet pack --no-build -v minimal -c Release /property:Version=$version /property:PackageOutputPath=$(Build.ArtifactStagingDirectory) - - - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - - task: NuGetCommand@2 - displayName: push nuget packages - inputs: - command: push - packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg' - nuGetFeedType: external - publishFeedCredentials: api.nuget.org - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: nupkgs +jobs: +- template: library/nuget.yml@templates \ No newline at end of file From 4e135717b33f8f9db6cd772f1e43a9c9066ce7a4 Mon Sep 17 00:00:00 2001 From: Roman Kozachenko Date: Sun, 3 Mar 2019 22:11:40 +0300 Subject: [PATCH 4/5] Run docker-compose up before tests --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9ef64c71..d482c7f6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,4 +10,6 @@ resources: endpoint: progaudi jobs: -- template: library/nuget.yml@templates \ No newline at end of file +- template: library/nuget.yml@templates + parameters: + runDockerComposeBeforeTests: true \ No newline at end of file From 10788d2b2355c53a905688c3e779a39bdcd89e2e Mon Sep 17 00:00:00 2001 From: Roman Kozachenko Date: Sun, 3 Mar 2019 22:27:47 +0300 Subject: [PATCH 5/5] Use variable instead of parameter --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d482c7f6..d390203c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,6 +1,7 @@ variables: sln: progaudi.tarantool.sln tests: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj + runDockerComposeBeforeTests: true resources: repositories: @@ -11,5 +12,4 @@ resources: jobs: - template: library/nuget.yml@templates - parameters: - runDockerComposeBeforeTests: true \ No newline at end of file + \ No newline at end of file