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..d390203c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,50 +1,15 @@ -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 + runDockerComposeBeforeTests: true + +resources: + repositories: + - repository: templates + type: github + name: progaudi/azure-pipelines + endpoint: progaudi -- job: win - dependsOn: - - macOs - - linux - pool: - name: Hosted VS2017 - steps: - - template: .azure/build.yml - - - 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 diff --git a/src/progaudi.tarantool/progaudi.tarantool.csproj b/src/progaudi.tarantool/progaudi.tarantool.csproj index a568dcb2..e5c2e98d 100644 --- a/src/progaudi.tarantool/progaudi.tarantool.csproj +++ b/src/progaudi.tarantool/progaudi.tarantool.csproj @@ -27,10 +27,22 @@ true + + + true + + true + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + + + all +