Skip to content

Commit 6d09241

Browse files
committed
Resolve conflicts
2 parents c6d5ee5 + a636b76 commit 6d09241

File tree

363 files changed

+42367
-30742
lines changed

Some content is hidden

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

363 files changed

+42367
-30742
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,23 @@ updates:
33
- package-ecosystem: "npm"
44
directory: "/tools/sdk-testgen/"
55
schedule:
6-
interval: "daily"
6+
interval: weekly
77
ignore:
88
- dependency-name: "*"
99
update-types: ["version-update:semver-patch"]
1010

1111
- package-ecosystem: "npm"
1212
directory: "/eng/common/tsp-client"
1313
schedule:
14-
interval: "daily"
14+
interval: weekly
1515
versioning-strategy: increase
1616

1717
- package-ecosystem: "npm"
1818
directory: "/eng/common/spelling"
1919
schedule:
20-
interval: "daily"
20+
interval: weekly
21+
22+
- package-ecosystem: "github-actions"
23+
directory: "/"
24+
schedule:
25+
interval: weekly

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717

18-
- uses: actions/setup-dotnet@v4
18+
- uses: actions/setup-dotnet@v5
1919
with:
2020
dotnet-version: |
2121
8.0.x

.github/workflows/event-processor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
LABEL_SERVICE_API_KEY: ${{ env.LABEL_SERVICE_API_KEY }}
9898

9999
- name: Archive github event data
100-
uses: actions/upload-artifact@v4
100+
uses: actions/upload-artifact@v6
101101
if: always()
102102
with:
103103
name: event

.github/workflows/instructions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Verify MCP Tool References
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525
- name: azsdk-cli verify
2626
shell: pwsh
2727
run: |

.github/workflows/post-apiview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
contains(github.event.check_run.name, 'Build Analyze') )
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222
with:
2323
sparse-checkout: 'eng/common'
2424

.github/workflows/scheduled-event-processor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124124

125125
- name: Archive github event data
126-
uses: actions/upload-artifact@v4
126+
uses: actions/upload-artifact@v6
127127
if: always()
128128
with:
129129
name: event

.github/workflows/tsp-client-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
run: git config --global core.longpaths true
3232
shell: pwsh
3333

34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v6
3535
with:
3636
sparse-checkout: |
3737
.github/workflows
3838
tools/tsp-client
3939
4040
- name: Use Node ${{ matrix.node-version }}.x
41-
uses: actions/setup-node@v4
41+
uses: actions/setup-node@v6
4242
with:
4343
node-version: ${{ matrix.node-version }}.x
4444

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,8 @@ tools/apiview/emitters/typespec-apiview/temp/
521521

522522
# ApiView Spa
523523
src/dotnet/APIView/APIViewWeb/wwwroot/spa
524+
src/dotnet/APIView/ClientSPA/**/playwright-report/**
525+
src/dotnet/APIView/ClientSPA/**/test-results/**
524526

525527
# Issue Labeler Deploy
526528
tools/issue-labeler/src/IssueLabeler/Properties/*Zip Deploy.json

eng/common/instructions/azsdk-tools/create-release-plan.instructions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ If any details are missing, prompt the user accordingly:
5151
- If SDK pull requests exist:
5252
- Collect the pull request links from the user
5353
- Use `azsdk_link_sdk_pull_request_to_release_plan` to link each SDK pull request to the release plan
54+
> **GitHub CLI Authentication Required:**
55+
> Before running any SDK PR linking steps, ensure you are authenticated with GitHub CLI.
56+
> Run: `gh auth login`
57+
> You can check authentication status with `gh auth status`.
5458
- Confirm successful linking for each SDK pull request
5559

5660
## Step 7: Summary

eng/common/pipelines/templates/steps/create-authenticated-npmrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ parameters:
66
- name: CustomCondition
77
type: string
88
default: succeeded()
9+
- name: ServiceConnection
10+
type: string
11+
default: ''
912

1013
steps:
1114
- pwsh: |
@@ -21,8 +24,10 @@ steps:
2124
$content | Out-File '${{ parameters.npmrcPath }}'
2225
displayName: 'Create .npmrc'
2326
condition: ${{ parameters.CustomCondition }}
27+
2428
- task: npmAuthenticate@0
2529
displayName: Authenticate .npmrc
2630
condition: ${{ parameters.CustomCondition }}
2731
inputs:
2832
workingFile: ${{ parameters.npmrcPath }}
33+
azureDevOpsServiceConnection: ${{ parameters.ServiceConnection }}

0 commit comments

Comments
 (0)