Skip to content

Commit 80c26c9

Browse files
authored
Merge branch 'main' into applicationinsights-convert-singleapi
2 parents 0576c28 + 0a8628b commit 80c26c9

File tree

957 files changed

+62207
-1775
lines changed

Some content is hidden

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

957 files changed

+62207
-1775
lines changed

.github/.prettierrc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Keep in sync with eng/tools/.prettierrc.yaml
22

3+
plugins:
4+
- prettier-plugin-organize-imports
5+
36
# Aligned with microsoft/typespec
47
printWidth: 100
58

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
# PRLabel: %Compute
6868
/specification/compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @MS-syh2qs @grizzlytheodore @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
6969

70-
/specification/consumption/ @kjeur @panda-wang
70+
/specification/consumption/ @arusing @micahbresette
7171

7272
# PRLabel: %Container Instances
7373
/specification/containerinstance/ @novinc

.github/copilot-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Do not skip the step that choose SDK generation method to ensure the user select
212212
6. **Choose SDK Generation Method**: Determine how to generate SDKs (locally or via pipeline). Only Python is supported for local SDK generation at this time.
213213
7. **Generate SDKs via Pipeline**: Generate SDKs using `/run-sdk-gen-pipeline` prompt, monitor the pipeline status and displaying generated SDK PR links.
214214
8. **Show generated SDK PR**: Display the generated SDK pull request links for review.
215-
9. **Create a release plan**: Create a release plan for the generated SDKs using spec pull request.
215+
9. **Create a release plan**: To create a release plan refer to #file:.\prompts\create-release-plan.prompt.md
216216
10. **Prompt user to change spec pull request to ready for review from draft status**: Update spec pull request to change it to ready for review.
217217
11. **Release package**: Release the SDK package using `ReleaseSdkPackage` tool.
218218

.github/dependabot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ updates:
4141
eslint:
4242
patterns:
4343
- "*eslint*"
44-
# Leave the constraint if the original constraint allows the new version, otherwise, bump the constraint.
45-
versioning-strategy: increase-if-necessary
44+
# I prefer "increase-if-necessary", but I believe we may need to use "increase" since we're a monorepo
45+
versioning-strategy: increase
4646
- package-ecosystem: "npm"
4747
directories:
4848
- "/.github"
@@ -63,5 +63,5 @@ updates:
6363
eslint:
6464
patterns:
6565
- "*eslint*"
66-
# Leave the constraint if the original constraint allows the new version, otherwise, bump the constraint.
67-
versioning-strategy: increase-if-necessary
66+
# I prefer "increase-if-necessary", but we should align with the root package.json
67+
versioning-strategy: increase

.github/matchers/actionlint.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "actionlint",
5+
"pattern": [
6+
{
7+
"regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"message": 4,
12+
"code": 5
13+
}
14+
]
15+
}
16+
]
17+
}

.github/package-lock.json

Lines changed: 23 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"dependencies2": "All runtime and dev dependencies in this file, must be a superset of shared/package.json"
77
},
88
"dependencies": {
9-
"@apidevtools/json-schema-ref-parser": "^14.1.0",
9+
"@apidevtools/json-schema-ref-parser": "^14.1.1",
1010
"debug": "^4.4.0",
1111
"js-yaml": "^4.1.0",
12-
"marked": "^16.0.0",
12+
"marked": "^16.1.1",
1313
"markdown-table": "^3.0.4",
1414
"simple-git": "^3.27.0",
1515
"zod": "^4.0.2"
@@ -28,6 +28,7 @@
2828
"eslint": "^9.22.0",
2929
"globals": "^16.0.0",
3030
"prettier": "~3.5.3",
31+
"prettier-plugin-organize-imports": "^4.2.0",
3132
"semver": "^7.7.1",
3233
"typescript": "~5.8.2",
3334
"vitest": "^3.0.7"

.github/prompts/create-release-plan.prompt.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ Follow these steps in order to create or manage a release plan for an API specif
2020
- If no release plan exists, proceed to Step 3
2121

2222
## Step 3: Gather Release Plan Information
23-
Collect the following required information from the user. Do not use non GUID valid for product and service tree Id. Do not create release plan with temporary values.
24-
Do not assume or use default for service tree Id and product service tree Id. Always show the values to user and ask them to confirm it's a valid value in service tree.
23+
Collect the following required information from the user. Do not create a release plan with temporary values. Confirm the values with the user before proceeding to create the release plan.
2524
If any details are missing, prompt the user accordingly:
2625

2726
- **API Lifecycle Stage**: Must be one of:

.github/shared/package-lock.json

Lines changed: 23 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/shared/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"./spec-model": "./src/spec-model.js",
2020
"./swagger": "./src/swagger.js",
2121
"./tag": "./src/tag.js",
22+
"./simple-git": "./src/simple-git.js",
2223
"./test/examples": "./test/examples.js"
2324
},
2425
"bin": {
@@ -29,10 +30,10 @@
2930
"dependencies2": "All runtime and dev dependencies in this file, must be a subset of ../package.json"
3031
},
3132
"dependencies": {
32-
"@apidevtools/json-schema-ref-parser": "^14.1.0",
33+
"@apidevtools/json-schema-ref-parser": "^14.1.1",
3334
"debug": "^4.4.0",
3435
"js-yaml": "^4.1.0",
35-
"marked": "^16.0.0",
36+
"marked": "^16.1.1",
3637
"simple-git": "^3.27.0"
3738
},
3839
"devDependencies": {
@@ -46,6 +47,7 @@
4647
"eslint": "^9.22.0",
4748
"globals": "^16.0.0",
4849
"prettier": "~3.5.3",
50+
"prettier-plugin-organize-imports": "^4.2.0",
4951
"semver": "^7.7.1",
5052
"typescript": "~5.8.2",
5153
"vitest": "^3.0.7"

0 commit comments

Comments
 (0)