Skip to content

Commit 5035eb2

Browse files
radicallewing
andauthored
Add support for running with tfm=net9.0 (#3428)
* ChannelMap: add entry for 9.0 * nuget.config: add dotnet9 source * Add 9.0 versions for package references * [wasm] Pass correct runtime option for net9.0 * Bump BDN to 0.13.10-nightly.20231019.90 * Update NuGet.config Co-authored-by: Larry Ewing <[email protected]> * Address review feedback: add channel map entry for net9.0 * Blazor: update warning condition for package versions needing an update --------- Co-authored-by: Larry Ewing <[email protected]>
1 parent 2f0f878 commit 5035eb2

File tree

6 files changed

+20
-4
lines changed

6 files changed

+20
-4
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<packageSources>
77
<clear />
88
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
9+
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
10+
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
911
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1012
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1113
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PropertyGroup>
1010
<MicrosoftNETILLinkTasksVersion>8.0.0-rtm.23518.26</MicrosoftNETILLinkTasksVersion>
1111
<MicrosoftNETILLinkPackageVersion>8.0.0-rtm.23518.26</MicrosoftNETILLinkPackageVersion>
12-
<BenchmarkDotNetVersion>0.13.9-nightly.20230908.70</BenchmarkDotNetVersion>
12+
<BenchmarkDotNetVersion>0.13.10-nightly.20231019.90</BenchmarkDotNetVersion>
1313
<SystemThreadingChannelsPackageVersion>8.0.0-rtm.23518.26</SystemThreadingChannelsPackageVersion>
1414
<MicrosoftExtensionsLoggingPackageVersion>8.0.0-rtm.23518.26</MicrosoftExtensionsLoggingPackageVersion>
1515
</PropertyGroup>

scripts/channel_map.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
class ChannelMap():
44
channel_map = {
55
'main': {
6-
'tfm': 'net8.0',
7-
'branch': '8.0',
6+
'tfm': 'net9.0',
7+
'branch': '9.0',
8+
'quality': 'daily'
9+
},
10+
'9.0': {
11+
'tfm': 'net9.0',
12+
'branch': '9.0',
813
'quality': 'daily'
914
},
1015
'8.0': {

scripts/micro_benchmarks.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,10 @@ def __get_benchmarkdotnet_arguments(framework: str, args: Any) -> List[str]:
268268
run_args += ['--runtimes', 'wasmnet70']
269269
elif framework == "net8.0":
270270
run_args += ['--runtimes', 'wasmnet80']
271+
elif framework == "net9.0":
272+
run_args += ['--runtimes', 'wasmnet90']
273+
else:
274+
raise ArgumentTypeError('Framework {} is not supported for wasm'.format(framework))
271275

272276
# Increase default 2 min build timeout to accommodate slow (or even very slow) hardware
273277
if not args.bdn_arguments or '--buildTimeout' not in args.bdn_arguments:

src/scenarios/build-common/Blazor.Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Text="Package versions for blazor/aspnetcore not set. %24(AspNetCoreVersion)=$(AspNetCoreVersion), %24(BlazorVersion)==$(BlazorVersion), and %24(SystemNetHttpJsonVersion)=$(SystemNetHttpJsonVersion). TFM: $(TargetFramework)" />
66

77
<Warning
8-
Condition="$(TargetFrameworks.Contains('net9.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionGreaterThan('$(TargetFrameworkVersion)', '9.0')))"
8+
Condition="$(TargetFrameworks.Contains('net10.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionGreaterThan('$(TargetFrameworkVersion)', '9.0')))"
99
Text="Package versions being used for blazor project might need to be updated for a new tfm. Current values: %24(AspNetCoreVersion)=$(AspNetCoreVersion), %24(BlazorVersion)==$(BlazorVersion), and %24(SystemNetHttpJsonVersion)=$(SystemNetHttpJsonVersion). TFM: $(TargetFramework)" />
1010
</Target>
1111

src/scenarios/build-common/Blazor.PackageVersions.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<Project>
2+
<PropertyGroup Condition="$(TargetFrameworks.Contains('net9.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '9.0')))">
3+
<AspNetCoreVersion>9.0.0-*</AspNetCoreVersion>
4+
<BlazorVersion>9.0.0-*</BlazorVersion>
5+
<SystemNetHttpJsonVersion>9.0.0-*</SystemNetHttpJsonVersion>
6+
</PropertyGroup>
27
<PropertyGroup Condition="$(TargetFrameworks.Contains('net8.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0')))">
38
<AspNetCoreVersion>8.0.0-*</AspNetCoreVersion>
49
<BlazorVersion>8.0.0-*</BlazorVersion>

0 commit comments

Comments
 (0)