Skip to content

Commit 7fb2ff2

Browse files
LoopedBard3LoopedBard3
committed
Some more net11 updates.
1 parent 32e27ac commit 7fb2ff2

File tree

8 files changed

+15
-30
lines changed

8 files changed

+15
-30
lines changed

‎eng/performance/sdk_scenarios.proj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<Framework Include="net7.0" FrameworkName="%(Identity)" Condition="'$(FrameworkVersion)' &gt; '6.0'"/>
1313
<Framework Include="net8.0" FrameworkName="%(Identity)" Condition="'$(FrameworkVersion)' &gt; '7.0' and '$(PERFLAB_Framework)' != 'net9.0'"/>
1414
<Framework Include="net9.0" FrameworkName="%(Identity)" Condition="'$(FrameworkVersion)' &gt; '8.0'"/>
15-
<Framework Include="net10.0" FrameworkName="%(Identity)" Condition="'$(FrameworkVersion)' &gt; '9.0'"/>
15+
<Framework Include="net10.0" FrameworkName="%(Identity)" Condition="'$(FrameworkVersion)' &gt; '9.0' and '$(PERFLAB_Framework)' != 'net11.0'"/>
16+
<Framework Include="net11.0" FrameworkName="%(Identity)" Condition="'$(FrameworkVersion)' &gt; '10.0'"/>
1617
</ItemGroup>
1718

1819
<ItemDefinitionGroup>

‎eng/pipelines/templates/runtime-perf-job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
steps: []
33
variables: []
4-
framework: net10.0 # Specify the appropriate framework when running release branches (ie net6.0 for release/6.0)
4+
framework: net11.0 # Specify the appropriate framework when running release branches (ie net6.0 for release/6.0)
55
buildConfig: ''
66
archType: ''
77
osGroup: ''

‎scripts/dotnet.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ def get_target_framework_moniker(framework: str) -> str:
8383
return 'net9.0'
8484
if framework == 'nativeaot10.0':
8585
return 'net10.0'
86+
if framework == 'nativeaot11.0':
87+
return 'net11.0'
8688
else:
8789
return framework
8890

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,4 @@
3131
<BlazorVersion Condition="'$(BlazorVersion)' == ''">6.0.0-preview*</BlazorVersion>
3232
<SystemNetHttpJsonVersion Condition="'$(SystemNetHttpJsonVersion)' == ''">6.0.0-preview*</SystemNetHttpJsonVersion>
3333
</PropertyGroup>
34-
35-
<!-- Workaround: Explicit Microsoft.Extensions pre-release versions for net10.0.
36-
The WebAssembly SDK depends on Microsoft.Extensions packages with version >=10.0.0.
37-
Only pre-release (rtm/rc) builds are presently available in internal feeds; since
38-
NuGet treats pre-release < stable, transitive resolution fails. We force a floating
39-
pre-release selection via explicit PackageReferences conditioned on net10.0. -->
40-
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))">
41-
<ExtensionsVersion>10.0.0-*</ExtensionsVersion>
42-
</PropertyGroup>
43-
44-
<ItemGroup>
45-
<!-- Explicit extensions packages (conditional) -->
46-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
47-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
48-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
49-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
50-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
51-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
52-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
53-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
54-
<PackageReference Include="Microsoft.Extensions.Diagnostics" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
55-
</ItemGroup>
5634
</Project>

‎src/scenarios/shared/mauisharedpython.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def generate_maui_rollback_dict(target_framework: str):
2121
This eliminates the need to maintain MAUI dependencies in the performance repo's Version.Details.xml.
2222
2323
Args:
24-
target_framework: Target framework to determine which MAUI branch to use (e.g., "net10.0")
24+
target_framework: Target framework to determine which MAUI branch to use (e.g., "net11.0")
2525
2626
Returns:
2727
Dictionary mapping rollback package names to version/band strings
@@ -159,13 +159,13 @@ def extract_latest_dotnet_feed_from_nuget_config(path: str, offset: int = 0) ->
159159

160160
return target_feed
161161

162-
def download_maui_nuget_config(target_framework: str = "net10.0", output_filename: str = "MauiNuGet.config") -> str:
162+
def download_maui_nuget_config(target_framework: str = "net11.0", output_filename: str = "MauiNuGet.config") -> str:
163163
'''
164164
Download MAUI's NuGet.config from the appropriate branch.
165165
Returns the path to the downloaded config file.
166166
167167
Args:
168-
target_framework: Target framework to determine which branch to use (e.g., "net10.0")
168+
target_framework: Target framework to determine which branch to use (e.g., "net11.0")
169169
output_filename: Name of the file to save the downloaded config
170170
'''
171171
# Extract base framework version (e.g., "net10.0" from "net10.0-android")

‎src/tests/harness/BenchmarkDotNet.Extensions.Tests/BenchmarkDotNet.Extensions.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net10.0</TargetFrameworks>
4+
<TargetFrameworks>net11.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎src/tools/Reporting/Reporting.Tests/Reporting.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net10.0</TargetFrameworks>
4+
<TargetFrameworks>net11.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
8-
8+
99
<ItemGroup>
1010
<ProjectReference Include="..\Reporting\Reporting.csproj" />
1111
</ItemGroup>

‎src/tools/ResultsComparer/Data.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ private static string GetMoniker(string key)
162162
return "net10.0";
163163
if (key.StartsWith("nativeaot10.0"))
164164
return key;
165+
if (key.StartsWith("net11.0"))
166+
return "net11.0";
167+
if (key.StartsWith("nativeaot11.0"))
168+
return key;
165169

166170
return null;
167171
}

0 commit comments

Comments
 (0)