diff --git a/eng/performance/benchmark_jobs.yml b/eng/performance/benchmark_jobs.yml index 46d6702a607..c2f2be5f493 100644 --- a/eng/performance/benchmark_jobs.yml +++ b/eng/performance/benchmark_jobs.yml @@ -61,6 +61,9 @@ jobs: - ${{ if eq(parameters.osName, 'ubuntu')}}: - name: InstallPrerequisites value: 'sudo apt-get -y install python3-venv' + - ${{ if ne(parameters.osName, 'ubuntu')}}: + - name: InstallPrerequisites + value: '' - ${{ if eq(variables['System.TeamProject'], 'public') }}: # for public runs, we do not want to upload perflab data - name: PerfLabArguments diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index 65c914ce7d6..a7880f1f878 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -105,8 +105,8 @@ jobs: - powershell: | $(Python) -m pip install --upgrade pip $(Python) -m pip install requests - .\src\scenarios\init.ps1 - .\eng\common\msbuild.ps1 .\eng\performance\${{ parameters.projectFile }} /restore /t:PreparePayloadWorkItems /bl:.\artifacts\log\$(_BuildConfig)\PrepareWorkItemPayloads.binlog + .\src\scenarios\init.ps1 -DotnetDirectory $(CorrelationStaging)dotnet + dotnet msbuild .\eng\performance\${{ parameters.projectFile }} /restore /t:PreparePayloadWorkItems /bl:.\artifacts\log\$(_BuildConfig)\PrepareWorkItemPayloads.binlog displayName: Prepare scenarios env: CorrelationPayloadDirectory: $(CorrelationStaging) @@ -141,8 +141,8 @@ jobs: - script: | $(Python) -m pip install --upgrade pip $(Python) -m pip install requests - . ./src/scenarios/init.sh - ./eng/common/msbuild.sh ./eng/performance/${{ parameters.projectFile }} /restore /t:PreparePayloadWorkItems /bl:./artifacts/log/$(_BuildConfig)/PrepareWorkItemPayloads.binlog + . ./src/scenarios/init.sh -dotnetdir $(CorrelationStaging)dotnet + dotnet msbuild ./eng/performance/${{ parameters.projectFile }} /restore /t:PreparePayloadWorkItems /bl:./artifacts/log/$(_BuildConfig)/PrepareWorkItemPayloads.binlog displayName: Prepare scenarios env: CorrelationPayloadDirectory: $(CorrelationStaging) diff --git a/scripts/channel_map.py b/scripts/channel_map.py index b1cb9804388..9c532e6f242 100644 --- a/scripts/channel_map.py +++ b/scripts/channel_map.py @@ -3,6 +3,30 @@ class ChannelMap(): channel_map = { 'main': { + 'tfm': 'net8.0', + 'branch': '8.0', + 'quality': 'daily' + }, + 'master': { + 'tfm': 'net6.0', + 'branch': 'master' + }, + '8.0': { + 'tfm': 'net8.0', + 'branch': '8.0', + 'quality': 'daily' + }, + 'release/8.0': { + 'tfm': 'net8.0', + 'branch': '8.0', + 'quality': 'daily' + }, + 'nativeaot8.0': { + 'tfm': 'nativeaot8.0', + 'branch': '8.0', + 'quality': 'daily' + }, + '7.0': { 'tfm': 'net7.0', 'branch': '7.0.1xx', 'quality': 'daily' @@ -17,19 +41,15 @@ class ChannelMap(): 'branch': '7.0-rc1', 'quality': 'daily' }, - 'release/7.0': { - 'tfm': 'net7.0', - 'branch': '7.0', - 'quality': 'daily' - }, 'nativeaot7.0': { 'tfm': 'nativeaot7.0', 'branch': '7.0.1xx', 'quality': 'daily' }, - 'master': { - 'tfm': 'net6.0', - 'branch': 'master' + 'release/7.0': { + 'tfm': 'net7.0', + 'branch': '7.0', + 'quality': 'daily' }, '6.0': { 'tfm': 'net6.0', diff --git a/src/benchmarks/micro/MicroBenchmarks.csproj b/src/benchmarks/micro/MicroBenchmarks.csproj index 51cbae06b5b..7699a1b0530 100644 --- a/src/benchmarks/micro/MicroBenchmarks.csproj +++ b/src/benchmarks/micro/MicroBenchmarks.csproj @@ -4,8 +4,8 @@ $(PERFLAB_TARGET_FRAMEWORKS) - net461;netcoreapp3.1;net5.0;net6.0;net7.0 - netcoreapp3.1;net5.0;net6.0;net7.0 + net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 + netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 $(NoWarn);CS8002 $(NoWarn);SYSLIB0011 @@ -60,7 +60,7 @@ - +