Update build system to support v1.4 branch (#211) (#212)

* Update build system to support v1.4 branch

* Update build script

(cherry picked from commit 618d9dc)

Author: Arkatufus

build-system/azure-pipeline.template.yaml

@@ -12,6 +12,20 @@ jobs:
     pool:
       vmImage: ${{ parameters.vmImage }}
     steps:
+      - task: UseDotNet@2
+        displayName: 'Use .NET 7 SDK'
+        inputs:
+          version: 7.x
+      - task: UseDotNet@2
+        displayName: 'Use .NET Core Runtime 6'
+        inputs:
+          packageType: runtime
+          version: 6.x
+      - task: UseDotNet@2
+        displayName: 'Use .NET Core Runtime 3'
+        inputs:
+          packageType: runtime
+          version: 3.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/linux-pr-validation.yaml

@@ -5,13 +5,14 @@ trigger:
     include:
       - dev
       - master
+      - v1.*
 
 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
 
 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
 
 jobs:
 - template: azure-pipeline.template.yaml

build-system/windows-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)
 

build-system/windows-release.yaml

@@ -21,6 +21,21 @@ variables:
     value: akkadotnet/Akka.Logger.Serilog #replace this
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET 7 SDK 7.0.x'
+  inputs:
+    version: 7.0.x
+- task: UseDotNet@2
+  displayName: 'Use .NET Core Runtime 6.0.x'
+  inputs:
+    packageType: runtime
+    version: 6.0.x
+- task: UseDotNet@2
+  displayName: 'Use .NET Core Runtime 3.1.x'
+  inputs:
+    packageType: runtime
+    version: 3.1.x
+
 - task: BatchScript@1
   displayName: 'FAKE Build'
   inputs:

build.ps1

@@ -30,12 +30,8 @@ Param(
 )
 
 $FakeVersion = "4.61.2"
-$DotNetChannel = "LTS";
-$DotNetVersion = "3.1.100";
-$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
 $NugetVersion = "4.1.0";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
-$ProtobufVersion = "3.4.0"
 $DocfxVersion = "2.49.0"
 
 # Make sure tools folder exists
@@ -46,50 +42,6 @@ if (!(Test-Path $ToolPath)) {
     New-Item -Path $ToolPath -Type directory | out-null
 }
 
-###########################################################################
-# INSTALL .NET CORE CLI
-###########################################################################
-
-Function Remove-PathVariable([string]$VariableToRemove)
-{
-    $path = [Environment]::GetEnvironmentVariable("PATH", "User")
-    if ($path -ne $null)
-    {
-        $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
-    }
-
-    $path = [Environment]::GetEnvironmentVariable("PATH", "Process")
-    if ($path -ne $null)
-    {
-        $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
-    }
-}
-
-# Get .NET Core CLI path if installed.
-$FoundDotNetCliVersion = $null;
-if (Get-Command dotnet -ErrorAction SilentlyContinue) {
-    $FoundDotNetCliVersion = dotnet --version;
-    $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
-}
-
-if($FoundDotNetCliVersion -ne $DotNetVersion) {
-    $InstallPath = Join-Path $PSScriptRoot ".dotnet"
-    if (!(Test-Path $InstallPath)) {
-        mkdir -Force $InstallPath | Out-Null;
-    }
-    (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath\dotnet-install.ps1");
-    & $InstallPath\dotnet-install.ps1 -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath -Architecture x64;
-
-    Remove-PathVariable "$InstallPath"
-    $env:PATH = "$InstallPath;$env:PATH"
-    $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
-    $env:DOTNET_ROOT=$InstallPath
-}
-
 ###########################################################################
 # INSTALL NUGET
 ###########################################################################