Skip to content

Commit 0abb43f

Browse files
Merge pull request #3324 from dotnet/main
✅ Merge `main` into `live`
2 parents 8a3cf0b + b8893ef commit 0abb43f

File tree

14 files changed

+76
-21
lines changed

14 files changed

+76
-21
lines changed

.github/dependabot.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,17 @@ updates:
261261
dotnet:
262262
patterns:
263263
- "*" # Prefer a single PR per solution update.
264+
- package-ecosystem: "nuget"
265+
directory: "/docs/fundamentals/snippets/referenceexpressions" #AspireReferenceExpressions.sln
266+
schedule:
267+
interval: "weekly"
268+
day: "wednesday"
269+
open-pull-requests-limit: 5
270+
groups:
271+
# Group .NET updates together for solutions.
272+
dotnet:
273+
patterns:
274+
- "*" # Prefer a single PR per solution update.
264275
- package-ecosystem: "nuget"
265276
directory: "/docs/fundamentals/snippets/volumes" #VolumeMounts.sln
266277
schedule:
@@ -1108,6 +1119,50 @@ updates:
11081119
dotnet:
11091120
patterns:
11101121
- "*" # Prefer a single PR per project update.
1122+
- package-ecosystem: "nuget"
1123+
directory: "/docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.AppHost" #AspireReferenceExpressions.AppHost.csproj
1124+
schedule:
1125+
interval: "weekly"
1126+
day: "wednesday"
1127+
open-pull-requests-limit: 5
1128+
groups:
1129+
# Group .NET updates together for projects.
1130+
dotnet:
1131+
patterns:
1132+
- "*" # Prefer a single PR per project update.
1133+
- package-ecosystem: "nuget"
1134+
directory: "/docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.CatalogAPI" #AspireReferenceExpressions.CatalogAPI.csproj
1135+
schedule:
1136+
interval: "weekly"
1137+
day: "wednesday"
1138+
open-pull-requests-limit: 5
1139+
groups:
1140+
# Group .NET updates together for projects.
1141+
dotnet:
1142+
patterns:
1143+
- "*" # Prefer a single PR per project update.
1144+
- package-ecosystem: "nuget"
1145+
directory: "/docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.CustomerAPI" #AspireReferenceExpressions.CustomerAPI.csproj
1146+
schedule:
1147+
interval: "weekly"
1148+
day: "wednesday"
1149+
open-pull-requests-limit: 5
1150+
groups:
1151+
# Group .NET updates together for projects.
1152+
dotnet:
1153+
patterns:
1154+
- "*" # Prefer a single PR per project update.
1155+
- package-ecosystem: "nuget"
1156+
directory: "/docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.ServiceDefaults" #AspireReferenceExpressions.ServiceDefaults.csproj
1157+
schedule:
1158+
interval: "weekly"
1159+
day: "wednesday"
1160+
open-pull-requests-limit: 5
1161+
groups:
1162+
# Group .NET updates together for projects.
1163+
dotnet:
1164+
patterns:
1165+
- "*" # Prefer a single PR per project update.
11111166
- package-ecosystem: "nuget"
11121167
directory: "/docs/fundamentals/snippets/template/YourAppName" #YourAppName.ServiceDefaults.csproj
11131168
schedule:

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
74+
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
7575
with:
7676
sarif_file: results.sarif

docs/frameworks/snippets/Orleans/OrleansServiceDefaults/OrleansServiceDefaults.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
1212
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
13-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
14-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
13+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
14+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
1515
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
1616

1717
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />

docs/fundamentals/dashboard/automation/aspire-dashboard/Aspire.Dashboard.ScreenCapture/Aspire.Dashboard.ScreenCapture.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.4" />
1717
<PackageReference Include="Microsoft.Playwright" Version="1.52.0" />
1818
<PackageReference Include="xunit" Version="2.9.3" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
19+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>

docs/fundamentals/dashboard/automation/aspire-dashboard/AspireSample/AspireSample.ServiceDefaults/AspireSample.ServiceDefaults.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.1" />
1515
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
1919
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
2020
</ItemGroup>
2121

docs/fundamentals/snippets/custom-urls/AspireApp.Api/AspireApp.Api.csproj

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

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
11-
<PackageReference Include="Scalar.AspNetCore" Version="2.2.2" />
11+
<PackageReference Include="Scalar.AspNetCore" Version="2.2.5" />
1212
</ItemGroup>
1313

1414
</Project>

docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.AppHost/AspireReferenceExpressions.AppHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
14+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.1" />
1515
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.2.1" />
1616
</ItemGroup>
1717

docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.CatalogAPI/AspireReferenceExpressions.CatalogAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.CustomerAPI/AspireReferenceExpressions.CustomerAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

docs/fundamentals/snippets/referenceexpressions/AspireReferenceExpressions.ServiceDefaults/AspireReferenceExpressions.ServiceDefaults.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

1313
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
16-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.1" />
15+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
16+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
1919
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
2020
</ItemGroup>
2121

docs/real-time/snippets/signalr/SignalR.ApiService/SignalR.ApiService.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.30.3" />
1212
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.30.2" />
1313
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
14-
<PackageReference Include="Scalar.AspNetCore" Version="2.2.2" />
14+
<PackageReference Include="Scalar.AspNetCore" Version="2.2.5" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

docs/real-time/snippets/signalr/SignalR.ServiceDefaults/SignalR.ServiceDefaults.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.1" />
1515
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
1919
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
2020
</ItemGroup>
2121

docs/testing/snippets/testing/xunit/AspireApp.ServiceDefaults/AspireApp.ServiceDefaults.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.1" />
1515
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
1919
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
2020
</ItemGroup>
2121

docs/testing/snippets/testing/xunit/AspireApp.Tests/AspireApp.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="coverlet.collector" Version="6.0.4" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1616
<PackageReference Include="xunit" Version="2.9.3" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)