diff --git a/azure-pipelines.yml b/azure-pipelines.yml index aa60b6f570e..08576ffdda2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -149,6 +149,7 @@ jobs: runCategories: 'runtime libraries' channels: - main + - nativeaot9.0 - nativeaot8.0 - 8.0 diff --git a/scripts/channel_map.py b/scripts/channel_map.py index e457b4cbb68..89e90520cc7 100644 --- a/scripts/channel_map.py +++ b/scripts/channel_map.py @@ -12,6 +12,11 @@ class ChannelMap(): 'branch': '9.0', 'quality': 'daily' }, + 'nativeaot9.0': { + 'tfm': 'nativeaot9.0', + 'branch': '9.0', + 'quality': 'daily' + }, '8.0': { 'tfm': 'net8.0', 'branch': '8.0', diff --git a/scripts/dotnet.py b/scripts/dotnet.py index f7af097faf7..8e81ca4c65c 100755 --- a/scripts/dotnet.py +++ b/scripts/dotnet.py @@ -84,6 +84,8 @@ def get_target_framework_moniker(framework: str) -> str: return 'net7.0' if framework == 'nativeaot8.0': return 'net8.0' + if framework == 'nativeaot9.0': + return 'net9.0' else: return framework diff --git a/src/tools/ResultsComparer/Data.cs b/src/tools/ResultsComparer/Data.cs index 37ce3ae9574..d6976408a6b 100644 --- a/src/tools/ResultsComparer/Data.cs +++ b/src/tools/ResultsComparer/Data.cs @@ -150,6 +150,14 @@ private static string GetMoniker(string key) return "nativeaot8.0-preview" + key[key.IndexOf("nativeaot8.0-preview") + "nativeaot8.0-preview".Length]; if (key.Contains("net8.0")) return "net8.0"; + if (key.Contains("net9.0-preview")) + return "net9.0-preview" + key[key.IndexOf("net9.0-preview") + "net9.0-preview".Length]; + if (key.Contains("net9.0-rc")) + return "net9.0-rc" + key[key.IndexOf("net9.0-rc") + "net9.0-rc".Length]; + if (key.Contains("nativeaot9.0-preview")) + return "nativeaot9.0-preview" + key[key.IndexOf("nativeaot9.0-preview") + "nativeaot9.0-preview".Length]; + if (key.Contains("net9.0")) + return "net9.0"; return null; } @@ -167,7 +175,7 @@ private static string GetSimplifiedProcessorName(string processorName) if (segment[0] == 'i' || segment[0] == 'E') // things like i7-8700 or E5530 return segment.Replace("-", ""); if (segment.EndsWith("CL") - || segment.EndsWith("X") // things like AMD 3945WX or 5900X + || segment.EndsWith("X") // things like AMD 3945WX or 5900X || segment.StartsWith("SQ") // things like SQ1 || segment.StartsWith("M1") || segment.StartsWith("ARM")) // things like ARMv7