Skip to content

Commit 6d4f852

Browse files
authored
Merge pull request #1034 from TelegramBots/develop
Release v17
2 parents e3bfc42 + 1011514 commit 6d4f852

7 files changed

Lines changed: 24 additions & 64 deletions

File tree

.azure-pipelines/ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,21 @@ stages:
2525
pool:
2626
vmImage: $(vmImage)
2727
steps:
28-
- script: node .azure-pipelines/setVersionVariables.js
29-
env:
30-
VERSION_PREFIX: $(versionPrefix)
31-
VERSION_SUFFIX: $(versionSuffix)
32-
CI_VERSION_SUFFIX: $(ciVersionSuffix)
33-
displayName: Set version variables
3428
- task: DotNetCoreCLI@2
3529
displayName: Build project with CI version
3630
inputs:
3731
command: build
3832
projects: $(projectPath)
3933
arguments: >
4034
--configuration $(buildConfiguration)
41-
-p:Version=$(CI_VERSION)
35+
-p:Version=$(ciVersion)
4236
-p:CI_EMBED_SYMBOLS=true
4337
- bash: >
4438
dotnet pack
4539
--no-build
4640
--output "$(Build.ArtifactStagingDirectory)/packages"
4741
--configuration $(buildConfiguration)
48-
-p:Version=$(CI_VERSION)
42+
-p:Version=$(ciVersion)
4943
-p:CI_EMBED_SYMBOLS=true
5044
$(projectPath)
5145
displayName: Create CI nuget package

.azure-pipelines/develop-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ stages:
2424
buildConfiguration: $(buildConfiguration)
2525
projects: $(unitTestsProject)
2626
strategies:
27-
- Windows: windows-2019
27+
- Windows: windows-2022
2828
- Ubuntu: ubuntu-20.04
29-
- macOS: macOS-10.15
29+
- macOS: macOS-11
3030
- stage: IntegrationTests
3131
displayName: 🧪 Integration tests
3232
jobs:

.azure-pipelines/release-pipeline.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,20 @@ pool:
2020
vmImage: $(vmImage)
2121

2222
steps:
23-
- script: node .azure-pipelines/setVersionVariables.js
24-
env:
25-
VERSION_PREFIX: $(versionPrefix)
26-
VERSION_SUFFIX: $(versionSuffix)
27-
CI_VERSION_SUFFIX: $(ciVersionSuffix)
28-
displayName: Set version variables
2923
- task: DotNetCoreCLI@2
3024
displayName: Build project with release version
3125
inputs:
3226
command: build
3327
projects: $(projectPath)
3428
arguments: >
3529
--configuration $(buildConfiguration)
36-
-p:Version=$(RELEASE_VERSION)
30+
-p:Version=$(releaseVersion)
3731
- bash: >
3832
dotnet pack
3933
--no-build
4034
--output "$(Build.ArtifactStagingDirectory)/packages"
4135
--configuration $(buildConfiguration)
42-
-p:Version=$(RELEASE_VERSION)
36+
-p:Version=$(releaseVersion)
4337
$(projectPath)
4438
displayName: Create release nuget package
4539
- bash: >
@@ -54,12 +48,12 @@ steps:
5448
action: create
5549
target: $(Build.SourceVersion)
5650
tagSource: manual
57-
tag: v$(RELEASE_VERSION)
58-
tagPattern: v$(RELEASE_VERSION)
59-
title: v$(RELEASE_VERSION)
51+
tag: v$(releaseVersion)
52+
tagPattern: v$(releaseVersion)
53+
title: v$(releaseVersion)
6054
githubConnection: githubRelease
6155
repositoryName: $(Build.Repository.Name)
62-
isPreRelease: $(IS_PRE_RELEASE)
56+
isPreRelease: $(isPreRelease)
6357
addChangeLog: false
6458
assets: $(Build.ArtifactStagingDirectory)/packages/*
6559
displayName: Create Github Release

.azure-pipelines/setVersionVariables.js

Lines changed: 0 additions & 40 deletions
This file was deleted.

.azure-pipelines/variables.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@ variables:
33
- name: versionPrefix
44
value: 17.0.0
55
- name: versionSuffix
6-
value: "alpha.5"
6+
value: ''
77
- name: ciVersionSuffix
88
value: ci.$(Build.BuildId)+git.commit.$(Build.SourceVersion)
9+
- name: isPreRelease
10+
value: ${{ ne(variables.versionSuffix, '') }}
11+
- name: releaseVersion
12+
${{ if eq(variables.isPreRelease, true) }}:
13+
value: $(versionPrefix)-$(versionSuffix)
14+
${{ else }}:
15+
value: $(versionPrefix)
16+
- name: ciVersion
17+
${{ if eq(variables.isPreRelease, true) }}:
18+
value: $(versionPrefix)-$(versionSuffix).$(ciVersionSuffix)
19+
${{ else }}:
20+
value: $(versionPrefix)-$(ciVersionSuffix)
921
- name: buildConfiguration
1022
value: Release
1123
- name: vmImage

.gitpod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
image: gitpod/workspace-dotnet

Telegram.Bot.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".azure-pipelines", ".azure-
2828
.azure-pipelines\develop-pipeline.yml = .azure-pipelines\develop-pipeline.yml
2929
.azure-pipelines\manual-pipeline.yml = .azure-pipelines\manual-pipeline.yml
3030
.azure-pipelines\release-pipeline.yml = .azure-pipelines\release-pipeline.yml
31-
.azure-pipelines\setVersionVariables.js = .azure-pipelines\setVersionVariables.js
3231
.azure-pipelines\variables.yml = .azure-pipelines\variables.yml
3332
EndProjectSection
3433
EndProject

0 commit comments

Comments
 (0)