Fix signing (#299)

* Simplify Architectures matrix

* Update pipeline.yml

* Add ability to specify BuildVmImage

* Fix GHSA-5crp-9r3c-p9vr

https://github.com/advisories/GHSA-5crp-9r3c-p9vr

* Try to install .NET Core 2.1

* Update pack.yml

* Try installing to the same path as the other versions

CI/Templates/Tasks/pack.yml

@@ -35,6 +35,14 @@ steps:
     contents: '**/*.dll'
     targetFolder: ${{ parameters.UnityFolderPath }}/Plugins
 
+- task: DotNetCoreInstaller@1
+  displayName: Install .NET Core 2.1 runtime
+  condition: and(succeeded(), ${{ parameters.Sign }})
+  inputs:
+    packageType: runtime
+    version: 2.1.x
+    installationPath: "C:/Program Files/dotnet"
+
 # Required for code signing
 - task: ComponentGovernanceComponentDetection@0
   # Only run during when explicitly marked to sign

CI/Templates/pipeline.yml

@@ -11,9 +11,12 @@ parameters:
 - name: UnityFolderPath
   type: string
   default: ''
-- name: Platforms
+- name: BuildVmImage
   type: string
-  default: 'x86 x64 ARM ARM64'
+  default: windows-2022
+- name: Architectures
+  type: object
+  default: [x86,x64,ARM,ARM64]
 - name: Sign
   type: boolean
   default: false
@@ -24,21 +27,12 @@ variables:
 jobs:
 - job: Build_${{ parameters.ProjectFriendlyName }}
   pool:
-    vmImage: windows-2019
+    vmImage: ${{ parameters.BuildVmImage }}
   strategy:
     matrix:
-      ${{ if contains(parameters.Platforms, 'x86') }}:
-        x86:
-          BuildPlatform: x86
-      ${{ if contains(parameters.Platforms, 'x64') }}:
-        x64:
-          BuildPlatform: x64
-      ${{ if contains(parameters.Platforms, 'ARM') }}:
-        ARM:
-          BuildPlatform: ARM
-      ${{ if contains(parameters.Platforms, 'ARM64') }}:
-        ARM64:
-          BuildPlatform: ARM64
+      ${{ each arch in parameters.Architectures }}:
+        ${{ arch }}:
+          BuildPlatform: ${{ arch }}
   steps:
   - template: Tasks/build.yml
     parameters:

CI/azure-pipelines.yml

@@ -26,10 +26,12 @@ extends:
       SolutionPath: $(Build.SourcesDirectory)/Input/MicStreamSelector/Solutions/MicStreamSelector.sln
       BuildOutputPath: $(Build.SourcesDirectory)/Input/MicStreamSelector/Solutions/Release
       UnityFolderPath: $(Build.SourcesDirectory)/Input/MicStreamSelector/UnityAddon
+      BuildVmImage: windows-2019
     ${{ if eq(parameters.Project, 'PlaneFinding') }}:
       SolutionPath: $(Build.SourcesDirectory)/SpatialMapping/PlaneFinding/PlaneFinding.sln
       BuildOutputPath: $(Build.SourcesDirectory)/SpatialMapping/PlaneFinding/Release
       UnityFolderPath: $(Build.SourcesDirectory)/SpatialMapping/PlaneFinding/UnityAddon
+      BuildVmImage: windows-2019
     ${{ if eq(parameters.Project, 'GpuStats') }}:
       SolutionPath: $(Build.SourcesDirectory)/GpuStats/GpuStats.sln
       BuildOutputPath: $(Build.SourcesDirectory)/GpuStats/BuildOutput/bin/Release
@@ -38,4 +40,5 @@ extends:
       SolutionPath: $(Build.SourcesDirectory)/WinRTTextToSpeech/WinRTTextToSpeech.sln
       BuildOutputPath: $(Build.SourcesDirectory)/WinRTTextToSpeech/Release
       UnityFolderPath: $(Build.SourcesDirectory)/WinRTTextToSpeech/UnityAddon
-      Platforms: 'x86 x64'
+      Architectures: [x86,x64]
+      BuildVmImage: windows-2019

Sharing/Src/Projects/SessionManager.UI/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net45" />
 </packages>