Skip to content

Commit d956f2e

Browse files
mattpollardmattpollard
authored
Merge branch 'main' into 3.2.18,3.3.13,3.6.1,3.5.5,3.4.8-release-notes
2 parents 22dc833 + dbb8426 commit d956f2e

File tree

250 files changed

+60537
-26896
lines changed

Some content is hidden

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

250 files changed

+60537
-26896
lines changed

‎assets/images/help/classroom/classroom-settings-click-google-classroom.png

27.5 KB
Loading

‎assets/images/help/settings/cookie-settings-accept-or-reject.png

60.8 KB
Loading

‎assets/images/help/settings/cookie-settings-manage.png

6.29 KB
Loading

‎assets/images/help/settings/cookie-settings-save.png

67.5 KB
Loading

‎components/lib/get-rest-code-samples.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ export function getGHExample(operation: Operation, codeSample: CodeSample) {
8686
requestBodyParams = Object.keys(codeSample.request.bodyParameters)
8787
.map((key) => {
8888
if (typeof codeSample.request.bodyParameters[key] === 'string') {
89-
return `-f ${key}='${codeSample.request.bodyParameters[key]}'\n`
89+
return `-f ${key}='${codeSample.request.bodyParameters[key]}' `
9090
} else {
91-
return `-F ${key}=${codeSample.request.bodyParameters[key]}\n`
91+
return `-F ${key}=${codeSample.request.bodyParameters[key]} `
9292
}
9393
})
94-
.join(' ')
94+
.join('\\\n ')
9595
}
9696
const args = [
9797
operation.verb !== 'get' && `--method ${operation.verb.toUpperCase()}`,

‎components/playground/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-project-for-codespaces/dotnet.tsx

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,26 @@ const article: PlaygroundArticleT = {
5353
5454
To set up your repository to use a custom dev container, you will need to create one or more \`devcontainer.json\` files. You can add these either from a template, in Visual Studio Code, or you can write your own. For more information on dev container configurations, see "[Introduction to dev containers](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project)".
5555
56-
1. Access the Command Palette (<kbd>Shift</kbd> + <kbd>Command</kbd> + <kbd>P</kbd> / <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
57-
![Codespaces: Add Development Container Configuration Files... in the command palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
56+
1. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
57+
58+
![Codespaces: Add Development Container Configuration Files... in the Command Palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
59+
5860
2. For this example, click **C# (.NET)**. If you need additional features you can select any container that’s specific to C# (.NET) or a combination of tools such as C# (.NET) and MS SQL.
5961
60-
![Select C# (.NET) option from the list](/assets/images/help/codespaces/add-dotnet-prebuilt-container.png)
62+
![Select C# (.NET) option from the list](/assets/images/help/codespaces/add-dotnet-prebuilt-container.png)
63+
6164
3. Click the recommended version of .NET.
62-
![.NET version selection](/assets/images/help/codespaces/add-dotnet-version.png)
65+
66+
![.NET version selection](/assets/images/help/codespaces/add-dotnet-version.png)
67+
6368
4. Accept the default option to add Node.js to your customization.
64-
![Add Node.js selection](/assets/images/help/codespaces/dotnet-options.png)
69+
70+
![Add Node.js selection](/assets/images/help/codespaces/dotnet-options.png)
71+
6572
5. Select any additional features to install and click **OK**.
66-
6. Access the command palette (<kbd>Shift</kbd> + <kbd>Command</kbd> + <kbd>P</kbd> / <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
67-
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
73+
6. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
74+
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
75+
6876
`,
6977
},
7078
{
@@ -197,13 +205,16 @@ const article: PlaygroundArticleT = {
197205
"postCreateCommand": "dotnet restore",
198206
\`\`\`
199207
200-
4. Access the command palette (\`Shift + Command + P\`/ \`Ctrl + Shift + P\`), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
201-
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
202-
Rebuilding inside your codespace ensures your changes work as expected before you commit the changes to the repository. If something does result in a failure, you’ll be placed in a codespace with a recovery container that you can rebuild from to keep adjusting your container.
208+
4. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
209+
210+
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
211+
212+
Rebuilding inside your codespace ensures your changes work as expected before you commit the changes to the repository. If something does result in a failure, you’ll be placed in a codespace with a recovery container that you can rebuild from to keep adjusting your container.
203213
204214
5. Check your changes were successfully applied by verifying the "Code Spell Checker" extension was installed.
205215
206-
![Extensions list](/assets/images/help/codespaces/dotnet-extensions.png)
216+
![Extensions list](/assets/images/help/codespaces/dotnet-extensions.png)
217+
207218
`,
208219
},
209220
{
@@ -217,9 +228,10 @@ const article: PlaygroundArticleT = {
217228
218229
1. Run your application by pressing \`F5\` or entering \`dotnet watch run\` in your terminal.
219230
220-
2. When your project starts, you should see a message in the bottom right corner with a prompt to connect to the port your project uses.
231+
2. When your project starts, you should see a message in the bottom right corner with a prompt to connect to the port your project uses.
232+
233+
![Port forwarding toast](/assets/images/help/codespaces/python-port-forwarding.png)
221234
222-
![Port forwarding toast](/assets/images/help/codespaces/python-port-forwarding.png)
223235
`,
224236
},
225237
{

‎components/playground/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-project-for-codespaces/java.tsx

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,23 @@ const article: PlaygroundArticleT = {
5151
5252
To set up your repository to use a custom dev container, you will need to create one or more \`devcontainer.json\` files. You can add these either from a template, in Visual Studio Code, or you can write your own. For more information on dev container configurations, see "[Introduction to dev containers](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project)".
5353
54-
1. Access the Command Palette (\`Shift + Command + P\` / \`Ctrl + Shift + P\`), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
55-
!["Codespaces: Add Development Container Configuration Files..." in the command palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
54+
1. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
55+
56+
!["Codespaces: Add Development Container Configuration Files..." in the Command Palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
57+
5658
2. For this example, click **Java**. In practice, you could select any container that’s specific to Java or a combination of tools such as Java and Azure Functions.
57-
![Select Java option from the list](/assets/images/help/codespaces/add-java-prebuilt-container.png)
59+
60+
![Select Java option from the list](/assets/images/help/codespaces/add-java-prebuilt-container.png)
61+
5862
3. Click the recommended version of Java.
59-
![Java version selection](/assets/images/help/codespaces/add-java-version.png)
63+
64+
![Java version selection](/assets/images/help/codespaces/add-java-version.png)
65+
6066
4. Select any additional features to install and click **OK**.
61-
5. Access the command palette (\`Shift + Command + P\`/ \`Ctrl + Shift + P\`), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
62-
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
67+
5. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
68+
69+
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
70+
6371
`,
6472
},
6573
{
@@ -185,9 +193,11 @@ const article: PlaygroundArticleT = {
185193
186194
For more information about \`devcontainer.json\` properties, see the Visual Studio Code documentation: "[devcontainer.json reference](https://code.visualstudio.com/docs/remote/devcontainerjson-reference)."
187195
188-
4. Access the command palette (\`Shift + Command + P\`/ \`Ctrl + Shift + P\`), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
189-
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
190-
Rebuilding inside your codespace ensures your changes work as expected before you commit the changes to the repository. If something does result in a failure, you’ll be placed in a codespace with a recovery container that you can rebuild from to keep adjusting your container.
196+
4. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
197+
198+
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
199+
200+
Rebuilding inside your codespace ensures your changes work as expected before you commit the changes to the repository. If something does result in a failure, you’ll be placed in a codespace with a recovery container that you can rebuild from to keep adjusting your container.
191201
`,
192202
},
193203
{

‎components/playground/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-project-for-codespaces/nodejs.tsx

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const article: PlaygroundArticleT = {
2929
content: dedent`
3030
1. Under the repository name, use the **Code** drop-down menu, and in the **Codespaces** tab, click **Create codespace on BRANCH**.
3131
32-
![New codespace button](/assets/images/help/codespaces/new-codespace-button.png)
32+
![New codespace button](/assets/images/help/codespaces/new-codespace-button.png)
3333
3434
If you don’t see this option, GitHub Codespaces isn't available for your project. See [Access to GitHub Codespaces](/codespaces/developing-in-codespaces/creating-a-codespace#access-to-codespaces) for more information.
3535
@@ -51,15 +51,23 @@ const article: PlaygroundArticleT = {
5151
5252
To set up your repository to use a custom dev container, you will need to create one or more \`devcontainer.json\` files. You can add these either from a template, in Visual Studio Code, or you can write your own. For more information on dev container configurations, see "[Introduction to dev containers](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project)".
5353
54-
1. Access the Command Palette (\`Shift + Command + P\` / \`Ctrl + Shift + P\`), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
55-
!["Codespaces: Add Development Container Configuration Files..." in the command palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
54+
1. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
55+
56+
!["Codespaces: Add Development Container Configuration Files..." in the Command Palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
57+
5658
2. For this example, click **Node.js**. If you need additional features you can select any container that’s specific to Node or a combination of tools such as Node and MongoDB.
57-
![Select Node option from the list](/assets/images/help/codespaces/add-node-prebuilt-container.png)
59+
60+
![Select Node option from the list](/assets/images/help/codespaces/add-node-prebuilt-container.png)
61+
5862
3. Click the recommended version of Node.js.
59-
![Node.js version selection](/assets/images/help/codespaces/add-node-version.png)
63+
64+
![Node.js version selection](/assets/images/help/codespaces/add-node-version.png)
65+
6066
4. Select any additional features to install and click **OK**.
61-
5. Access the command palette (\`Shift + Command + P\`/ \`Ctrl + Shift + P\`), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
62-
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
67+
5. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
68+
69+
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
70+
6371
`,
6472
},
6573
{
@@ -173,7 +181,9 @@ const article: PlaygroundArticleT = {
173181
With your dev container configuration added and a basic understanding of what everything does, you can now make changes to customize your environment further. In this example, you'll add properties to install npm when your codespace launches and make a list of ports inside the container available locally.
174182
175183
1. In the Explorer, select the \`devcontainer.json\` file from the tree to open it. You might have to expand the \`.devcontainer\` folder to see it.
176-
![devcontainer.json file in the Explorer](/assets/images/help/codespaces/devcontainers-options.png)
184+
185+
![devcontainer.json file in the Explorer](/assets/images/help/codespaces/devcontainers-options.png)
186+
177187
2. Add the following lines to your \`devcontainer.json\` file after \`extensions\`:
178188
179189
\`\`\`js{:copy}
@@ -182,10 +192,11 @@ const article: PlaygroundArticleT = {
182192
\`\`\`
183193
For more information about \`devcontainer.json\` properties, see the Visual Studio Code documentation: "[devcontainer.json reference](https://code.visualstudio.com/docs/remote/devcontainerjson-reference)."
184194
185-
1. Access the command palette (\`Shift + Command + P\`/ \`Ctrl + Shift + P\`), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
186-
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
195+
3. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
196+
197+
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
187198
188-
Rebuilding inside your codespace ensures your changes work as expected before you commit the changes to the repository. If something does result in a failure, you’ll be placed in a codespace with a recovery container that you can rebuild from to keep adjusting your container.
199+
Rebuilding inside your codespace ensures your changes work as expected before you commit the changes to the repository. If something does result in a failure, you’ll be placed in a codespace with a recovery container that you can rebuild from to keep adjusting your container.
189200
`,
190201
},
191202
{

‎components/playground/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-project-for-codespaces/python.tsx

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ const article: PlaygroundArticleT = {
2929
content: dedent`
3030
1. Under the repository name, use the **Code** drop-down menu, and in the **Codespaces** tab, click **Create codespace on BRANCH**.
3131
32-
![New codespace button](/assets/images/help/codespaces/new-codespace-button.png)
32+
![New codespace button](/assets/images/help/codespaces/new-codespace-button.png)
3333
34-
If you don’t see this option, GitHub Codespaces isn't available for your project. See [Access to GitHub Codespaces](/codespaces/developing-in-codespaces/creating-a-codespace#access-to-codespaces) for more information.
34+
If you don’t see this option, GitHub Codespaces isn't available for your project. See [Access to GitHub Codespaces](/codespaces/developing-in-codespaces/creating-a-codespace#access-to-codespaces) for more information.
3535
3636
When you create a codespace, your project is created on a remote VM that is dedicated to you. By default, the container for your codespace has many languages and runtimes including Python, pip, and Miniconda. It also includes a common set of tools like git, wget, rsync, openssh, and nano.
3737
@@ -53,17 +53,27 @@ const article: PlaygroundArticleT = {
5353
5454
To set up your repository to use a custom dev container, you will need to create one or more \`devcontainer.json\` files. You can add these either from a template, in Visual Studio Code, or you can write your own. For more information on dev container configurations, see "[Introduction to dev containers](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project)".
5555
56-
1. Access the command palette (\`Shift + Command + P\` / \`Ctrl + Shift + P\`), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
57-
!["Codespaces: Add Development Container Configuration Files..." in the command palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
56+
1. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "dev container". Select **Codespaces: Add Development Container Configuration Files...**.
57+
58+
!["Codespaces: Add Development Container Configuration Files..." in the Command Palette](/assets/images/help/codespaces/add-prebuilt-container-command.png)
59+
5860
2. For this example, click **Python 3**. If you need additional features you can select any container that’s specific to Python or a combination of tools such as Python 3 and PostgreSQL.
59-
![Select Python option from the list](/assets/images/help/codespaces/add-python-prebuilt-container.png)
61+
62+
![Select Python option from the list](/assets/images/help/codespaces/add-python-prebuilt-container.png)
63+
6064
3. Click the recommended version of Python.
61-
![Python version selection](/assets/images/help/codespaces/add-python-version.png)
65+
66+
![Python version selection](/assets/images/help/codespaces/add-python-version.png)
67+
6268
4. Accept the default option to add Node.js to your customization.
63-
![Add Node.js selection](/assets/images/help/codespaces/add-nodejs-selection.png)
69+
70+
![Add Node.js selection](/assets/images/help/codespaces/add-nodejs-selection.png)
71+
6472
5. Select any additional features to install and click **OK**.
65-
6. Access the command palette (\`Shift + Command + P\` / \`Ctrl + Shift + P\`), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
66-
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
73+
6. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
74+
75+
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
76+
6777
`,
6878
},
6979
{
@@ -197,7 +207,7 @@ const article: PlaygroundArticleT = {
197207
"postCreateCommand": "pip3 install --user -r requirements.txt",
198208
\`\`\`
199209
200-
4. Access the command palette (\`Shift + Command + P\` / \`Ctrl + Shift + P\`), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
210+
4. Access the Command Palette (<kbd>Shift</kbd>+<kbd>Command</kbd>+<kbd>P</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>), then start typing "rebuild". Select **Codespaces: Rebuild Container**.
201211
202212
![Rebuild container option](/assets/images/help/codespaces/codespaces-rebuild.png)
203213

0 commit comments

Comments
 (0)