Add v1.x branch CI/CD support (#161) (#162)

* Add v1.x branch CI/CD support

* Add net6.0 runtime to the pipeline

(cherry picked from commit 2c1d5fb)

build-system/azure-pipeline.template.yaml

@@ -14,14 +14,19 @@ jobs:
       vmImage: ${{ parameters.vmImage }}
     steps:
       - task: UseDotNet@2
-        displayName: 'Use .NET 5 SDK 5.0.101'
+        displayName: 'Use .NET 7 SDK 7.0.x'
         inputs:
-          version: 5.0.101
+          version: 7.0.x
       - task: UseDotNet@2
-        displayName: 'Use .NET Core Runtime 3.1.10'
+        displayName: 'Use .NET Core Runtime 6.0.x'
         inputs:
           packageType: runtime
-          version: 3.1.10
+          version: 6.0.x
+      - task: UseDotNet@2
+        displayName: 'Use .NET Core Runtime 3.1.x'
+        inputs:
+          packageType: runtime
+          version: 3.1.x
       - checkout: self  # self represents the repo where the initial Pipelines YAML file was found
         clean: false  # whether to fetch clean each time
         submodules: recursive  # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules

build-system/pr-validation.yaml

@@ -5,11 +5,12 @@ trigger:
     include:
       - dev
       - master
+      - v1.*
 
 pr:
   autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true
   branches:
-    include: [ dev, master ] # branch names which will trigger a build
+    include: [ dev, master, v1.* ] # branch names which will trigger a build
 
 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
 
@@ -18,7 +19,7 @@ jobs:
     parameters:
       name: 'windows_pr'
       displayName: 'Windows PR Validation'
-      vmImage: 'windows-2019'
+      vmImage: 'windows-latest'
       scriptFileName: build.cmd
       scriptArgs: all
       outputDirectory: 'bin/nuget'
@@ -27,7 +28,7 @@ jobs:
     parameters:
       name: 'linux_pr'
       displayName: 'Linux PR Validation'
-      vmImage: 'ubuntu-20.04'
+      vmImage: 'ubuntu-latest'
       scriptFileName: ./build.sh
       scriptArgs: all
       outputDirectory: 'bin/nuget'

build.fsx

@@ -14,7 +14,7 @@ let configuration = "Release"
 
 // Configuration values for tests
 let testNetCoreVersion = "netcoreapp3.1"
-let testNetVersion = "net5.0"
+let testNetVersion = "net6.0"
 
 // Metadata used when signing packages and DLLs
 let signingName = "Akka.MultiNode.TestAdapter"

src/common.props

@@ -20,7 +20,7 @@
     <NBenchVersion>1.2.2</NBenchVersion>
     <ProtobufVersion>3.11.2</ProtobufVersion>
     <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
-    <NetTestVersion>net5.0</NetTestVersion>
+    <NetTestVersion>net6.0</NetTestVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
     <FluentAssertionsVersion>6.6.0</FluentAssertionsVersion>
     <FsCheckVersion>2.9.0</FsCheckVersion>