diff --git a/azure-pipelines-perf.yml b/azure-pipelines-perf.yml index 342c952c62..8841b6af43 100644 --- a/azure-pipelines-perf.yml +++ b/azure-pipelines-perf.yml @@ -29,8 +29,8 @@ jobs: _configuration: Release _codeCoverage: False pool: - name: Azure Pipelines - queue: Windows.10.Amd64.20H2.Owl.Perf + name: NetCore-Public + demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 150 steps: @@ -41,7 +41,7 @@ jobs: inputs: filePath: $(Build.SourcesDirectory)\eng\common\build.ps1 arguments: -configuration Release -prepareMachine -ci -restore -binaryLog - - pwsh: $(Build.SourcesDirectory)\eng\perf\PerfCore.ps1 -v diag -diff -ci + - pwsh: $(Build.SourcesDirectory)\eng\perf\PerfCore.ps1 -v diag -ci displayName: Validate Performance - task: PublishBuildArtifacts@1 displayName: Publish Performance Results diff --git a/eng/perf/PerfCore.ps1 b/eng/perf/PerfCore.ps1 index 90b11de678..725621dfbb 100644 --- a/eng/perf/PerfCore.ps1 +++ b/eng/perf/PerfCore.ps1 @@ -48,7 +48,7 @@ try { $output = Join-Path $RepoRoot "artifacts\performance\perfResults" # Diff two different SHAs - if ($true) { + if ($diff) { $DiffPerfToBaseLine = Join-Path $RepoRoot "eng\perf\DiffPerfToBaseLine.ps1" $baselinejson = Get-Content -Raw -Path (Join-Path $RepoRoot "eng\perf\baseline.json") | ConvertFrom-Json $baselineSHA = $baselinejson.sha @@ -86,4 +86,4 @@ catch { exit 1 } finally { -} \ No newline at end of file +} diff --git a/global.json b/global.json index 9a3f907ec7..215b092e16 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,8 @@ "dotnet": "7.0.100-rc.1.22431.12", "runtimes": { "dotnet": [ - "3.1.7" + "3.1.7", + "6.0.11" ] }, "vs": {