Skip to content

Commit 10bc40c

Browse files
[main] Update dependencies from dotnet/runtime dotnet/efcore (#50019)
* Update dependencies from https://github.com/dotnet/runtime build 20230810.15
1 parent 50c9562 commit 10bc40c

File tree

9 files changed

+254
-232
lines changed

9 files changed

+254
-232
lines changed

eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ and are generated based on the last package release.
4040
<LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" />
4141
<LatestPackageReference Include="Microsoft.Extensions.DependencyModel" />
4242
<LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" />
43+
<LatestPackageReference Include="Microsoft.Extensions.Diagnostics.Abstractions" />
4344
<LatestPackageReference Include="Microsoft.Extensions.Diagnostics" />
4445
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" />
4546
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Composite" />

eng/SharedFramework.External.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
2222
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
2323
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
24+
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="$(MicrosoftExtensionsDiagnosticsAbstractionsVersion)" />
2425
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics" Version="$(MicrosoftExtensionsDiagnosticsVersion)" />
2526
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsVersion)" />
2627
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositeVersion)" />

eng/Version.Details.xml

Lines changed: 158 additions & 154 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 78 additions & 77 deletions
Large diffs are not rendered by default.

src/DefaultBuilder/DefaultBuilder.slnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"solution": {
33
"path": "..\\..\\AspNetCore.sln",
44
"projects": [
5+
"src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
56
"src\\DefaultBuilder\\samples\\SampleApp\\DefaultBuilder.SampleApp.csproj",
67
"src\\DefaultBuilder\\src\\Microsoft.AspNetCore.csproj",
78
"src\\DefaultBuilder\\test\\Microsoft.AspNetCore.FunctionalTests\\Microsoft.AspNetCore.FunctionalTests.csproj",
@@ -29,6 +30,7 @@
2930
"src\\Middleware\\HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj",
3031
"src\\Middleware\\StaticFiles\\src\\Microsoft.AspNetCore.StaticFiles.csproj",
3132
"src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
33+
"src\\Security\\Authentication\\Core\\src\\Microsoft.AspNetCore.Authentication.csproj",
3234
"src\\Security\\Authorization\\Core\\src\\Microsoft.AspNetCore.Authorization.csproj",
3335
"src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
3436
"src\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj",

src/DefaultBuilder/src/PublicAPI.Unshipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#nullable enable
2+
Microsoft.AspNetCore.Builder.WebApplicationBuilder.Metrics.get -> Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder!
23
static Microsoft.AspNetCore.Builder.WebApplication.CreateEmptyBuilder(Microsoft.AspNetCore.Builder.WebApplicationOptions! options) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder!
34
static Microsoft.AspNetCore.Builder.WebApplication.CreateSlimBuilder() -> Microsoft.AspNetCore.Builder.WebApplicationBuilder!
45
static Microsoft.AspNetCore.Builder.WebApplication.CreateSlimBuilder(Microsoft.AspNetCore.Builder.WebApplicationOptions! options) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder!

src/DefaultBuilder/src/WebApplicationBuilder.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Microsoft.AspNetCore.Http;
1212
using Microsoft.Extensions.Configuration;
1313
using Microsoft.Extensions.DependencyInjection;
14+
using Microsoft.Extensions.Diagnostics.Metrics;
1415
using Microsoft.Extensions.Hosting;
1516
using Microsoft.Extensions.Logging;
1617

@@ -347,6 +348,11 @@ private static void AddDefaultServicesSlim(ConfigurationManager configuration, I
347348
/// </summary>
348349
public ILoggingBuilder Logging => _hostApplicationBuilder.Logging;
349350

351+
/// <summary>
352+
/// Allows enabling metrics and directing their output.
353+
/// </summary>
354+
public IMetricsBuilder Metrics => _hostApplicationBuilder.Metrics;
355+
350356
/// <summary>
351357
/// An <see cref="IWebHostBuilder"/> for configuring server specific properties, but not building.
352358
/// To build after configuration, call <see cref="Build"/>.

src/Framework/test/TestData.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ static TestData()
120120
"Microsoft.Extensions.DependencyInjection",
121121
"Microsoft.Extensions.DependencyInjection.Abstractions",
122122
"Microsoft.Extensions.Diagnostics",
123+
"Microsoft.Extensions.Diagnostics.Abstractions",
123124
"Microsoft.Extensions.Diagnostics.HealthChecks",
124125
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions",
125126
"Microsoft.Extensions.FileProviders.Abstractions",
@@ -270,6 +271,7 @@ static TestData()
270271
{ "Microsoft.Extensions.DependencyInjection.Abstractions" },
271272
{ "Microsoft.Extensions.DependencyInjection" },
272273
{ "Microsoft.Extensions.Diagnostics" },
274+
{ "Microsoft.Extensions.Diagnostics.Abstractions" },
273275
{ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" },
274276
{ "Microsoft.Extensions.Diagnostics.HealthChecks" },
275277
{ "Microsoft.Extensions.Features" },

src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@
1919
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
2020
</ItemGroup>
2121

22-
<ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
2323
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0">
2424
<AllowExplicitReference>true</AllowExplicitReference>
2525
</PackageReference>
2626
</ItemGroup>
2727

28+
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
29+
<Reference Include="System.Diagnostics.DiagnosticSource" />
30+
</ItemGroup>
31+
2832
<ItemGroup>
2933
<Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
3034
<Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />

0 commit comments

Comments
 (0)