Skip to content

Commit 596932a

Browse files
danmoseleydanmoseley
authored
Merge branch 'main' into dependabot/nuget/SkiaSharp-3.116.1
2 parents 80e1cbd + 2c75227 commit 596932a

File tree

50 files changed

+6680
-6218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+6680
-6218
lines changed

‎samples/AspireShop/AspireShop.ServiceDefaults/AspireShop.ServiceDefaults.csproj

+10-7
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@
1111
<ItemGroup>
1212
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1313

14-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
1515
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
16+
<!-- Open Telemetry -->
17+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
18+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
1920
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
21-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
22-
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="8.0.1" />
21+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
22+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
23+
<!-- Health checks -->
24+
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
25+
2326
<PackageReference Include="Grpc.HealthCheck" Version="2.66.0" />
2427
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.66.0" />
2528
</ItemGroup>

‎samples/AspireWithAzureFunctions/ImageGallery.Functions/ImageGallery.Functions.csproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Blobs" Version="6.6.0" />
1515
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.5.0" />
1616
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.9.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
1919
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="9.0.0" />
2020
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="9.0.0" />
21+
2122
<PackageReference Include="SkiaSharp" Version="3.116.1" />
22-
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
23+
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.116.1" />
24+
2325
</ItemGroup>
2426
<ItemGroup>
2527
<ProjectReference Include="..\ImageGallery.ServiceDefaults\ImageGallery.ServiceDefaults.csproj" />

‎samples/AspireWithAzureFunctions/ImageGallery.ServiceDefaults/ImageGallery.ServiceDefaults.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<ItemGroup>
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

13-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
13+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
1414
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
16-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
16+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
2020
</ItemGroup>
2121

2222
</Project>

‎samples/AspireWithDapr/AspireWithDapr.ServiceDefaults/AspireWithDapr.ServiceDefaults.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<ItemGroup>
1212
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1313

14-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
1515
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
16+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
17+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
1919
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
21-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
20+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
21+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
2222
</ItemGroup>
2323

2424
</Project>

0 commit comments

Comments
 (0)