diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1788e2f574..45e4a2f9132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee - + https://github.com/dotnet/efcore - bbf353b1310aed12cf780bc95ab560f0e6b82627 + ea24bdd61de394dd82972be560db79b3fda050ee https://github.com/dotnet/runtime @@ -397,13 +397,13 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/extensions - 7c6fa3e84ea0b3d08998726c7cac30e3117ed318 + d669bb8deda7a1368a8fcfbcaade1a2ac4567340 - + https://github.com/dotnet/extensions - 7c6fa3e84ea0b3d08998726c7cac30e3117ed318 + 180ac3631b7f6f7c41b7cf7237b3fbe6ce1e870f https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 489879e3e50..39186a4987f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -139,17 +139,17 @@ 8.0.0-rtm.23477.9 8.0.0-rtm.23477.9 - 8.0.0-rc.2.23461.3 - 8.0.0-rc.2.23461.3 + 8.0.0-rtm.23473.1 + 8.0.0-rtm.23477.5 - 8.0.0-rc.2.23462.14 - 8.0.0-rc.2.23462.14 - 8.0.0-rc.2.23462.14 - 8.0.0-rc.2.23462.14 - 8.0.0-rc.2.23462.14 - 8.0.0-rc.2.23462.14 - 8.0.0-rc.2.23462.14 - 8.0.0-rc.2.23462.14 + 8.0.0-rtm.23478.4 + 8.0.0-rtm.23478.4 + 8.0.0-rtm.23478.4 + 8.0.0-rtm.23478.4 + 8.0.0-rtm.23478.4 + 8.0.0-rtm.23478.4 + 8.0.0-rtm.23478.4 + 8.0.0-rtm.23478.4 4.7.0-3.23314.3 4.7.0-3.23314.3 diff --git a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs index b547292c02c..1f3b4380e91 100644 --- a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs +++ b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs @@ -10,9 +10,9 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Moq; namespace Microsoft.AspNetCore.Hosting.Tests; diff --git a/src/Hosting/Hosting/test/HostingMetricsTests.cs b/src/Hosting/Hosting/test/HostingMetricsTests.cs index ad479b6aa66..411e396b688 100644 --- a/src/Hosting/Hosting/test/HostingMetricsTests.cs +++ b/src/Hosting/Hosting/test/HostingMetricsTests.cs @@ -9,8 +9,8 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Telemetry.Testing.Metrics; namespace Microsoft.AspNetCore.Hosting.Tests; diff --git a/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs b/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs index 77aff5341c7..8d87766d885 100644 --- a/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs +++ b/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs @@ -10,10 +10,10 @@ using Microsoft.AspNetCore.Routing.Matching; using Microsoft.AspNetCore.Routing.Patterns; using Microsoft.AspNetCore.Routing.TestObjects; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Moq; namespace Microsoft.AspNetCore.Routing; diff --git a/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs b/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs index 06e202c67af..87dbf26805f 100644 --- a/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs +++ b/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs @@ -15,9 +15,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Telemetry.Testing.Metrics; namespace Microsoft.AspNetCore.Diagnostics; diff --git a/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs index 88c55e7a517..a2f4b160002 100644 --- a/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs +++ b/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs @@ -19,7 +19,7 @@ using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Testing.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Moq; namespace Microsoft.AspNetCore.Diagnostics; diff --git a/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs index 25358538354..cf55e0f30df 100644 --- a/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs +++ b/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs @@ -14,7 +14,7 @@ using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; -using Microsoft.Extensions.Telemetry.Testing.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; namespace Microsoft.AspNetCore.Diagnostics; diff --git a/src/Middleware/RateLimiting/test/RateLimitingMetricsTests.cs b/src/Middleware/RateLimiting/test/RateLimitingMetricsTests.cs index 480f57f085b..584665b6af3 100644 --- a/src/Middleware/RateLimiting/test/RateLimitingMetricsTests.cs +++ b/src/Middleware/RateLimiting/test/RateLimitingMetricsTests.cs @@ -11,10 +11,10 @@ using Microsoft.AspNetCore.Routing.Patterns; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Moq; namespace Microsoft.AspNetCore.RateLimiting; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs index 0f407106a6d..a37cb5c7133 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport using Microsoft.AspNetCore.Server.Kestrel.Tests; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Testing.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs index 617d6974611..fb57b97af78 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Telemetry.Testing.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests; diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs index b6cec58fd34..22929eb57af 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs @@ -14,9 +14,9 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Features; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Metrics; namespace Interop.FunctionalTests.Http2; diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs index f13a4a7e6fd..1c71550c2a6 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs @@ -3,10 +3,8 @@ using System.Diagnostics; using System.Diagnostics.Metrics; -using System.Globalization; using System.Net; using System.Net.Http; -using System.Net.Quic; using System.Net.Security; using System.Text; using Microsoft.AspNetCore.Connections; @@ -19,13 +17,11 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Https; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Primitives; -using Microsoft.Extensions.Telemetry.Testing.Metrics; -using Xunit; namespace Interop.FunctionalTests.Http3; diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index b6d16dfb935..e02d92df21d 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -36,12 +36,12 @@ using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Microsoft.IdentityModel.Tokens; using Moq; using Newtonsoft.Json;