Skip to content
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

Add support for running with tfm=net9.0 #3428

Merged
merged 9 commits into from
Oct 19, 2023
Merged

Add support for running with tfm=net9.0 #3428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
599a862
ChannelMap: add entry for 9.0
radical Oct 18, 2023
54dca4c
nuget.config: add dotnet9 source
radical Oct 19, 2023
e06e4e2
Add 9.0 versions for package references
radical Oct 19, 2023
3bb726c
[wasm] Pass correct runtime option for net9.0
radical Oct 19, 2023
dab60ae
Bump BDN to 0.13.10-nightly.20231019.90
radical Oct 19, 2023
899f69b
Merge remote-tracking branch 'origin/main' into net9
radical Oct 19, 2023
bda2d15
Update NuGet.config
radical Oct 19, 2023
88b8dcd
Address review feedback: add channel map entry for net9.0
radical Oct 19, 2023
4db01c7
Blazor: update warning condition for package versions needing an update
radical Oct 19, 2023
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
2 changes: 2 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<packageSources>
<clear />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PropertyGroup>
<MicrosoftNETILLinkTasksVersion>8.0.0-rtm.23518.26</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkPackageVersion>8.0.0-rtm.23518.26</MicrosoftNETILLinkPackageVersion>
<BenchmarkDotNetVersion>0.13.9-nightly.20230908.70</BenchmarkDotNetVersion>
<BenchmarkDotNetVersion>0.13.10-nightly.20231019.90</BenchmarkDotNetVersion>
<SystemThreadingChannelsPackageVersion>8.0.0-rtm.23518.26</SystemThreadingChannelsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>8.0.0-rtm.23518.26</MicrosoftExtensionsLoggingPackageVersion>
</PropertyGroup>
Expand Down
9 changes: 7 additions & 2 deletions scripts/channel_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
class ChannelMap():
channel_map = {
'main': {
'tfm': 'net8.0',
'branch': '8.0',
'tfm': 'net9.0',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also go ahead and add all of the release/9.0* branches as well?

'branch': '9.0',
'quality': 'daily'
},
'9.0': {
'tfm': 'net9.0',
'branch': '9.0',
'quality': 'daily'
},
'8.0': {
Expand Down
4 changes: 4 additions & 0 deletions scripts/micro_benchmarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@ def __get_benchmarkdotnet_arguments(framework: str, args: Any) -> List[str]:
run_args += ['--runtimes', 'wasmnet70']
elif framework == "net8.0":
run_args += ['--runtimes', 'wasmnet80']
elif framework == "net9.0":
run_args += ['--runtimes', 'wasmnet90']
else:
raise ArgumentTypeError('Framework {} is not supported for wasm'.format(framework))

# Increase default 2 min build timeout to accommodate slow (or even very slow) hardware
if not args.bdn_arguments or '--buildTimeout' not in args.bdn_arguments:
Expand Down
2 changes: 1 addition & 1 deletion src/scenarios/build-common/Blazor.Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Text="Package versions for blazor/aspnetcore not set. %24(AspNetCoreVersion)=$(AspNetCoreVersion), %24(BlazorVersion)==$(BlazorVersion), and %24(SystemNetHttpJsonVersion)=$(SystemNetHttpJsonVersion). TFM: $(TargetFramework)" />

<Warning
Condition="$(TargetFrameworks.Contains('net9.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionGreaterThan('$(TargetFrameworkVersion)', '9.0')))"
Condition="$(TargetFrameworks.Contains('net10.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionGreaterThan('$(TargetFrameworkVersion)', '9.0')))"
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)" />
</Target>

Expand Down
5 changes: 5 additions & 0 deletions src/scenarios/build-common/Blazor.PackageVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<Project>
<PropertyGroup Condition="$(TargetFrameworks.Contains('net9.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '9.0')))">
<AspNetCoreVersion>9.0.0-*</AspNetCoreVersion>
<BlazorVersion>9.0.0-*</BlazorVersion>
<SystemNetHttpJsonVersion>9.0.0-*</SystemNetHttpJsonVersion>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFrameworks.Contains('net8.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0')))">
<AspNetCoreVersion>8.0.0-*</AspNetCoreVersion>
<BlazorVersion>8.0.0-*</BlazorVersion>
Expand Down