Update prod pipeline to use new configuration

The Azure DevOps Pipeline Agents can't actually compile ARM64
versions of the dll and so files for Windows and Linux. They were
commented out until they are able to.

The macOS dylib can be built as a Universal library to support
both x64 and ARM64 architectures, so the build step was
modified to compile this library and copy it into the respective
folders for the architectures.

azure-pipelines-photino.native-prod.yml

@@ -6,62 +6,36 @@ trigger:
 
 variables:
   major: 2
-  minor: 3 
+  minor: 4 
   patch: $[counter(variables['minor'], 0)] #this will reset when we bump minor
   buildConfiguration: 'Release'
 
 jobs:
-  - job: 'Build'
-    strategy:
-      maxParallel: 6
-      matrix:
-        # Windows
-        windows-intel:
-          rid: 'win-x64'
-          imageName: 'windows-latest'
-        windows-arm64:
-          rid: 'win-arm64'
-          imageName: 'windows-latest'
-
-        # Linux
-        linux-intel:
-          rid: 'linux-x64'
-          imageName: 'ubuntu-latest'
-        linux-arm64:
-          rid: 'linux-arm64'
-          imageName: 'ubuntu-latest'
-
-        # macOS
-        mac-intel:
-          rid: 'osx-x64'
-          imageName: 'macos-latest'
-        mac-arm64:
-         rid: 'osx-arm64'
-         imagename: 'macos-latest'
-
+  - job: 'Publish_Nuspec'
     pool:
-      vmImage: $(imageName)
+      vmImage: 'windows-latest'
 
     steps:
     - task: PublishPipelineArtifact@1
       displayName: 'Publish Windows (x64) nuspec to artifacts'
-      condition: eq(variables.rid, 'win-x64')
       inputs:
         targetPath: './Photino.Native/Photino.Native.nuspec'
         artifactName: NuspecArtifact
 
-    # Windows x64
+  - job: 'Build_Win_x64'
+    pool:
+      vmImage: 'windows-latest'
+
+    steps:
     - task: NuGetCommand@2
       displayName: 'NuGet package restore for Windows (x64)'
-      condition: eq(variables.rid, 'win-x64')
       inputs:
         command: 'restore'
         restoreSolution: 'Photino.Native.sln'
         feedsToUse: 'select'
 
     - task: VSBuild@1
       displayName: 'Build Windows (x64) native assets'
-      condition: eq(variables.rid, 'win-x64')
       inputs:
         solution: 'Photino.Native.sln'
         platform: 'x64'
@@ -70,40 +44,45 @@ jobs:
 
     - task: PublishPipelineArtifact@1
       displayName: 'Publish Windows (x64) libraries to artifacts'
-      condition: eq(variables.rid, 'win-x64')
       inputs:
         targetPath: './Photino.Native/x64/$(buildConfiguration)'
         artifactName: WindowsIntelArtifact
 
-    # Windows ARM64
-    - task: NuGetCommand@2
-      displayName: 'NuGet package restore for Windows (ARM64)'
-      condition: eq(variables.rid, 'win-arm64')
-      inputs:
-        command: 'restore'
-        restoreSolution: 'Photino.Native.sln'
-        feedsToUse: 'select'
 
-    - task: VSBuild@1
-      displayName: 'Build Windows (ARM64) native assets'
-      condition: eq(variables.rid, 'win-arm64')
-      inputs:
-        solution: 'Photino.Native.sln'
-        platform: 'ARM64'
-        msbuildArchitecture: 'ARM64'
-        configuration: '$(buildConfiguration)'
+  #- job: 'Build_Win_Arm64'
+  #  pool:
+  #    vmImage: 'windows-latest'
+
+  #steps:
+  #- task: NuGetCommand@2
+  #  displayName: 'NuGet package restore for Windows (ARM64)'
+  #  inputs:
+  #    command: 'restore'
+  #    restoreSolution: 'Photino.Native.sln'
+  #    feedsToUse: 'select'
+
+  #- task: VSBuild@1
+  #  displayName: 'Build Windows (ARM64) native assets'
+  #  inputs:
+  #    solution: 'Photino.Native.sln'
+  #    platform: 'ARM64'
+  #    msbuildArchitecture: 'ARM64'
+  #    configuration: '$(buildConfiguration)'
+
+  #- task: PublishPipelineArtifact@1
+  #  displayName: 'Publish Windows (ARM64) libraries to artifacts'
+  #  inputs:
+  #    targetPath: './Photino.Native/arm64/$(buildConfiguration)'
+  #    artifactName: WindowsArm64Artifact
 
-    - task: PublishPipelineArtifact@1
-      displayName: 'Publish Windows (ARM64) libraries to artifacts'
-      condition: eq(variables.rid, 'win-arm64')
-      inputs:
-        targetPath: './Photino.Native/arm64/$(buildConfiguration)'
-        artifactName: WindowsArm64Artifact
 
-    # Linux x64
+  - job: 'Build_Linux_x64'
+    pool:
+      vmImage: 'ubuntu-latest'
+
+    steps:
     - task: CmdLine@2
       displayName: 'Build Linux (x64) native assets'
-      condition: eq(variables.rid, 'linux-x64')
       inputs:
         workingDirectory: '.'
         script: |
@@ -113,68 +92,70 @@ jobs:
 
     - task: PublishPipelineArtifact@1
       displayName: 'Publish Linux (x64) libraries to artifacts'
-      condition: eq(variables.rid, 'linux-x64')
       inputs:
         targetPath: './Photino.Native/x64/$(buildConfiguration)'
         artifactName: LinuxIntelArtifact
 
-    # Linux ARM64
-    - task: CmdLine@2
-      displayName: 'Build Linux (ARM64) native assets'
-      condition: eq(variables.rid, 'linux-arm64')
-      inputs:
-        workingDirectory: '.'
-        script: |
-          mkdir -p ./Photino.Native/arm64/$(buildConfiguration)
-          make linux-arm64
-          mv ./lib/arm64/Photino.Native.so ./Photino.Native/arm64/$(buildConfiguration)/Photino.Native.so
 
-    - task: PublishPipelineArtifact@1
-      displayName: 'Publish Linux (ARM64) libraries to artifacts'
-      condition: eq(variables.rid, 'linux-arm64')
-      inputs:
-        targetPath: './Photino.Native/arm64/$(buildConfiguration)'
-        artifactName: LinuxArm64Artifact
+  #- job: 'Build_Linux_Arm64'
+  #  pool:
+  #    vmImage: 'ubuntu-latest'
+
+  #  steps:
+  #  - task: CmdLine@2
+  #    displayName: 'Build Linux (ARM64) native assets'
+  #    inputs:
+  #      workingDirectory: '.'
+  #      script: |
+  #        mkdir -p ./Photino.Native/arm64/$(buildConfiguration)
+  #        make linux-dev
+  #        mv ./lib/dev/Photino.Native.so ./Photino.Native/arm64/$(buildConfiguration)/Photino.Native.so
+
+  #  - task: PublishPipelineArtifact@1
+  #    displayName: 'Publish Linux (ARM64) libraries to artifacts'
+  #    inputs:
+  #      targetPath: './Photino.Native/arm64/$(buildConfiguration)'
+  #      artifactName: LinuxArm64Artifact
+
 
-    # macOS x64
+  - job: 'Build_Mac_Universal'
+    pool:
+      vmImage: 'macos-12'
+
+    steps:
     - task: CmdLine@2
       displayName: 'Build macOS (x64) native assets'
-      condition: eq(variables.rid, 'osx-x64')
       inputs:
         workingDirectory: '.'
         script: |
           mkdir -p ./Photino.Native/x64/$(buildConfiguration)
-          make mac-x64
-          mv ./lib/x64/Photino.Native.dylib ./Photino.Native/x64/$(buildConfiguration)/Photino.Native.dylib
+          mkdir -p ./Photino.Native/arm64/$(buildConfiguration)
+          make mac-universal
+          cp ./lib/x64/Photino.Native.dylib ./Photino.Native/x64/$(buildConfiguration)/Photino.Native.dylib
+          cp ./lib/x64/Photino.Native.dylib ./Photino.Native/arm64/$(buildConfiguration)/Photino.Native.dylib
 
     - task: PublishPipelineArtifact@1
       displayName: 'Publish macOS (x64) libraries to artifacts'
-      condition: eq(variables.rid, 'osx-x64')
       inputs:
         targetPath: './Photino.Native/x64/$(buildConfiguration)/Photino.Native.dylib'
         artifactName: MacOsIntelArtifact
 
-    # macOS ARM64
-    - task: CmdLine@2
-      displayName: 'Build macOS (ARM64) native assets'
-      condition: eq(variables.rid, 'osx-arm64')
-      inputs:
-        workingDirectory: '.'
-        script: |
-          mkdir -p ./Photino.Native/arm64/$(buildConfiguration)
-          make mac-arm64
-          mv ./lib/arm64/Photino.Native.dylib ./Photino.Native/arm64/$(buildConfiguration)/Photino.Native.dylib
-
     - task: PublishPipelineArtifact@1
       displayName: 'Publish macOS (ARM64) libraries to artifacts'
-      condition: eq(variables.rid, 'osx-arm64')
       inputs:
         targetPath: './Photino.Native/arm64/$(buildConfiguration)/Photino.Native.dylib'
         artifactName: MacOsArm64Artifact
 
+
   # 1 instance to download all native files, create NuGet package and publish to Artifacts
   - job: 'PublishPackage'
-    dependsOn: 'Build'
+    dependsOn: 
+        - 'Publish_Nuspec' 
+        - 'Build_Win_x64' 
+        #- 'Build_Win_Arm64' 
+        - 'Build_Linux_x64' 
+        #- 'Build_Linux_Arm64' 
+        - 'Build_Mac_Universal' 
 
     pool:
       vmImage: 'windows-latest'
@@ -194,12 +175,12 @@ jobs:
         patterns: '**/*.dll'
         targetPath: '$(Pipeline.Workspace)/x64/'
 
-    - task: DownloadPipelineArtifact@2
-      displayName: 'Download WindowsArm64Artifact'
-      inputs:
-        artifact: WindowsArm64Artifact
-        patterns: '**/*.dll'
-        targetPath: '$(Pipeline.Workspace)/arm64/'
+    #- task: DownloadPipelineArtifact@2
+    #  displayName: 'Download WindowsArm64Artifact'
+    #  inputs:
+    #    artifact: WindowsArm64Artifact
+    #    patterns: '**/*.dll'
+    #    targetPath: '$(Pipeline.Workspace)/arm64/'
 
     - task: DownloadPipelineArtifact@2
       displayName: 'Download LinuxIntelArtifact'
@@ -208,12 +189,12 @@ jobs:
         patterns: '**/*.so'
         targetPath: '$(Pipeline.Workspace)/x64/'
 
-    - task: DownloadPipelineArtifact@2
-      displayName: 'Download LinuxArm64Artifact'
-      inputs:
-        artifact: LinuxArm64Artifact
-        patterns: '**/*.so'
-        targetPath: '$(Pipeline.Workspace)/arm64/'
+    #- task: DownloadPipelineArtifact@2
+    #  displayName: 'Download LinuxArm64Artifact'
+    #  inputs:
+    #    artifact: LinuxArm64Artifact
+    #    patterns: '**/*.so'
+    #    targetPath: '$(Pipeline.Workspace)/arm64/'
 
     - task: DownloadPipelineArtifact@2
       displayName: 'Download MacOsIntelArtifact'