Merge pull request #1034 from TelegramBots/develop

Release v17
TelegramBots · Nov 17, 2021 · 6d4f852 · 6d4f852
2 parents e3bfc42 + 1011514
commit 6d4f852
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 64 deletions.
diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
@@ -25,27 +25,21 @@ stages:
         pool:
           vmImage: $(vmImage)
         steps:
-          - script: node .azure-pipelines/setVersionVariables.js
-            env:
-              VERSION_PREFIX: $(versionPrefix)
-              VERSION_SUFFIX: $(versionSuffix)
-              CI_VERSION_SUFFIX: $(ciVersionSuffix)
-            displayName: Set version variables
           - task: DotNetCoreCLI@2
             displayName: Build project with CI version
             inputs:
               command: build
               projects: $(projectPath)
               arguments: >
                 --configuration $(buildConfiguration)
-                -p:Version=$(CI_VERSION)
+                -p:Version=$(ciVersion)
                 -p:CI_EMBED_SYMBOLS=true
           - bash: >
               dotnet pack
               --no-build
               --output "$(Build.ArtifactStagingDirectory)/packages"
               --configuration $(buildConfiguration)
-              -p:Version=$(CI_VERSION)
+              -p:Version=$(ciVersion)
               -p:CI_EMBED_SYMBOLS=true
               $(projectPath)
             displayName: Create CI nuget package

diff --git a/.azure-pipelines/develop-pipeline.yml b/.azure-pipelines/develop-pipeline.yml
@@ -24,9 +24,9 @@ stages:
           buildConfiguration: $(buildConfiguration)
           projects: $(unitTestsProject)
           strategies:
-            - Windows: windows-2019
+            - Windows: windows-2022
             - Ubuntu: ubuntu-20.04
-            - macOS: macOS-10.15
+            - macOS: macOS-11
   - stage: IntegrationTests
     displayName: 🧪 Integration tests
     jobs:

diff --git a/.azure-pipelines/release-pipeline.yml b/.azure-pipelines/release-pipeline.yml
@@ -20,26 +20,20 @@ pool:
   vmImage: $(vmImage)
 
 steps:
-  - script: node .azure-pipelines/setVersionVariables.js
-    env:
-      VERSION_PREFIX: $(versionPrefix)
-      VERSION_SUFFIX: $(versionSuffix)
-      CI_VERSION_SUFFIX: $(ciVersionSuffix)
-    displayName: Set version variables
   - task: DotNetCoreCLI@2
     displayName: Build project with release version
     inputs:
       command: build
       projects: $(projectPath)
       arguments: >
         --configuration $(buildConfiguration)
-        -p:Version=$(RELEASE_VERSION)
+        -p:Version=$(releaseVersion)
   - bash: >
       dotnet pack
       --no-build
       --output "$(Build.ArtifactStagingDirectory)/packages"
       --configuration $(buildConfiguration)
-      -p:Version=$(RELEASE_VERSION)
+      -p:Version=$(releaseVersion)
       $(projectPath)
     displayName: Create release nuget package
   - bash: >
@@ -54,12 +48,12 @@ steps:
       action: create
       target: $(Build.SourceVersion)
       tagSource: manual
-      tag: v$(RELEASE_VERSION)
-      tagPattern: v$(RELEASE_VERSION)
-      title: v$(RELEASE_VERSION)
+      tag: v$(releaseVersion)
+      tagPattern: v$(releaseVersion)
+      title: v$(releaseVersion)
       githubConnection: githubRelease
       repositoryName: $(Build.Repository.Name)
-      isPreRelease: $(IS_PRE_RELEASE)
+      isPreRelease: $(isPreRelease)
       addChangeLog: false
       assets: $(Build.ArtifactStagingDirectory)/packages/*
     displayName: Create Github Release
diff --git a/.azure-pipelines/setVersionVariables.js b/.azure-pipelines/setVersionVariables.js
diff --git a/.azure-pipelines/variables.yml b/.azure-pipelines/variables.yml
@@ -3,9 +3,21 @@ variables:
   - name: versionPrefix
     value: 17.0.0
   - name: versionSuffix
-    value: "alpha.5"
+    value: ''
   - name: ciVersionSuffix
     value: ci.$(Build.BuildId)+git.commit.$(Build.SourceVersion)
+  - name: isPreRelease
+    value: ${{ ne(variables.versionSuffix, '') }}
+  - name: releaseVersion
+    ${{ if eq(variables.isPreRelease, true) }}:
+      value: $(versionPrefix)-$(versionSuffix)
+    ${{ else }}:
+      value: $(versionPrefix)
+  - name: ciVersion
+    ${{ if eq(variables.isPreRelease, true) }}:
+      value: $(versionPrefix)-$(versionSuffix).$(ciVersionSuffix)
+    ${{ else }}:
+      value: $(versionPrefix)-$(ciVersionSuffix)
   - name: buildConfiguration
     value: Release
   - name: vmImage

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -0,0 +1 @@
+image: gitpod/workspace-dotnet
diff --git a/Telegram.Bot.sln b/Telegram.Bot.sln
@@ -28,7 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".azure-pipelines", ".azure-
 		.azure-pipelines\develop-pipeline.yml = .azure-pipelines\develop-pipeline.yml
 		.azure-pipelines\manual-pipeline.yml = .azure-pipelines\manual-pipeline.yml
 		.azure-pipelines\release-pipeline.yml = .azure-pipelines\release-pipeline.yml
-		.azure-pipelines\setVersionVariables.js = .azure-pipelines\setVersionVariables.js
 		.azure-pipelines\variables.yml = .azure-pipelines\variables.yml
 	EndProjectSection
 EndProject