Skip to content

Commit 23fdd8f

Browse files
authored
Merge branch 'main' into codex/fix-dotnet-workflow-examples
2 parents 9c1f3e2 + cb05161 commit 23fdd8f

36 files changed

Lines changed: 455 additions & 137 deletions

File tree

‎.github/rulesets/docs-internal/main-branch-protection.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@
196196
"context": "shielding",
197197
"integration_id": 15368
198198
},
199+
{
200+
"context": "tools",
201+
"integration_id": 15368
202+
},
199203
{
200204
"context": "versions",
201205
"integration_id": 15368

‎.github/rulesets/docs/main-branch-protection.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@
173173
"context": "shielding",
174174
"integration_id": 15368
175175
},
176+
{
177+
"context": "tools",
178+
"integration_id": 15368
179+
},
176180
{
177181
"context": "versions",
178182
"integration_id": 15368

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- secret-scanning
7070
- shielding
7171
# - tests
72-
# - tools
72+
- tools
7373
# - types
7474
- versions
7575
- webhooks
@@ -85,7 +85,7 @@ jobs:
8585
env:
8686
# These suites make no HTTP requests, so they skip the Next.js build and test server.
8787
# A suite that adds an HTTP test fails with a connection error until it's removed from this list.
88-
START_VITEST_SERVER: ${{ contains(fromJSON('["color-schemes", "content-linter", "data-directory", "ghes-releases", "journeys", "links", "observability", "products", "workflows"]'), matrix.name) && 'false' || 'true' }}
88+
START_VITEST_SERVER: ${{ contains(fromJSON('["color-schemes", "content-linter", "data-directory", "ghes-releases", "journeys", "links", "observability", "products", "tools", "workflows"]'), matrix.name) && 'false' || 'true' }}
8989

9090
steps:
9191
# Repeat each if on its step so skipped work still leaves the required check present.

‎content/billing/concepts/product-billing/github-code-quality.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ To understand your license usage, and which licenses you can free up, it helps t
4646

4747
Users can contribute to multiple repositories or organizations. Usage is measured across the whole organization or enterprise to ensure that each member uses one license regardless of how many repositories or organizations the user contributes to.
4848

49+
To see which committers and repositories contribute to your license usage, download the {% data variables.product.prodname_code_quality_short %} CSV report from the **Licensing** page. See [AUTOTITLE](/billing/how-tos/products/download-license-use).
50+
4951
## Further reading
5052

5153
* [AUTOTITLE](/code-security/tutorials/improve-code-quality/catch-issues-before-merge)

‎content/billing/how-tos/products/download-license-use.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Downloading license use for your enterprise or organization
3-
intro: Get data on consumption of {% data variables.product.github %}, {% data variables.product.prodname_copilot_short %}, and {% data variables.product.prodname_AS %} licenses.
3+
intro: Get data on consumption of {% data variables.product.github %}, {% data variables.product.prodname_copilot_short %}{% ifversion code-quality %}, {% data variables.product.prodname_code_quality_short %}{% endif %}, and {% data variables.product.prodname_AS %} licenses.
44
permissions: '{% data reusables.permissions.enhanced-billing-enterprise %}'
55
versions:
66
fpt: '*'
@@ -15,7 +15,7 @@ category:
1515
- Manage your plan and licenses
1616
---
1717

18-
You can download CSV files with details of paid license use through the {% data variables.product.github %} user interface or the REST API.
18+
You can download CSV files with details of paid license use through the {% data variables.product.github %} user interface. For supported products, you can also retrieve license usage information through the REST API.
1919

2020
For more detailed reports on usage of all paid products, see [AUTOTITLE](/billing/how-tos/products/view-productlicense-use).
2121

@@ -26,7 +26,7 @@ For more detailed reports on usage of all paid products, see [AUTOTITLE](/billin
2626

2727
1. In the license area of interest, click **Download CSV report**. If offered a choice, choose your preferred report.
2828

29-
The report will be emailed to the default email address associated with your {% data variables.product.github %} account. For information about the fields, see [AUTOTITLE](/billing/reference/license-reports).
29+
The report will be emailed to the default email address associated with your {% data variables.product.github %} account.{% ifversion code-quality %} The exception is {% data variables.product.prodname_code_quality_short %} reports, which download directly to your browser instead.{% endif %} For information about the fields, see [AUTOTITLE](/billing/reference/license-reports).
3030

3131
## On {% data variables.product.prodname_ghe_server %}
3232

‎content/billing/reference/license-reports.md‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ category:
1212
- Track spending and control costs
1313
---
1414

15-
Each license report shows information about license users in your enterprise account, for {% data variables.product.prodname_copilot_short %}, or for {% data variables.product.prodname_AS %}.
15+
Each license report shows information about license users in your enterprise account, for {% data variables.product.prodname_copilot_short %}{% ifversion code-quality %}, for {% data variables.product.prodname_code_quality_short %}{% endif %}, or for {% data variables.product.prodname_AS %}.
1616

17-
**Cloud users** can download license reports from the {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** page under {% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} **Billing & licensing** or using the REST API.
17+
**Cloud users** can download license reports from the {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** page under {% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} **Billing & licensing** or, for supported products, using the REST API.
1818

1919
{% ifversion fpt or ghec %}
2020

21-
* Enterprise and {% data variables.product.prodname_AS %} license users, see [AUTOTITLE](/billing/how-tos/products/download-license-use)
21+
* Enterprise{% ifversion code-quality %}, {% data variables.product.prodname_code_quality_short %},{% endif %} and {% data variables.product.prodname_AS %} license users, see [AUTOTITLE](/billing/how-tos/products/download-license-use)
2222
* {% data variables.product.prodname_copilot %} license users, see [AUTOTITLE](/copilot/how-tos/administer-copilot/download-activity-report)
2323
* Report using the REST API, see [AUTOTITLE](/billing/tutorials/automate-usage-reporting)
2424

@@ -28,6 +28,25 @@ If you want to generate a more detailed usage report, see [AUTOTITLE](/billing/t
2828

2929
**{% data variables.product.prodname_ghe_server %} users** can download license reports for {% data variables.product.prodname_AS %} from the **License** page under enterprise settings, see [AUTOTITLE](/billing/how-tos/products/download-license-use).
3030

31+
{% ifversion code-quality %}
32+
33+
## {% data variables.product.prodname_code_quality_short %} license report
34+
35+
The CSV file lists active committers consuming {% data variables.product.prodname_code_quality_short %} licenses and the repositories contributing to that usage.
36+
37+
| Field | Description |
38+
|-------|-------------|
39+
| User login | The {% data variables.product.github %} username of the user. |
40+
| Organization / repository | The owner and name of a repository contributing to the user's {% data variables.product.prodname_code_quality_short %} license usage. |
41+
| Last pushed date | The push date recorded for the user's license usage in the repository, in `YYYY-MM-DD` format. A hyphen (`-`) indicates that the date is unknown. |
42+
| Last pushed email | The user's Git author email address. |
43+
44+
A user can appear in multiple rows if they contributed to multiple repositories. Each user consumes one {% data variables.product.prodname_code_quality_short %} license across the organization or enterprise, regardless of how many repositories they contribute to. Do not use the number of rows as the license count.
45+
46+
The report shows current active committers, not all licenses billed during a billing period. For details of how license usage affects your bill, see [AUTOTITLE](/billing/concepts/product-billing/github-code-quality).
47+
48+
{% endif %}
49+
3150
## {% data variables.product.prodname_AS %} license report
3251

3352
The CSV file contains information about each user who is currently consuming a license. The most recent commit by each of these users to repositories with paid security features enabled is reported.

‎content/code-security/how-tos/maintain-quality-code/view-and-manage-cost.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ It's important to understand how {% data variables.product.prodname_code_quality
3636

3737
{% data variables.product.prodname_code_quality_short %} usage appears in the **same billing and usage views as your other products**, not in a separate {% data variables.product.prodname_code_quality_short %} meter. Where you look depends on how granular a breakdown you need:
3838

39+
* **Committers consuming licenses**: Download the {% data variables.product.prodname_code_quality_short %} license report from the **Licensing** page under **Billing & licensing**. The CSV lists active committers and the repositories contributing to their license usage. See [AUTOTITLE](/billing/how-tos/products/download-license-use).
3940
* **For a repository- or organization-level breakdown, download the billing usage report** from the "Billing and licensing" tab. This is the only place you can attribute {% data variables.product.prodname_code_quality_short %} spend, including {% data variables.product.prodname_actions %} minutes, down to a specific repository or organization. There's no equivalent view in the UI. See [AUTOTITLE](/billing/how-tos/products/view-productlicense-use).
4041
* **For {% data variables.product.prodname_code_quality_short %}'s {% data variables.product.prodname_ai_credits_short %} usage over time, use the AI usage page** and group it by **Product** using the dropdown at the top right. This separates {% data variables.product.prodname_code_quality_short %} from your other AI products, like {% data variables.product.prodname_copilot_short %}, so you can track its share of the pool. To monitor the pool as a whole instead, see [AUTOTITLE](/copilot/concepts/billing-and-usage/organizations-and-enterprises/billing).
4142

‎content/copilot/concepts/copilot-surfaces/copilot-in-ides.md‎

Lines changed: 25 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: GitHub Copilot in IDEs
33
shortTitle: Copilot in IDEs
4-
intro: 'Get contextual AI assistance from {% data variables.product.prodname_copilot %} throughout your IDE workflow, from exploring an approach to writing, reviewing, and improving code.'
4+
intro: 'Use {% data variables.product.prodname_copilot_short %} in your IDE to get assistance as you code, collaborate with agents, and delegate work locally, in the background, or in the cloud.'
55
versions:
66
feature: copilot
77
defaultTool: vscode
@@ -14,66 +14,43 @@ redirect_from:
1414
- /copilot/concepts/agents/copilot-in-jetbrains
1515
---
1616

17-
{% data variables.product.prodname_copilot %} integrates with supported IDEs to help you throughout the development process. {% data variables.product.prodname_copilot_short %} can explain concepts, complete code, propose edits, and validate files with agent mode.
17+
{% data variables.product.prodname_copilot %} integrates with supported IDEs to help you throughout the development process. You can work alongside {% data variables.product.prodname_copilot_short %} in your editor, or delegate tasks to agents and review their results.
1818

1919
The available features and entry points vary by IDE. For a detailed comparison, see [AUTOTITLE](/copilot/reference/copilot-feature-matrix).
2020

21-
## How {% data variables.product.prodname_copilot_short %} helps in your IDE
21+
## {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_vscode_shortname %}
2222

23-
You can work with {% data variables.product.prodname_copilot_short %} in three main ways:
23+
{% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_vscode_shortname %} brings AI assistance and agent-driven development into the environment where you write, run, debug, and review code.
2424

25-
* **Code suggestions** help you write and edit code without leaving the editor.
26-
* **Chat** lets you ask questions, explain or refactor code, generate tests, and explore possible solutions.
27-
* **Agentic experiences** can plan and complete multi-step tasks by reading files, editing code, and running commands in your local development environment.
25+
### Benefits of using {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_vscode_shortname %}
2826

29-
These experiences complement each other. For example, you might use chat to understand an unfamiliar codebase, ask an agent to implement a change across several files, and use inline suggestions to refine the result.
27+
* **Stay in your development environment.** Work with agents alongside your editor, terminal, tests, source control, and debugger, so you can inspect and validate results with the tools you already use.
28+
* **Choose how much work to delegate.** Move between code suggestions, focused edits, interactive chat, planning, and autonomous agent work as your task evolves.
29+
* **Work on multiple tasks.** Run isolated agent sessions in parallel and use the Agents window to follow progress across projects.
30+
* **Use the environment your project needs.** Run agents where your code and tools live, whether on your machine or in a connected remote environment, so they work with the right operating system, runtimes, and dependencies.
31+
* **Choose your models and tools.** Use models provided with {% data variables.product.prodname_copilot_short %}, bring your own API key, or add models and tools through {% data variables.product.prodname_vscode_shortname %} extensions.
3032

31-
## Code suggestions
33+
### What you can do with {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_vscode_shortname %}
3234

33-
{% data variables.product.prodname_copilot_short %} can suggest code directly in the editor as you work. Depending on your IDE, these suggestions can include inline suggestions and {% data variables.copilot.next_edit_suggestions %}.
35+
Choose the most appropriate workflow for your task, from getting focused assistance in the editor to delegating work to agents.
3436

35-
### Inline suggestions
37+
* **Code suggestions:** Get suggestions directly in the editor as you work. See [AUTOTITLE](/copilot/how-tos/get-code-suggestions/get-ide-code-suggestions).
38+
* **Chat:** Ask questions about your codebase, compare approaches, and plan complex changes using context from your open files and workspace. Use inline chat for quick help within your code. See [AUTOTITLE](/copilot/how-tos/chat-with-copilot/chat-in-ide).
39+
* **Agent mode:** Ask an agent to find relevant code, edit files, run commands, and validate its work, while you review changes and redirect it as it works. See [AUTOTITLE](/copilot/how-tos/copilot-in-your-ide/use-copilot-agents/use-agent-mode).
40+
* **Parallel agent sessions:** Start, monitor, and review multiple agent sessions across projects from the Agents window. See [Agents window](https://code.visualstudio.com/docs/agents/run/agents-window) in the {% data variables.product.prodname_vscode_shortname %} documentation.
41+
* **Cloud agent sessions:** Manage {% data variables.copilot.copilot_cloud_agent %} sessions directly from your IDE. See [AUTOTITLE](/copilot/how-tos/copilot-in-your-ide/use-copilot-agents/use-cloud-agent-in-your-ide).
42+
* **Models and agent harnesses:** Choose a model based on the speed, reasoning, and cost your task needs. Use models included with {% data variables.product.prodname_copilot_short %}, bring your own key (BYOK), or install an extension that provides more models. You can also choose an agent harness. See [AUTOTITLE](/copilot/concepts/models/bring-your-own-key) and [Agent harnesses](https://code.visualstudio.com/docs/agents/run/agent-harnesses) in the {% data variables.product.prodname_vscode_shortname %} documentation.
43+
* **Local, remote, and containerized environments:** Run agents on your machine, in a Dev Container (Experimental), or on a remote machine over SSH or a dev tunnel. You can check progress from the Agents window, including in a browser on another device.
44+
* **Customizations:** Add project-specific context and capabilities with custom instructions, agent skills, hooks, Model Context Protocol (MCP) servers, and extensions.
45+
* **Terminal:** Run {% data variables.copilot.copilot_cli %} in the integrated terminal for a terminal-first agent experience.
3646

37-
Inline suggestions appear as dimmed text at your cursor position. {% data variables.product.prodname_copilot_short %} uses the code around your cursor and other available context to predict what you are likely to write next.
47+
For a full overview, see [Build with AI in VS Code](https://code.visualstudio.com/docs/agents/overview) in the {% data variables.product.prodname_vscode_shortname %} documentation.
3848

39-
Suggestions can complete part of a line, an entire line, or a larger block of code. You can also write a natural-language comment describing the code you want, then let {% data variables.product.prodname_copilot_short %} suggest an implementation.
49+
## Using {% data variables.product.prodname_copilot_short %} in other IDEs
4050

41-
You remain responsible for reviewing and testing suggested code before using it.
51+
For most supported IDEs, the **{% data variables.product.prodname_copilot %} extension or plugin** is the primary entry point. It connects {% data variables.product.prodname_copilot_short %} to your editor and provides the features supported by that IDE. To install the appropriate integration, see [AUTOTITLE](/copilot/how-tos/set-up/install-copilot-extension).
4252

43-
### {% data variables.copilot.next_edit_suggestions_caps %}
44-
45-
{% data variables.copilot.next_edit_suggestions_caps %} predict both where you are likely to make your next change and what that change could be. They are based on the edits you are currently making and can help you apply related changes elsewhere in a file.
46-
47-
For example, after you rename a method or change a data structure, {% data variables.product.prodname_copilot_short %} might suggest updating another location affected by that change.
48-
49-
Availability and configuration vary by IDE. For instructions on using inline and next edit suggestions, see [AUTOTITLE](/copilot/how-tos/get-code-suggestions/get-ide-code-suggestions).
50-
51-
{% data reusables.copilot.supported-languages %}
52-
53-
## Chat and agentic experiences
54-
55-
{% data variables.copilot.copilot_chat %} provides a conversational interface in your IDE. Because chat can use context from your project, you can ask questions about selected code, open files, or your wider codebase.
56-
57-
You can use chat to:
58-
59-
* Explain unfamiliar code.
60-
* Suggest fixes for bugs.
61-
* Refactor or document code.
62-
* Generate tests.
63-
* Compare implementation approaches.
64-
* Answer questions about programming languages and development tools.
65-
66-
For larger tasks, an agentic experience can break your request into steps and use tools to complete the work. Depending on your IDE and configuration, an agent can inspect your project, edit multiple files, run terminal commands, and respond to errors encountered while working.
67-
68-
Agentic changes are made in your local development environment. Review the proposed changes and the output of any commands before accepting the result.
69-
70-
For instructions on using chat and agents, see [AUTOTITLE](/copilot/how-tos/chat-with-copilot/chat-in-ide).
71-
72-
## Choosing an entry point
73-
74-
For most IDEs, the **{% data variables.product.prodname_copilot %} extension or plugin** is the primary entry point. It connects {% data variables.product.prodname_copilot_short %} directly to your editor and provides the features supported by that IDE. You can install the appropriate integration by following [AUTOTITLE](/copilot/how-tos/set-up/install-copilot-extension).
75-
76-
You can also run **{% data variables.copilot.copilot_cli %}** in an IDE's integrated terminal if the terminal environment meets the requirements for {% data variables.copilot.copilot_cli_short %}. Integration between CLI sessions and the IDE varies.
53+
You can also run {% data variables.copilot.copilot_cli %} in an IDE's integrated terminal if the terminal environment meets the requirements for {% data variables.copilot.copilot_cli_short %}. Integration between CLI sessions and the IDE varies.
7754

7855
### Entry points in JetBrains IDEs
7956

0 commit comments

Comments
 (0)