Skip to content

Commit 8df3159

Browse files
joperezrericstj
joperezr
and
ericstj
authored
Added net10.0 targeting to all packages and flowed RC2 dependency versions. (#6995)
* Added net10.0 targeting to all packages and flowed RC2 dependency versions. * Fixing several failing tests in net10 * Stabilize ResourceMonitoringServiceTests using polling with FakeTimeProvider Replace single clock.Advance/Wait uses with a polling loop that repeatedly advances the FakeTimeProvider and briefly waits to ensure ExecuteAsync's _delay_ is armed and completes across different runtimes. Add a maxAttempts guard and assertions to avoid indefinite hangs and to validate that a log record or publisher invocation actually occurred before proceeding. * Mark RunTrackerAsync_IfProviderThrows_LogsError conditional for .NET 10 and skip on Windows Add NET10_0_OR_GREATER preprocessor block and apply ConditionalFact plus OSSkipCondition to avoid flaky behavior on Windows for .NET 10. * Adjust NET10 compilation conditional and add missing using in ResourceMonitoringServiceTests Replace NET10_0_OR_GREATER with NET10_0 so the ConditionalFact/OS skip targets .NET 10 only, and add the missing Microsoft.TestUtilities using required for OSSkipCondition. This stabilizes the RunTrackerAsync_IfProviderThrows_LogsError test behavior on .NET 10. * Make sure we can resolve DeriveAIContent JsonTypeInfo * Skip flaky test --------- Co-authored-by: Eric St. John <[email protected]>
1 parent a2d763f commit 8df3159

File tree

16 files changed

+184
-24
lines changed

16 files changed

+184
-24
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<!-- TFMs and their permutations -->
66
<PropertyGroup>
77
<TargetFrameworkName>net</TargetFrameworkName>
8-
<TargetFrameworkMajorVersion>9</TargetFrameworkMajorVersion>
8+
<TargetFrameworkMajorVersion>10</TargetFrameworkMajorVersion>
99
<TargetFrameworkMinorVersion>0</TargetFrameworkMinorVersion>
1010
<TargetFrameworkVersion>$(TargetFrameworkMajorVersion).$(TargetFrameworkMinorVersion)</TargetFrameworkVersion>
1111

1212
<!-- The latest TFM we're targeting overall -->
1313
<LatestTargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</LatestTargetFramework>
1414
<!-- All the .NET TFMs we're building -->
1515
<SupportedNetCoreTargetFrameworks>$(LatestTargetFramework)</SupportedNetCoreTargetFrameworks>
16-
<NetCoreTargetFrameworks>$(SupportedNetCoreTargetFrameworks);net8.0</NetCoreTargetFrameworks>
16+
<NetCoreTargetFrameworks>$(SupportedNetCoreTargetFrameworks);net9.0;net8.0</NetCoreTargetFrameworks>
1717

1818
<!-- The minimum supported .NET version for external consumers. This is used for packaging control, see Packaging.targets -->
1919
<MinimumSupportedTfmForPackaging>net8.0</MinimumSupportedTfmForPackaging>

‎eng/Versions.props‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,63 @@
8888
<!-- Dependencies from https://github.com/dotnet/arcade -->
8989
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksTemplatingVersion>
9090
</PropertyGroup>
91+
<PropertyGroup Label="net10">
92+
<!-- Packages from dotnet/runtime -->
93+
<MicrosoftBclAsyncInterfacesNet10Version>10.0.0-rc.2.25502.107</MicrosoftBclAsyncInterfacesNet10Version>
94+
<MicrosoftBclMemoryNet10Version>10.0.0-rc.2.25502.107</MicrosoftBclMemoryNet10Version>
95+
<MicrosoftBclTimeProviderNet10Version>10.0.0-rc.2.25502.107</MicrosoftBclTimeProviderNet10Version>
96+
<MicrosoftExtensionsCachingAbstractionsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsCachingAbstractionsNet10Version>
97+
<MicrosoftExtensionsCachingMemoryNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsCachingMemoryNet10Version>
98+
<MicrosoftExtensionsConfigurationAbstractionsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsConfigurationAbstractionsNet10Version>
99+
<MicrosoftExtensionsConfigurationBinderNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsConfigurationBinderNet10Version>
100+
<MicrosoftExtensionsConfigurationJsonNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsConfigurationJsonNet10Version>
101+
<MicrosoftExtensionsConfigurationNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsConfigurationNet10Version>
102+
<MicrosoftExtensionsDependencyInjectionAbstractionsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsDependencyInjectionAbstractionsNet10Version>
103+
<MicrosoftExtensionsDependencyInjectionNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsDependencyInjectionNet10Version>
104+
<MicrosoftExtensionsDiagnosticsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsDiagnosticsNet10Version>
105+
<MicrosoftExtensionsHostingAbstractionsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsHostingAbstractionsNet10Version>
106+
<MicrosoftExtensionsHostingNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsHostingNet10Version>
107+
<MicrosoftExtensionsHttpNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsHttpNet10Version>
108+
<MicrosoftExtensionsLoggingAbstractionsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsLoggingAbstractionsNet10Version>
109+
<MicrosoftExtensionsLoggingConfigurationNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsLoggingConfigurationNet10Version>
110+
<MicrosoftExtensionsLoggingConsoleNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsLoggingConsoleNet10Version>
111+
<MicrosoftExtensionsLoggingNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsLoggingNet10Version>
112+
<MicrosoftExtensionsOptionsConfigurationExtensionsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsOptionsConfigurationExtensionsNet10Version>
113+
<MicrosoftExtensionsOptionsNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsOptionsNet10Version>
114+
<MicrosoftExtensionsPrimitivesNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsPrimitivesNet10Version>
115+
<MicrosoftNETCoreAppRefNet10Version>10.0.0-rc.2.25502.107</MicrosoftNETCoreAppRefNet10Version>
116+
<MicrosoftNETCoreAppRuntimewinx64Net10Version>10.0.0-rc.2.25502.107</MicrosoftNETCoreAppRuntimewinx64Net10Version>
117+
<SystemCollectionsImmutableNet10Version>10.0.0-rc.2.25502.107</SystemCollectionsImmutableNet10Version>
118+
<SystemConfigurationConfigurationManagerNet10Version>10.0.0-rc.2.25502.107</SystemConfigurationConfigurationManagerNet10Version>
119+
<SystemDiagnosticsDiagnosticSourceNet10Version>10.0.0-rc.2.25502.107</SystemDiagnosticsDiagnosticSourceNet10Version>
120+
<SystemDiagnosticsPerformanceCounterNet10Version>10.0.0-rc.2.25502.107</SystemDiagnosticsPerformanceCounterNet10Version>
121+
<SystemIOHashingNet10Version>10.0.0-rc.2.25502.107</SystemIOHashingNet10Version>
122+
<SystemIOPipelinesNet10Version>10.0.0-rc.2.25502.107</SystemIOPipelinesNet10Version>
123+
<SystemMemoryDataNet10Version>10.0.0-rc.2.25502.107</SystemMemoryDataNet10Version>
124+
<SystemNetHttpJsonNet10Version>10.0.0-rc.2.25502.107</SystemNetHttpJsonNet10Version>
125+
<SystemRuntimeCachingNet10Version>10.0.0-rc.2.25502.107</SystemRuntimeCachingNet10Version>
126+
<SystemSecurityCryptographyPkcsNet10Version>10.0.0-rc.2.25502.107</SystemSecurityCryptographyPkcsNet10Version>
127+
<SystemSecurityCryptographyXmlNet10Version>10.0.0-rc.2.25502.107</SystemSecurityCryptographyXmlNet10Version>
128+
<SystemTextEncodingsWebNet10Version>10.0.0-rc.2.25502.107</SystemTextEncodingsWebNet10Version>
129+
<SystemNumericsTensorsNet10Version>10.0.0-rc.2.25502.107</SystemNumericsTensorsNet10Version>
130+
<SystemTextJsonNet10Version>10.0.0-rc.2.25502.107</SystemTextJsonNet10Version>
131+
<SystemThreadingChannelsNet10Version>10.0.0-rc.2.25502.107</SystemThreadingChannelsNet10Version>
132+
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
133+
<MicrosoftAspNetCoreAppRefNet10Version>10.0.0-rc.2.25502.107</MicrosoftAspNetCoreAppRefNet10Version>
134+
<MicrosoftAspNetCoreAppRuntimewinx64Net10Version>10.0.0-rc.2.25502.107</MicrosoftAspNetCoreAppRuntimewinx64Net10Version>
135+
<MicrosoftAspNetCoreMvcTestingNet10Version>10.0.0-rc.2.25502.107</MicrosoftAspNetCoreMvcTestingNet10Version>
136+
<MicrosoftAspNetCoreTestHostNet10Version>10.0.0-rc.2.25502.107</MicrosoftAspNetCoreTestHostNet10Version>
137+
<MicrosoftExtensionsCachingSqlServerNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsCachingSqlServerNet10Version>
138+
<MicrosoftExtensionsCachingStackExchangeRedisNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsCachingStackExchangeRedisNet10Version>
139+
<MicrosoftExtensionsDiagnosticsHealthChecksNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsDiagnosticsHealthChecksNet10Version>
140+
<MicrosoftExtensionsFeaturesNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsFeaturesNet10Version>
141+
<MicrosoftExtensionsHttpPollyNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsHttpPollyNet10Version>
142+
<MicrosoftExtensionsObjectPoolNet10Version>10.0.0-rc.2.25502.107</MicrosoftExtensionsObjectPoolNet10Version>
143+
<!-- Dependencies from https://github.com/dotnet/efcore -->
144+
<MicrosoftEntityFrameworkCoreSqliteNet10Version>10.0.0-rc.2.25502.107</MicrosoftEntityFrameworkCoreSqliteNet10Version>
145+
<!-- Dependencies from https://github.com/dotnet/arcade -->
146+
<MicrosoftDotNetBuildTasksTemplatingNet10Version>10.0.0-rc.2.25502.107</MicrosoftDotNetBuildTasksTemplatingNet10Version>
147+
</PropertyGroup>
91148
<PropertyGroup Label="No longer automated Maestro dependency updates">
92149
<!-- Packages from dotnet/runtime -->
93150
<MicrosoftBclAsyncInterfacesLTSVersion>8.0.0</MicrosoftBclAsyncInterfacesLTSVersion>

‎eng/packages/General-LTS.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- The items in this ItemGroup are packages coming from aspnetcore and runtime repos. When an asset is not targeting net9.0 version
44
of the framework, we should use the following LTS versions instead -->
5-
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0' And '$(ForceLatestDotnetVersions)' != 'true'">
5+
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0' And '$(TargetFramework)' != 'net10.0' And '$(ForceLatestDotnetVersions)' != 'true'">
66
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesLTSVersion)" />
77
<PackageVersion Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" /> <!-- Note there is no 8.0 version of Microsoft.Bcl.Memory -->
88
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="$(MicrosoftBclTimeProviderLTSVersion)" />

‎eng/packages/General-net10.props‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<Project>
2+
3+
<!-- The items in this ItemGroup are packages coming from aspnetcore and runtime repos. When an asset is targeting net9.0 version
4+
of the framework, the following versions should be used. -->
5+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0' Or '$(ForceLatestDotnetVersions)' == 'true'">
6+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesNet10Version)" />
7+
<PackageVersion Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryNet10Version)" />
8+
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="$(MicrosoftBclTimeProviderNet10Version)" />
9+
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsNet10Version)" />
10+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryNet10Version)" />
11+
<PackageVersion Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerNet10Version)" />
12+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsCachingStackExchangeRedisNet10Version)" />
13+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsNet10Version)" />
14+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderNet10Version)" />
15+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonNet10Version)" />
16+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationNet10Version)" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsNet10Version)" />
18+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionNet10Version)" />
19+
<PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="$(MicrosoftExtensionsDiagnosticsNet10Version)" />
20+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksNet10Version)" />
21+
<PackageVersion Include="Microsoft.Extensions.Features" Version="$(MicrosoftExtensionsFeaturesNet10Version)" />
22+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsNet10Version)" />
23+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingNet10Version)" />
24+
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsHttpPollyNet10Version)" />
25+
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpNet10Version)" />
26+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsNet10Version)" />
27+
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationNet10Version)" />
28+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleNet10Version)" />
29+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingNet10Version)" />
30+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolNet10Version)" />
31+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsNet10Version)" />
32+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsNet10Version)" />
33+
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesNet10Version)" />
34+
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableNet10Version)" />
35+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceNet10Version)" />
36+
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="$(SystemDiagnosticsPerformanceCounterNet10Version)" />
37+
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingNet10Version)" />
38+
<PackageVersion Include="System.IO.Pipelines" Version="$(SystemIOPipelinesNet10Version)" />
39+
<PackageVersion Include="System.Memory.Data" Version="$(SystemMemoryDataNet10Version)" />
40+
<PackageVersion Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonNet10Version)" />
41+
<PackageVersion Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebNet10Version)" />
42+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonNet10Version)" />
43+
<PackageVersion Include="System.Threading.Channels" Version="$(SystemThreadingChannelsNet10Version)" />
44+
</ItemGroup>
45+
46+
</Project>

‎eng/packages/General-net9.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- The items in this ItemGroup are packages coming from aspnetcore and runtime repos. When an asset is targeting net9.0 version
44
of the framework, the following versions should be used. -->
5-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' Or '$(ForceLatestDotnetVersions)' == 'true'">
5+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' And '$(ForceLatestDotnetVersions)' != 'true'">
66
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
77
<PackageVersion Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
88
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="$(MicrosoftBclTimeProviderVersion)" />

‎eng/packages/General.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,6 @@
5959

6060
<Import Project="General-LTS.props" />
6161
<Import Project="General-net9.props" />
62+
<Import Project="General-net10.props" />
6263

6364
</Project>

‎eng/packages/TestOnly.props‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,13 @@
4141
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.11" />
4242
</ItemGroup>
4343

44-
<ItemGroup Condition="'$(TargetFramework)' == '$(LatestTargetFramework)'">
44+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
4545
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftAspNetCoreMvcTestingVersion)" />
4646
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostVersion)" />
4747
</ItemGroup>
48+
49+
<ItemGroup Condition="'$(TargetFramework)' == '$(LatestTargetFramework)'">
50+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftAspNetCoreMvcTestingNet10Version)" />
51+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostNet10Version)" />
52+
</ItemGroup>
4853
</Project>

‎src/Shared/Shared.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<ItemGroup>
3030
<Compile Remove="FxPolyfills\**" />
31+
<Compile Condition="'$(TargetFramework)' == 'net10.0'" Remove="ServerSentEvents\**" />
3132
</ItemGroup>
3233

3334
<ItemGroup>

‎test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Utilities/AIJsonUtilitiesTests.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,10 @@ public static void AddAIContentType_BuiltInAIContent_ThrowsArgumentException()
10811081
[Fact]
10821082
public static void AddAIContentType_ConflictingIdentifier_ThrowsInvalidOperationException()
10831083
{
1084-
JsonSerializerOptions options = new();
1084+
JsonSerializerOptions options = new()
1085+
{
1086+
TypeInfoResolver = JsonTypeInfoResolver.Combine(AIJsonUtilities.DefaultOptions.TypeInfoResolver, JsonContext.Default),
1087+
};
10851088
options.AddAIContentType<DerivedAIContent>("text");
10861089
options.AddAIContentType<DerivedAIContent>("audio");
10871090

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
using System.Diagnostics.CodeAnalysis;
77
using System.Diagnostics.Metrics;
88
using System.IO;
9+
#if !NET10_0
910
using System.Linq;
11+
#endif
1012
using System.Threading;
1113
using System.Threading.Tasks;
1214
using Microsoft.Extensions.Configuration;

0 commit comments

Comments
 (0)