Skip to content

Commit 14941ef

Browse files
authored
Merge main to feature/10.0 (#8224)
[feature/10.0] Sync branch with origin/main
2 parents 28ed10c + e95f7d9 commit 14941ef

File tree

7 files changed

+40
-12
lines changed

7 files changed

+40
-12
lines changed

.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,14 @@ pipelines:
6161
lastModifiedDate: 2024-03-26
6262
armory:
6363
lastModifiedDate: 2024-03-26
64+
1444:
65+
retail:
66+
source:
67+
credscan:
68+
lastModifiedDate: 2025-03-28
69+
eslint:
70+
lastModifiedDate: 2025-03-28
71+
psscriptanalyzer:
72+
lastModifiedDate: 2025-03-28
73+
armory:
74+
lastModifiedDate: 2025-03-28

.github/dependabot.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#! target branch and which major version of .NET Monitor it builds.
1818
#@ def getBranches():
1919
#@ return [
20-
#@ struct.encode({"name": "main", "majorVersion": "8"}),
20+
#@ struct.encode({"name": "main", "majorVersion": "9"}),
2121
#@ struct.encode({"name": "release/9.0", "majorVersion": "9"}),
2222
#@ struct.encode({"name": "release/8.x", "majorVersion": "8"}),
2323
#@ ]

.github/dependabot.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,23 @@ updates:
3434
target-branch: main
3535
commit-message:
3636
prefix: '[main] '
37+
- package-ecosystem: nuget
38+
directory: /eng/dependabot/net9.0
39+
schedule:
40+
interval: daily
41+
target-branch: main
42+
ignore:
43+
- dependency-name: '*'
44+
update-types:
45+
- version-update:semver-major
46+
commit-message:
47+
prefix: '[main] '
48+
groups:
49+
runtime-dependencies:
50+
patterns:
51+
- Microsoft.Extensions.*
52+
- Microsoft.NETCore.DotNetHost
53+
- System.Text.Json
3754
- package-ecosystem: nuget
3855
directory: /eng/dependabot/net8.0
3956
schedule:

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions: {}
88
jobs:
99
backport:
1010
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to') && contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
permissions:
1313
contents: write
1414
issues: write

.github/workflows/spellcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
with:
1818
persist-credentials: false
1919

20-
- uses: streetsidesoftware/cspell-action@e464ae97d348eb3beb0c5a6296dc4388ad4484d9
20+
- uses: streetsidesoftware/cspell-action@eb29b6a67d122d2e6af385ff16bdb200d93b2e54
2121
name: Documentation spellcheck
2222
if: ${{ !cancelled() }}
2323
with:
2424
files: '**/*.md'
2525
inline: error
2626
incremental_files_only: true
2727

28-
- uses: streetsidesoftware/cspell-action@e464ae97d348eb3beb0c5a6296dc4388ad4484d9
28+
- uses: streetsidesoftware/cspell-action@eb29b6a67d122d2e6af385ff16bdb200d93b2e54
2929
name: Resx spellcheck
3030
if: ${{ !cancelled() }}
3131
with:
3232
files: 'src/**/*.resx'
3333
inline: error
3434
incremental_files_only: true
3535

36-
- uses: streetsidesoftware/cspell-action@e464ae97d348eb3beb0c5a6296dc4388ad4484d9
36+
- uses: streetsidesoftware/cspell-action@eb29b6a67d122d2e6af385ff16bdb200d93b2e54
3737
name: Source code spellcheck
3838
if: ${{ !cancelled() }}
3939
with:

eng/dependabot/independent/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Import references updated by Dependabot. -->
33

44
<PropertyGroup>
5-
<AzureCoreVersion>1.45.0</AzureCoreVersion>
5+
<AzureCoreVersion>1.46.0</AzureCoreVersion>
66
<AzureIdentityVersion>1.13.2</AzureIdentityVersion>
77
<AzureStorageBlobsVersion>12.24.0</AzureStorageBlobsVersion>
88
<AzureStorageQueuesVersion>12.22.0</AzureStorageQueuesVersion>

eng/dependabot/net9.0/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<!-- Import references updated by Dependabot. -->
33
<PropertyGroup>
44
<!-- Microsoft.Extensions.Configuration.Abstractions -->
5-
<MicrosoftExtensionsConfigurationAbstractions90Version>9.0.1</MicrosoftExtensionsConfigurationAbstractions90Version>
5+
<MicrosoftExtensionsConfigurationAbstractions90Version>9.0.4</MicrosoftExtensionsConfigurationAbstractions90Version>
66
<!-- Microsoft.Extensions.Logging -->
7-
<MicrosoftExtensionsLogging90Version>9.0.1</MicrosoftExtensionsLogging90Version>
7+
<MicrosoftExtensionsLogging90Version>9.0.4</MicrosoftExtensionsLogging90Version>
88
<!-- Microsoft.Extensions.Logging.Abstractions -->
9-
<MicrosoftExtensionsLoggingAbstractions90Version>9.0.1</MicrosoftExtensionsLoggingAbstractions90Version>
9+
<MicrosoftExtensionsLoggingAbstractions90Version>9.0.4</MicrosoftExtensionsLoggingAbstractions90Version>
1010
<!-- Microsoft.Extensions.Logging.Console -->
11-
<MicrosoftExtensionsLoggingConsole90Version>9.0.1</MicrosoftExtensionsLoggingConsole90Version>
11+
<MicrosoftExtensionsLoggingConsole90Version>9.0.4</MicrosoftExtensionsLoggingConsole90Version>
1212
<!-- Microsoft.NETCore.App -->
13-
<MicrosoftNETCoreApp90Version>9.0.1</MicrosoftNETCoreApp90Version>
13+
<MicrosoftNETCoreApp90Version>9.0.4</MicrosoftNETCoreApp90Version>
1414
<!-- System.Text.Json -->
15-
<SystemTextJson90Version>9.0.0</SystemTextJson90Version>
15+
<SystemTextJson90Version>9.0.4</SystemTextJson90Version>
1616
</PropertyGroup>
1717
</Project>

0 commit comments

Comments
 (0)