Add macOS ARM64, add Windows nuget restore workaround

ci/azure-pipelines.yaml

@@ -7,8 +7,6 @@ trigger:
 
 variables:
   - group: wayknow
-  - name: openssl_version
-    value: 1.1.1b-5
 
 stages:
   - stage: Get_version
@@ -264,6 +262,50 @@ stages:
               pathToPublish: $(Build.StagingDirectory)
               artifactName: jetsocat
 
+      - job: Macos_arm64
+        pool:
+          name: 'Devolutions - macOS'
+
+        workspace:
+          clean: all
+
+        variables:
+          TargetPlatform: "macos"
+          TargetArchitecture: "arm64"
+
+        steps:
+          - checkout: self
+            clean: true
+            fetchDepth: 1
+
+          - powershell: |
+              $PackageVersion = Get-Content "$(Build.Repository.LocalPath)\VERSION"
+              $TargetOutputPath = "$(Build.StagingDirectory)/$(TargetPlatform)/$(TargetArchitecture)"
+              $ExecutableFileName = "jetsocat_$(TargetPlatform)_${PackageVersion}_$(TargetArchitecture)"
+              $JetsocatExecutable = "$TargetOutputPath/$ExecutableFileName"
+              $CargoPackage = "jetsocat"
+              Write-Host "##vso[task.setvariable variable=PackageVersion]$PackageVersion"
+              Write-Host "##vso[task.setvariable variable=TargetOutputPath]$TargetOutputPath"
+              Write-Host "##vso[task.setvariable variable=JetsocatExecutable]$JetsocatExecutable"
+              Write-Host "##vso[task.setvariable variable=CargoPackage]$CargoPackage"
+            displayName: Load dynamic variables
+
+          - task: PowerShell@2
+            inputs:
+              targetType: 'filePath'
+              filePath: $(System.DefaultWorkingDirectory)/ci/tlk.ps1
+              arguments: build -Platform $(TargetPlatform) -Architecture $(TargetArchitecture)
+            env:
+              TARGET_OUTPUT_PATH: "$(TargetOutputPath)"
+              JETSOCAT_EXECUTABLE: "$(JetsocatExecutable)"
+              CARGO_PACKAGE: "$(CargoPackage)"
+            displayName: Building jetsocat
+
+          - task: PublishBuildArtifacts@1
+            inputs:
+              pathToPublish: $(Build.StagingDirectory)
+              artifactName: jetsocat
+
   - stage: 'Devolutions_Gateway'
     jobs:
       - job: Linux_64_bit

ci/tlk.ps1

@@ -184,7 +184,9 @@ class TlkTarget
         switch ($this.Architecture) {
             "x86" { "i686" }
             "x86_64" { "x86_64" }
+            "x64" { "x86_64" }
             "aarch64" { "aarch64" }
+            "arm64" { "aarch64" }
         }
 
         $CargoPlatform = `
@@ -248,17 +250,19 @@ class TlkRecipe
     }
 
     [void] Build() {
-        $OPENSSL_VERSION = '1.1.1b-5'
+        $OPENSSL_VERSION = '1.1.1d-4'
         $ConanPackage = "openssl/${OPENSSL_VERSION}@devolutions/stable"
         $ConanProfile = "$($this.Target.Platform)-$($this.Target.Architecture)"
+
+        Write-Host "conan profile: $ConanProfile"
 
         $BuildStagingDirectory = Join-Path $this.SourcePath "artifacts"
 
         if (Test-Path Env:TARGET_OUTPUT_PATH) {
             $BuildStagingDirectory = $Env:TARGET_OUTPUT_PATH
         }
 
-        if (-Not $this.Target.IsMacOS()) {
+        #if (-Not $this.Target.IsMacOS()) {
             # FIXME: this fails on CI build machines for macOS, maybe conan is outdated?
 
             & 'conan' 'install' $ConanPackage '-g' 'virtualenv' '-pr' $ConanProfile
@@ -270,7 +274,7 @@ class TlkRecipe
 
             $OPENSSL_DIR = $dotenv['OPENSSL_DIR']
             $Env:OPENSSL_DIR = $OPENSSL_DIR
-        }
+        #}
 
         if ($this.Target.IsWindows()) {
             $Env:RUSTFLAGS = "-C target-feature=+crt-static"
@@ -289,6 +293,7 @@ class TlkRecipe
         Set-Location -Path $CargoPackage
 
         $CargoTarget = $this.Target.CargoTarget()
+        Write-Host "CargoTarget: $CargoTarget"
 
         $CargoArgs = @('build', '--release')
         $CargoArgs += @('--target', $CargoTarget)

powershell/build.ps1

@@ -19,6 +19,8 @@ $Env:NUGET_CERT_REVOCATION_MODE='offline'
 
 & dotnet nuget add source "https://api.nuget.org/v3/index.json" -n "nuget.org" | Out-Null
 
+& dotnet restore "$PSScriptRoot\$ModuleName\src" 2>&1>$null
+
 & dotnet publish "$PSScriptRoot\$ModuleName\src" -f netstandard2.0 -c Release -o "$PSScriptRoot\$ModuleName\bin"
 
 Copy-Item "$PSScriptRoot\$ModuleName\bin" -Destination "$PSModuleOutputPath\$ModuleName" -Recurse -Force