Skip to content

[Net8.0] Update channel_map with net8 and organized 6v7v8 groupings. #2585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LoopedBard3 merged 6 commits into from
Nov 3, 2022
Merged

[Net8.0] Update channel_map with net8 and organized 6v7v8 groupings. #2585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e7fce1
Updated channel_map with net8 and organized 6v7v8.
LoopedBard3 Aug 30, 2022
2561f12
remove duplicate channel map entry.
LoopedBard3 Nov 3, 2022
2840d04
Set prepare scenarios to use ci_setup dotnet.
LoopedBard3 Nov 3, 2022
535df3f
Setup a default value forInstall Prerequisites.
LoopedBard3 Nov 3, 2022
6f9131b
Try using the dotnet msbuild from the ci_setup dotnet.
LoopedBard3 Nov 3, 2022
0f83198
Revert nativeaot back to 7.0 since 8.0 is throwing unsupported.
LoopedBard3 Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions eng/performance/benchmark_jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions eng/performance/scenarios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
36 changes: 28 additions & 8 deletions scripts/channel_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions src/benchmarks/micro/MicroBenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<!-- Used by Python script to narrow down the specified target frameworks to test, and avoid downloading all supported SDKs -->
<TargetFrameworks>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFrameworks>
<!-- Supported target frameworks -->
<TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<NoWarn>$(NoWarn);CS8002</NoWarn>
<!-- Suppress binaryformatter obsolete warning -->
<NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
Expand Down Expand Up @@ -60,7 +60,7 @@
<PackageReference Include="protobuf-net" Version="3.0.73" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemVersion)" />
<PackageReference Include="System.Drawing.Common" Version="$(SystemVersion)" />
<PackageReference Include="System.Formats.Cbor" Version="$(SystemVersion)" Condition="'$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'" />
<PackageReference Include="System.Formats.Cbor" Version="$(SystemVersion)" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(_TargetFrameworkVersionWithoutV)' >= '5.0'" />
<PackageReference Include="System.IO.Pipelines" Version="$(SystemVersion)" />
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
Expand Down