diff --git a/NuGet.config b/NuGet.config index 94b1fa58f8c..c0a4a2983a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,8 @@ + + diff --git a/eng/Versions.props b/eng/Versions.props index 634bf20a11b..e493e216b6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 8.0.0-rtm.23518.26 8.0.0-rtm.23518.26 - 0.13.9-nightly.20230908.70 + 0.13.10-nightly.20231019.90 8.0.0-rtm.23518.26 8.0.0-rtm.23518.26 diff --git a/scripts/channel_map.py b/scripts/channel_map.py index 2a38c3f8f1a..e457b4cbb68 100644 --- a/scripts/channel_map.py +++ b/scripts/channel_map.py @@ -3,8 +3,13 @@ class ChannelMap(): channel_map = { 'main': { - 'tfm': 'net8.0', - 'branch': '8.0', + 'tfm': 'net9.0', + 'branch': '9.0', + 'quality': 'daily' + }, + '9.0': { + 'tfm': 'net9.0', + 'branch': '9.0', 'quality': 'daily' }, '8.0': { diff --git a/scripts/micro_benchmarks.py b/scripts/micro_benchmarks.py index 98305424deb..81126b9eb08 100755 --- a/scripts/micro_benchmarks.py +++ b/scripts/micro_benchmarks.py @@ -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: diff --git a/src/scenarios/build-common/Blazor.Directory.Build.targets b/src/scenarios/build-common/Blazor.Directory.Build.targets index 1996c482497..d58c684292e 100644 --- a/src/scenarios/build-common/Blazor.Directory.Build.targets +++ b/src/scenarios/build-common/Blazor.Directory.Build.targets @@ -5,7 +5,7 @@ Text="Package versions for blazor/aspnetcore not set. %24(AspNetCoreVersion)=$(AspNetCoreVersion), %24(BlazorVersion)==$(BlazorVersion), and %24(SystemNetHttpJsonVersion)=$(SystemNetHttpJsonVersion). TFM: $(TargetFramework)" /> diff --git a/src/scenarios/build-common/Blazor.PackageVersions.props b/src/scenarios/build-common/Blazor.PackageVersions.props index e2b4415a199..2240cff4408 100644 --- a/src/scenarios/build-common/Blazor.PackageVersions.props +++ b/src/scenarios/build-common/Blazor.PackageVersions.props @@ -1,4 +1,9 @@ + + 9.0.0-* + 9.0.0-* + 9.0.0-* + 8.0.0-* 8.0.0-*