Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/9.x] Sync branch with origin/main #6295

Merged
merged 8 commits into from
Mar 26, 2024
Merged

[feature/9.x] Sync branch with origin/main #6295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6117871
[main] Bump the identity-dependencies group (#6251)
dependabot[bot] Mar 19, 2024
8d9f69e
Bump dawidd6/action-download-artifact from 3.1.2 to 3.1.4 (#6274)
dependabot[bot] Mar 21, 2024
d51fe0c
Bump dependabot/fetch-metadata from 1.6.0 to 1.7.0 (#6284)
dependabot[bot] Mar 21, 2024
4722813
[main] Update dependencies from dotnet/symstore (#6276)
dotnet-maestro[bot] Mar 22, 2024
998885d
Bump dependabot/fetch-metadata from 1.7.0 to 2.0.0 (#6290)
dependabot[bot] Mar 22, 2024
ce342f4
Update EOL versions (#6280)
richlander Mar 22, 2024
6f3b476
Merge remote-tracking branch 'origin/main' into feature/9.x
github-actions[bot] Mar 25, 2024
0de8df0
Merge branch 'feature/9.x' into bot/sync/feature/9.x
kkeirstead Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/submit-linter-suggestions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# The default artifact download action doesn't support cross-workflow
# artifacts, so use a 3rd party one.
- name: 'Download linting results'
uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
with:
workflow: ${{env.workflow_name}}
run_id: ${{github.event.workflow_run.id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/submit-to-do-issue.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# The default artifact download action doesn't support cross-workflow
# artifacts, so use a 3rd party one.
- name: 'Download linting results'
uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
with:
workflow: ${{env.workflow_name}}
run_id: ${{github.event.workflow_run.id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-dependabot-clearly-defined.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: Fetch Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@c9c4182bf1b97f5224aee3906fd373f6b61b4526
uses: dependabot/fetch-metadata@0fb21704c18a42ce5aa8d720ea4b912f5e6babef

- name: Check ClearlyDefined
if: ${{steps.metadata.outputs.package-ecosystem == 'nuget'}}
Expand Down
2 changes: 1 addition & 1 deletion eng/dependabot/independent/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AzureIdentityVersion>1.10.4</AzureIdentityVersion>
<AzureStorageBlobsVersion>12.19.1</AzureStorageBlobsVersion>
<AzureStorageQueuesVersion>12.17.1</AzureStorageQueuesVersion>
<MicrosoftIdentityWebVersion>2.17.1</MicrosoftIdentityWebVersion>
<MicrosoftIdentityWebVersion>2.17.2</MicrosoftIdentityWebVersion>
<MicrosoftOpenApiReadersVersion>1.6.13</MicrosoftOpenApiReadersVersion>
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
Expand Down
26 changes: 13 additions & 13 deletions eng/helix/Helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,40 +58,40 @@
<!-- Linux gnu libc queues -->
<ItemGroup Condition="$([MSBuild]::IsOSPlatform(Linux)) and !$(PackageRid.Contains(musl))">
<!-- linux-arm64 -->
<HelixAvailableTargetQueue Include="ubuntu.1804.armarch$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8"
<HelixAvailableTargetQueue Include="ubuntu.2204.armarch$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8"
Condition="'$(HelixArchitecture)' == 'arm64'">
<TestRunName>Debian 11 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
<TestRunName>Debian 12 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
</HelixAvailableTargetQueue>
<HelixAvailableTargetQueue Include="ubuntu.1804.armarch$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8"
<HelixAvailableTargetQueue Include="ubuntu.2204.armarch$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8"
Condition="'$(HelixArchitecture)' == 'arm64'">
<TestRunName>Ubuntu 18.04 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
<TestRunName>Ubuntu 22.04 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
</HelixAvailableTargetQueue>
<!-- linux-x64 -->
<HelixAvailableTargetQueue Include="ubuntu.1804.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64"
<HelixAvailableTargetQueue Include="ubuntu.2204.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64"
Condition="'$(HelixArchitecture)' == 'x64'">
<TestRunName>Debian 11 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
<TestRunName>Debian 12 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
</HelixAvailableTargetQueue>
<HelixAvailableTargetQueue Include="ubuntu.1804.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64"
<HelixAvailableTargetQueue Include="ubuntu.2204.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64"
Condition="'$(HelixArchitecture)' == 'x64'">
<TestRunName>Mariner 2.0 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
</HelixAvailableTargetQueue>
<HelixAvailableTargetQueue Include="ubuntu.1804.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-amd64"
<HelixAvailableTargetQueue Include="ubuntu.2204.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-amd64"
Condition="'$(HelixArchitecture)' == 'x64'">
<TestRunName>Ubuntu 18.04 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
<TestRunName>Ubuntu 20.04 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
</HelixAvailableTargetQueue>
</ItemGroup>

<!-- Linux musl libc queues -->
<ItemGroup Condition="$([MSBuild]::IsOSPlatform(Linux)) and $(PackageRid.Contains(musl))">
<!-- linux-musl-arm64 -->
<HelixAvailableTargetQueue Include="ubuntu.1804.armarch$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-arm64v8"
<HelixAvailableTargetQueue Include="ubuntu.2204.armarch$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-arm64v8"
Condition="'$(HelixArchitecture)' == 'arm64'">
<TestRunName>Alpine 3.15 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
<TestRunName>Alpine 3.17 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
</HelixAvailableTargetQueue>
<!-- linux-musl-x64 -->
<HelixAvailableTargetQueue Include="ubuntu.1804.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64"
<HelixAvailableTargetQueue Include="ubuntu.2204.amd64$(QueueSuffix)@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64"
Condition="'$(HelixArchitecture)' == 'x64'">
<TestRunName>Alpine 3.15 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
<TestRunName>Alpine 3.17 $(HelixArchitecture) $(HelixConfiguration)</TestRunName>
</HelixAvailableTargetQueue>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/pipeline-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ extends:
build_linux_musl_arm64_cross:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
helix_linux_amd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
helix_linux_musl_amd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode

pool: ${{ parameters.pool }}

Expand Down