Skip to content

Commit e1a6eee

Browse files
hangyhangy
committed
Merge remote-tracking branch 'origin/dev' into beta
2 parents 6970d03 + eacb78e commit e1a6eee

8 files changed

Lines changed: 236 additions & 295 deletions

File tree

‎.github/workflows/component-detection.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v6
1616
- name: Component detection
17-
uses: advanced-security/component-detection-dependency-submission-action@v0.1.0
17+
uses: advanced-security/component-detection-dependency-submission-action@v0.1.1

‎Directory.Packages.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<PackageVersion Include="Microsoft.Build" Version="18.0.2" />
1414
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
1515
<PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
16-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
17-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
18-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
19-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
16+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
17+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
18+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
19+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
2020
<PackageVersion Include="Fluid.Core" Version="2.31.0" />
2121
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2222
<PackageVersion Include="xunit" Version="2.9.3" />
@@ -29,17 +29,17 @@
2929

3030
<!-- Framework-specific versions: keep 9.x for net9.0 and move to 10.0.0 for net10.0 -->
3131
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'" Label="Microsoft-net9">
32-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
32+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.12" />
3333
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11" />
3434
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.11" />
3535
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.11" />
3636
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.1" />
37-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
37+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.12" />
3838
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.11" />
3939
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.11" />
4040
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.11" />
4141
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.11" />
42-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.12" />
4343
</ItemGroup>
4444

4545
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'" Label="Microsoft-net10">

‎examples/minimal-api/src/AlbusKavaliro.TempMaiSe.Samples.Api/packages.lock.json‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -159,38 +159,38 @@
159159
},
160160
"OpenTelemetry.Exporter.Console": {
161161
"type": "Direct",
162-
"requested": "[1.14.0, )",
163-
"resolved": "1.14.0",
164-
"contentHash": "u0ekKB603NBrll76bK/wkLTnD/bl+5QMrXZKOA6oW+H383E2z5gfaWSrwof94URuvTFrtWRQcLKH+hhPykfM2w==",
162+
"requested": "[1.15.0, )",
163+
"resolved": "1.15.0",
164+
"contentHash": "Jweov3Q70xmy5U8bwab8xd+xAuaFBI4695q/IpH4/dcAwKytyB+WhV5HufmKfXiKZhRbSEo8piG+i1ENEmdFXw==",
165165
"dependencies": {
166-
"OpenTelemetry": "1.14.0"
166+
"OpenTelemetry": "1.15.0"
167167
}
168168
},
169169
"OpenTelemetry.Extensions.Hosting": {
170170
"type": "Direct",
171-
"requested": "[1.14.0, )",
172-
"resolved": "1.14.0",
173-
"contentHash": "ZAxkCIa3Q3YWZ1sGrolXfkhPqn2PFSz2Cel74em/fATZgY5ixlw6MQp2icmqKCz4C7M1W2G0b92K3rX8mOtFRg==",
171+
"requested": "[1.15.0, )",
172+
"resolved": "1.15.0",
173+
"contentHash": "RixjKyB1pbYGhWdvPto4KJs+exdQknJsnjUO9WszdLles5Vcd0EYzxPNJdwmLjYfP+Jfbr4B5nktM4ZgeHSWtg==",
174174
"dependencies": {
175-
"OpenTelemetry": "1.14.0"
175+
"OpenTelemetry": "1.15.0"
176176
}
177177
},
178178
"OpenTelemetry.Instrumentation.AspNetCore": {
179179
"type": "Direct",
180-
"requested": "[1.14.0, )",
181-
"resolved": "1.14.0",
182-
"contentHash": "NQAQpFa3a4ofPUYwxcwtNPGpuRNwwx1HM7MnLEESYjYkhfhER+PqqGywW65rWd7bJEc1/IaL+xbmHH99pYDE0A==",
180+
"requested": "[1.15.0, )",
181+
"resolved": "1.15.0",
182+
"contentHash": "mte1nRYefxjed2syXgVWq3UCfMKO7MkebvTZmf0O1aLgVgCktLsVjQ6mftyjIbWGBBCHN0wg+Glxj8BSFS70pQ==",
183183
"dependencies": {
184-
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.14.0, 2.0.0)"
184+
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.0, 2.0.0)"
185185
}
186186
},
187187
"OpenTelemetry.Instrumentation.Http": {
188188
"type": "Direct",
189-
"requested": "[1.14.0, )",
190-
"resolved": "1.14.0",
191-
"contentHash": "uH8X1fYnywrgaUrSbemKvFiFkBwY7ZbBU7Wh4A/ORQmdpF3G/5STidY4PlK4xYuIv9KkdMXH/vkpvzQcayW70g==",
189+
"requested": "[1.15.0, )",
190+
"resolved": "1.15.0",
191+
"contentHash": "uToc7bUp8IEdb0ny9mKsL6FrrYelINPzxxiSShJgOf4XmQc4Azww6S5RjRj24YhsOn2a1MABOrxfVTZXtDk4Eg==",
192192
"dependencies": {
193-
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.14.0, 2.0.0)"
193+
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.0, 2.0.0)"
194194
}
195195
},
196196
"BouncyCastle.Cryptography": {
@@ -1126,23 +1126,23 @@
11261126
},
11271127
"OpenTelemetry": {
11281128
"type": "Transitive",
1129-
"resolved": "1.14.0",
1130-
"contentHash": "aiPBAr1+0dPDItH++MQQr5UgMf4xiybruzNlAoYYMYN3UUk+mGRcoKuZy4Z4rhhWUZIpK2Xhe7wUUXSTM32duQ==",
1129+
"resolved": "1.15.0",
1130+
"contentHash": "7mS/oZFF8S6xyqGQfMU1btp0nXJQUPWV535Vp/XMLYwRAUv36xQN+U4vufWBF1+z4HnRTOwuFHtUSGnHbyN6FQ==",
11311131
"dependencies": {
1132-
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.14.0"
1132+
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.0"
11331133
}
11341134
},
11351135
"OpenTelemetry.Api": {
11361136
"type": "Transitive",
1137-
"resolved": "1.14.0",
1138-
"contentHash": "foHci6viUw1f3gUB8qzz3Rk02xZIWMo299X0rxK0MoOWok/3dUVru+KKdY7WIoSHwRGpxGKkmAz9jIk2RFNbsQ=="
1137+
"resolved": "1.15.0",
1138+
"contentHash": "vk5OGdf6K9kQScCWo3bRjhDWCv6Pqw92IpX4dlARZ8B1WL7/2NGTDtCkkw42eQf7UdwyoHKzVvMH/PtL8d6z7w=="
11391139
},
11401140
"OpenTelemetry.Api.ProviderBuilderExtensions": {
11411141
"type": "Transitive",
1142-
"resolved": "1.14.0",
1143-
"contentHash": "i/lxOM92v+zU5I0rGl5tXAGz6EJtxk2MvzZ0VN6F6L5pMqT6s6RCXnGWXg6fW+vtZJsllBlQaf/VLPTzgefJpg==",
1142+
"resolved": "1.15.0",
1143+
"contentHash": "OnuSUlRpGvowkOzGFQfy+KZFu0cITfKfh2IYJJiZskxVJiOuexwOOuvfDAgpJdmTzVWAHjYdz2shcHZaJ06UjQ==",
11441144
"dependencies": {
1145-
"OpenTelemetry.Api": "1.14.0"
1145+
"OpenTelemetry.Api": "1.15.0"
11461146
}
11471147
},
11481148
"Parlot": {
@@ -1361,12 +1361,12 @@
13611361
},
13621362
"Microsoft.EntityFrameworkCore": {
13631363
"type": "Direct",
1364-
"requested": "[9.0.11, )",
1365-
"resolved": "9.0.11",
1366-
"contentHash": "lqqV6JEmVv8s0Y/25RnKtYZ6qL+Vz14wEsrBV1ubVUyzDGrOp+10XJ54HNuRLUzdvzVPR2uQ5li/CPrBj0kQHg==",
1364+
"requested": "[9.0.12, )",
1365+
"resolved": "9.0.12",
1366+
"contentHash": "+spirhtFAOq8N6maOlAyzk+ScBjYwptpY2xinRAl5ocW+CsE0hCJy91C2IH4Fi6voo2miQt/Whes4LDU+Gc/ig==",
13671367
"dependencies": {
1368-
"Microsoft.EntityFrameworkCore.Abstractions": "9.0.11",
1369-
"Microsoft.EntityFrameworkCore.Analyzers": "9.0.11"
1368+
"Microsoft.EntityFrameworkCore.Abstractions": "9.0.12",
1369+
"Microsoft.EntityFrameworkCore.Analyzers": "9.0.12"
13701370
}
13711371
},
13721372
"Microsoft.EntityFrameworkCore.Design": {
@@ -1388,11 +1388,11 @@
13881388
},
13891389
"Microsoft.EntityFrameworkCore.InMemory": {
13901390
"type": "Direct",
1391-
"requested": "[9.0.11, )",
1392-
"resolved": "9.0.11",
1393-
"contentHash": "0uoF/3xXeUqDw4dJOumUKpBSdIZF/E6nWigwDAjEvodDWp9++6/OvCvMj0aXoctPvTSeG/PwZfDqCIfmKhOqgg==",
1391+
"requested": "[9.0.12, )",
1392+
"resolved": "9.0.12",
1393+
"contentHash": "9uWGL3NmP/xPqxclG2IRT4AG2NYDcncFRyNbj/jGtyoRYDphZpQ0KjJ6N/T6+zj0ifuT4mZykUiHftGdplipKw==",
13941394
"dependencies": {
1395-
"Microsoft.EntityFrameworkCore": "9.0.11"
1395+
"Microsoft.EntityFrameworkCore": "9.0.12"
13961396
}
13971397
},
13981398
"Microsoft.EntityFrameworkCore.Tools": {
@@ -1462,38 +1462,38 @@
14621462
},
14631463
"OpenTelemetry.Exporter.Console": {
14641464
"type": "Direct",
1465-
"requested": "[1.14.0, )",
1466-
"resolved": "1.14.0",
1467-
"contentHash": "u0ekKB603NBrll76bK/wkLTnD/bl+5QMrXZKOA6oW+H383E2z5gfaWSrwof94URuvTFrtWRQcLKH+hhPykfM2w==",
1465+
"requested": "[1.15.0, )",
1466+
"resolved": "1.15.0",
1467+
"contentHash": "Jweov3Q70xmy5U8bwab8xd+xAuaFBI4695q/IpH4/dcAwKytyB+WhV5HufmKfXiKZhRbSEo8piG+i1ENEmdFXw==",
14681468
"dependencies": {
1469-
"OpenTelemetry": "1.14.0"
1469+
"OpenTelemetry": "1.15.0"
14701470
}
14711471
},
14721472
"OpenTelemetry.Extensions.Hosting": {
14731473
"type": "Direct",
1474-
"requested": "[1.14.0, )",
1475-
"resolved": "1.14.0",
1476-
"contentHash": "ZAxkCIa3Q3YWZ1sGrolXfkhPqn2PFSz2Cel74em/fATZgY5ixlw6MQp2icmqKCz4C7M1W2G0b92K3rX8mOtFRg==",
1474+
"requested": "[1.15.0, )",
1475+
"resolved": "1.15.0",
1476+
"contentHash": "RixjKyB1pbYGhWdvPto4KJs+exdQknJsnjUO9WszdLles5Vcd0EYzxPNJdwmLjYfP+Jfbr4B5nktM4ZgeHSWtg==",
14771477
"dependencies": {
1478-
"OpenTelemetry": "1.14.0"
1478+
"OpenTelemetry": "1.15.0"
14791479
}
14801480
},
14811481
"OpenTelemetry.Instrumentation.AspNetCore": {
14821482
"type": "Direct",
1483-
"requested": "[1.14.0, )",
1484-
"resolved": "1.14.0",
1485-
"contentHash": "NQAQpFa3a4ofPUYwxcwtNPGpuRNwwx1HM7MnLEESYjYkhfhER+PqqGywW65rWd7bJEc1/IaL+xbmHH99pYDE0A==",
1483+
"requested": "[1.15.0, )",
1484+
"resolved": "1.15.0",
1485+
"contentHash": "mte1nRYefxjed2syXgVWq3UCfMKO7MkebvTZmf0O1aLgVgCktLsVjQ6mftyjIbWGBBCHN0wg+Glxj8BSFS70pQ==",
14861486
"dependencies": {
1487-
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.14.0, 2.0.0)"
1487+
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.0, 2.0.0)"
14881488
}
14891489
},
14901490
"OpenTelemetry.Instrumentation.Http": {
14911491
"type": "Direct",
1492-
"requested": "[1.14.0, )",
1493-
"resolved": "1.14.0",
1494-
"contentHash": "uH8X1fYnywrgaUrSbemKvFiFkBwY7ZbBU7Wh4A/ORQmdpF3G/5STidY4PlK4xYuIv9KkdMXH/vkpvzQcayW70g==",
1492+
"requested": "[1.15.0, )",
1493+
"resolved": "1.15.0",
1494+
"contentHash": "uToc7bUp8IEdb0ny9mKsL6FrrYelINPzxxiSShJgOf4XmQc4Azww6S5RjRj24YhsOn2a1MABOrxfVTZXtDk4Eg==",
14951495
"dependencies": {
1496-
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.14.0, 2.0.0)"
1496+
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.0, 2.0.0)"
14971497
}
14981498
},
14991499
"BouncyCastle.Cryptography": {
@@ -2159,13 +2159,13 @@
21592159
},
21602160
"Microsoft.EntityFrameworkCore.Abstractions": {
21612161
"type": "Transitive",
2162-
"resolved": "9.0.11",
2163-
"contentHash": "MHcdHm7vF71MfqYC68Jx9YfDAjxcuClGBZJk5zcJDRhVO4HgX+QFsOqcAisKWb20aBeF0IN1YkSktnEUf/tmLQ=="
2162+
"resolved": "9.0.12",
2163+
"contentHash": "PFuxE9HUWu7y9Bi6CWfhYTR4UULdFScLB/31XjhmP1qlOBCD6x+TLZ1YPs2CyUrwtijUVe2A51o3IGe9/tB4mw=="
21642164
},
21652165
"Microsoft.EntityFrameworkCore.Analyzers": {
21662166
"type": "Transitive",
2167-
"resolved": "9.0.11",
2168-
"contentHash": "ccEk88YkXXWV+s5ZS+27UoY5YUVzgx8mq7kl+e05+AgJPGLhtmpQL26LxqBV1StJZEl2KaL8BxzABvXTXBAkoQ=="
2167+
"resolved": "9.0.12",
2168+
"contentHash": "ut8XSV7+gZ7FunbZH4t6Hta2NXP12F23cTuvC1Pp4caCWs4yg8Ddc2QPGPPWVmxIMl8q44fB5IK8Q8IEwlXIvQ=="
21692169
},
21702170
"Microsoft.Extensions.DependencyModel": {
21712171
"type": "Transitive",
@@ -2436,26 +2436,26 @@
24362436
},
24372437
"OpenTelemetry": {
24382438
"type": "Transitive",
2439-
"resolved": "1.14.0",
2440-
"contentHash": "aiPBAr1+0dPDItH++MQQr5UgMf4xiybruzNlAoYYMYN3UUk+mGRcoKuZy4Z4rhhWUZIpK2Xhe7wUUXSTM32duQ==",
2439+
"resolved": "1.15.0",
2440+
"contentHash": "7mS/oZFF8S6xyqGQfMU1btp0nXJQUPWV535Vp/XMLYwRAUv36xQN+U4vufWBF1+z4HnRTOwuFHtUSGnHbyN6FQ==",
24412441
"dependencies": {
2442-
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.14.0"
2442+
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.0"
24432443
}
24442444
},
24452445
"OpenTelemetry.Api": {
24462446
"type": "Transitive",
2447-
"resolved": "1.14.0",
2448-
"contentHash": "foHci6viUw1f3gUB8qzz3Rk02xZIWMo299X0rxK0MoOWok/3dUVru+KKdY7WIoSHwRGpxGKkmAz9jIk2RFNbsQ==",
2447+
"resolved": "1.15.0",
2448+
"contentHash": "vk5OGdf6K9kQScCWo3bRjhDWCv6Pqw92IpX4dlARZ8B1WL7/2NGTDtCkkw42eQf7UdwyoHKzVvMH/PtL8d6z7w==",
24492449
"dependencies": {
24502450
"System.Diagnostics.DiagnosticSource": "10.0.0"
24512451
}
24522452
},
24532453
"OpenTelemetry.Api.ProviderBuilderExtensions": {
24542454
"type": "Transitive",
2455-
"resolved": "1.14.0",
2456-
"contentHash": "i/lxOM92v+zU5I0rGl5tXAGz6EJtxk2MvzZ0VN6F6L5pMqT6s6RCXnGWXg6fW+vtZJsllBlQaf/VLPTzgefJpg==",
2455+
"resolved": "1.15.0",
2456+
"contentHash": "OnuSUlRpGvowkOzGFQfy+KZFu0cITfKfh2IYJJiZskxVJiOuexwOOuvfDAgpJdmTzVWAHjYdz2shcHZaJ06UjQ==",
24572457
"dependencies": {
2458-
"OpenTelemetry.Api": "1.14.0"
2458+
"OpenTelemetry.Api": "1.15.0"
24592459
}
24602460
},
24612461
"Parlot": {

0 commit comments

Comments
 (0)