Don't use PlatformName as a variable name

Author: hallipr

eng/pipelines/templates/jobs/build.yml

@@ -66,7 +66,7 @@ jobs:
         -BuildInfoPath '$(Pipeline.Workspace)/build_info/build_info.json'
         -OutputPath '$(Build.ArtifactStagingDirectory)'
         -ServerName '${{ parameters.ServerName }}'
-        -PlatformName '$(PlatformName)'
+        -PlatformName '$(BuildPlatformName)'
         -ReleaseBuild:$${{ ne(parameters.PublishTarget, 'none') }}
         -SelfContained
         -SingleFile
@@ -104,7 +104,7 @@ jobs:
     condition: and(succeededOrFailed(), eq(variables['RunUnitTests'], 'true'))
     inputs:
       testResultsFiles: "$(Build.ArtifactStagingDirectory)/testResults/*.trx"
-      testRunTitle: "unit-${{ parameters.OSName }}-$(Architecture)"
+      testRunTitle: "unit_$(System.JobName)"
       testResultsFormat: "VSTest"
       mergeTestResults: true
 
@@ -113,7 +113,7 @@ jobs:
     condition: and(succeededOrFailed(), eq(variables['RunRecordedTests'], 'true'))
     inputs:
       testResultsFiles: "$(Build.ArtifactStagingDirectory)/recordedTestResults/*.trx"
-      testRunTitle: "recorded-${{ parameters.OSName }}-$(Architecture)"
+      testRunTitle: "recorded_$(System.JobName)"
       testResultsFormat: "VSTest"
       mergeTestResults: true
 

eng/scripts/New-BuildInfo.ps1

@@ -558,12 +558,9 @@ function Get-BuildMatrices {
             $runRecordedTests = $runUnitTests -and ($pathsToTest | Where-Object { $_.hasRecordedTests } | Measure-Object | Select-Object -ExpandProperty Count) -gt 0
 
             $buildMatrix[$legName] = [ordered]@{
-                PlatformName = $platform.name
+                BuildPlatformName = $platform.name
                 Pool = $pool
                 OSVmImage = $vmImage
-                Architecture = $arch
-                Native = $platform.native
-                Trimmed = $platform.trimmed
                 RunUnitTests = $runUnitTests
                 RunRecordedTests = $runRecordedTests
             }