Skip to content

Commit 89b9804

Browse files
ntroghntrogh
committed
Merge branch 'main' into vnext
1 parent 6e02427 commit 89b9804

File tree

7 files changed

+248
-7
lines changed

7 files changed

+248
-7
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
239:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2024-10-11
9+
eslint:
10+
lastModifiedDate: 2024-10-11
11+
psscriptanalyzer:
12+
lastModifiedDate: 2024-10-11
13+
armory:
14+
lastModifiedDate: 2024-10-11
15+
accessibilityinsights:
16+
lastModifiedDate: 2025-06-03
17+
binary:
18+
credscan:
19+
lastModifiedDate: 2024-10-11
20+
binskim:
21+
lastModifiedDate: 2025-01-09
22+
spotbugs:
23+
lastModifiedDate: 2024-10-11
24+
237:
25+
retail:
26+
source:
27+
credscan:
28+
lastModifiedDate: 2025-08-05
29+
eslint:
30+
lastModifiedDate: 2025-08-05
31+
psscriptanalyzer:
32+
lastModifiedDate: 2025-08-05
33+
armory:
34+
lastModifiedDate: 2025-08-05
35+
accessibilityinsights:
36+
lastModifiedDate: 2025-08-05
37+
binary:
38+
credscan:
39+
lastModifiedDate: 2025-08-05
40+
binskim:
41+
lastModifiedDate: 2025-08-05
42+
spotbugs:
43+
lastModifiedDate: 2025-08-05

‎.config/guardian/.gdnbaselines

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2025-08-05 08:36:03Z",
10+
"lastUpdatedDate": "2025-08-05 08:36:03Z"
11+
}
12+
},
13+
"results": {
14+
"a25577ddc699e709832bc436bbe266a47aa2e7fd72110237d621acaa8a858ec0": {
15+
"signature": "a25577ddc699e709832bc436bbe266a47aa2e7fd72110237d621acaa8a858ec0",
16+
"alternativeSignatures": [],
17+
"target": ".git/lfs/logs/20250805T083310.2996896.log",
18+
"line": 78,
19+
"memberOf": [
20+
"default"
21+
],
22+
"tool": "credscan",
23+
"ruleId": "CSCAN-GENERAL0120",
24+
"createdDate": "2025-08-05 08:36:03Z",
25+
"expirationDate": "2026-01-22 08:42:50Z",
26+
"justification": "This error is baselined with an expiration date of 180 days from 2025-08-05 08:42:50Z"
27+
}
28+
}
29+
}

‎api/working-with-extensions/publishing-extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Once unpublished, the extension's Availability status is changed to **Unpublishe
175175
![Unpublished extension](images/publishing-extension/unpublished-extension.png)
176176

177177
> [!NOTE]
178-
> When you unpublish an extension, the Marketplace preserves the extension statistics.
178+
> When you unpublish an extension, the Marketplace preserves the extension statistics. The extension remains publicly discoverable and available via an existing API.
179179

180180
## Removing extensions
181181

‎docs/languages/ruby.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This topic goes into detail about setting up and using Ruby within Visual Studio
1616

1717
### Install Ruby through a version manager
1818

19-
While Ruby is installed by default on some operating systems (such as macOS and some distributions of Linux), we recommend using a version manager such as [rbenv](https://github.com/rbenv/rbenv) to be able to access newer versions of Ruby on Windows, macOS, and Linux. Follow the [installation guidance](https://github.com/rbenv/rbenv#installation) for your platform.
19+
While Ruby is installed by default on some operating systems (such as macOS and some distributions of Linux), we recommend using a version manager to access newer versions of Ruby such as [rbenv](https://github.com/rbenv/rbenv) on macOS and Linux and [rbenv on Windows](https://github.com/RubyMetric/rbenv-for-windows). Follow the [installation guidance](https://github.com/rbenv/rbenv#installation) for your platform.
2020

2121
>**Note**: As with installing any new toolset on your machine, you'll want to make sure to restart your terminal/Command Prompt and VS Code instances to use the updated toolset location in your platform's PATH variable.
2222
@@ -31,7 +31,7 @@ We'll discuss many of Ruby LSP features in this topic but you can also refer to
3131

3232
### Check your installation
3333

34-
After installing, check the language status item to see the status of the Ruby LSP server. If the version manager has been configured, it should display the right Ruby version for your project. The server status should display starting or running, but not error.
34+
After installing, check the language status item in the **Status Bar** to see the status of the Ruby LSP server. If the version manager has been configured, it should display the right Ruby version for your project. The server status should display starting or running, but not error.
3535

3636
![Ruby LSP language status center](images/ruby/ruby_lsp_status_center.png)
3737

‎docs/terminal/basics.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ You can have terminal editors on either side or arranged in multiple dimensions
7272

7373
The `setting(terminal.integrated.defaultLocation)` setting can change the default `view` or `editor` area terminal location.
7474

75+
## Terminals in new windows
76+
77+
To open a terminal in a new window:
78+
79+
1. Right-click the terminal tab if you have multiple terminals, or left-click the tab if you only have a single terminal opened
80+
1. Select **Move Terminal to New Window**
81+
This opens the [terminal editor](#terminals-in-editor-area) in its own VS Code window
82+
83+
![Screenshot showing a terminal in its own separate window.](images/basics/terminal-new-window.png)
84+
7585
## Navigating the buffer
7686

7787
The content in the terminal is called the buffer, with the section right above the bottom viewport being called "scrollback". The amount of scrollback kept is determined by the `setting(terminal.integrated.scrollback)` [setting](/docs/configure/settings.md) and defaults to `1000` lines.

‎docs/terminal/images/basics/terminal-new-window.png

Lines changed: 3 additions & 0 deletions
Loading

‎release-notes/css/inproduct_releasenotes.css

Lines changed: 160 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
21
html {
3-
font-size: 10px;
2+
font-size: 10px;
3+
height: 100%;
4+
overscroll-behavior: none;
45
}
56
body {
6-
padding-bottom: 100px;
77
margin: 0 auto;
88
max-width: 980px;
9+
height: auto;
10+
overflow-y: auto;
11+
overscroll-behavior: none;
912
}
1013

1114
#scroll-to-top {
@@ -45,4 +48,157 @@ body.vscode-high-contrast #scroll-to-top {
4548
-webkit-mask-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE5LjIuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAxNiAxNiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTYgMTY7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5zdDB7ZmlsbDojRkZGRkZGO30KCS5zdDF7ZmlsbDpub25lO30KPC9zdHlsZT4KPHRpdGxlPnVwY2hldnJvbjwvdGl0bGU+CjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik04LDUuMWwtNy4zLDcuM0wwLDExLjZsOC04bDgsOGwtMC43LDAuN0w4LDUuMXoiLz4KPHJlY3QgY2xhc3M9InN0MSIgd2lkdGg9IjE2IiBoZWlnaHQ9IjE2Ii8+Cjwvc3ZnPgo=');
4649
width: 16px;
4750
height: 16px;
48-
}
51+
}
52+
53+
/* Header styling */
54+
h2 {
55+
margin-top: 1.2em;
56+
scroll-margin-top: 1.2em;
57+
}
58+
59+
h2:not(:first-of-type) {
60+
margin-top: 4em;
61+
scroll-margin-top: 1em;
62+
}
63+
64+
h3 {
65+
margin-top: 4em;
66+
scroll-margin-top: 1em;
67+
}
68+
69+
h2 + h3 {
70+
margin-top: 0;
71+
}
72+
73+
/* Sparkle chat button styling */
74+
#sparkle-chat {
75+
position: fixed;
76+
top: 20px;
77+
right: 20px;
78+
width: 40px;
79+
height: 40px;
80+
background: var(--vscode-button-secondaryBackground, #3c3c3c);
81+
border: .25px solid var(--vscode-button-secondaryBorder, #6c6c6c);
82+
border-radius: 50%;
83+
display: flex;
84+
align-items: center;
85+
justify-content: center;
86+
cursor: pointer;
87+
z-index: 1000;
88+
text-decoration: none;
89+
transition: background-color 0.2s;
90+
}
91+
92+
#sparkle-chat:hover {
93+
background: var(--vscode-button-secondaryHoverBackground, #1177bb);
94+
}
95+
96+
#sparkle-chat:focus {
97+
outline: none;
98+
border: .25px solid var(--vscode-button-secondaryBorder, #6c6c6c);
99+
}
100+
101+
#sparkle-chat::before {
102+
content: "";
103+
width: 16px;
104+
height: 16px;
105+
background-image: url("data:image/svg+xml,%3Csvg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cg%3E%3Cpath d='M8.66535 15.7345C8.90969 15.9075 9.20192 15.9999 9.50129 15.9989V15.9949C9.78358 15.9955 10.0598 15.9132 10.2957 15.7582C10.5316 15.6031 10.7168 15.3822 10.8283 15.1229L11.4413 13.2589C11.5829 12.8366 11.8207 12.4531 12.1361 12.1386C12.4514 11.8241 12.8356 11.5873 13.2583 11.4469L15.0363 10.8689C15.3227 10.7683 15.5701 10.5799 15.7432 10.3305C15.9164 10.0812 16.0065 9.7836 16.0007 9.48009C15.9949 9.17659 15.8936 8.88262 15.7111 8.64003C15.5286 8.39744 15.2743 8.21858 14.9843 8.12889L13.2293 7.55889C12.8048 7.41763 12.419 7.1793 12.1027 6.86283C11.7864 6.54637 11.5483 6.1605 11.4073 5.73589L10.8293 3.95889C10.7285 3.67586 10.542 3.43127 10.2958 3.25908C10.0496 3.0869 9.7559 2.99567 9.45547 2.99809C9.15504 3.00051 8.86282 3.09645 8.61942 3.27258C8.37602 3.44871 8.19353 3.69628 8.09729 3.98089L7.51429 5.77289C7.37371 6.18515 7.14135 6.56012 6.83474 6.8695C6.52813 7.17888 6.15528 7.4146 5.74429 7.55889L3.96729 8.12989C3.75592 8.20382 3.56463 8.32589 3.40855 8.48647C3.25247 8.64704 3.13587 8.84172 3.06798 9.05511C3.00008 9.2685 2.98274 9.49475 3.01733 9.716C3.05193 9.93724 3.1375 10.1474 3.26729 10.3299C3.44418 10.5789 3.69508 10.7657 3.98429 10.8639L5.73829 11.4329C6.16392 11.5753 6.55049 11.815 6.86729 12.1329C6.95236 12.2173 7.03186 12.3072 7.10529 12.4019C7.30447 12.6597 7.45833 12.9495 7.56029 13.2589L8.13829 15.0339C8.23676 15.3166 8.42102 15.5615 8.66535 15.7345ZM16.332 20.7819C16.1415 20.6461 15.9981 20.4541 15.922 20.2329L15.594 19.2259C15.5302 19.0344 15.4231 18.8602 15.281 18.7169C15.1385 18.574 14.9645 18.4664 14.773 18.4029L13.782 18.0799C13.5516 18.0026 13.3516 17.8541 13.211 17.6559C13.0737 17.4636 13.0002 17.2331 13.001 16.9969C13.0013 16.7591 13.0757 16.5274 13.214 16.3339C13.3512 16.1394 13.5466 15.9934 13.772 15.9169L14.778 15.5909C14.965 15.5245 15.1343 15.4162 15.273 15.2742C15.4117 15.1322 15.516 14.9604 15.578 14.7719L15.902 13.7799C15.9782 13.5557 16.1222 13.3606 16.3141 13.2218C16.5059 13.0829 16.7362 13.0071 16.973 13.0048C17.2099 13.0025 17.4416 13.0738 17.6361 13.2089C17.8306 13.344 17.9784 13.5362 18.059 13.7589L18.388 14.7729C18.4524 14.963 18.5599 15.1356 18.7022 15.2771C18.8445 15.4187 19.0176 15.5254 19.208 15.5889L20.2 15.9119C20.4287 15.9834 20.629 16.1251 20.7727 16.3169C20.9163 16.5086 20.9959 16.7408 21.0002 16.9803C21.0045 17.2199 20.9333 17.4547 20.7967 17.6516C20.6601 17.8484 20.4649 17.9972 20.239 18.0769L19.225 18.4059C19.0349 18.4707 18.8622 18.5781 18.72 18.7199C18.5777 18.8627 18.4705 19.0366 18.407 19.2279L18.085 20.2169C18.0075 20.4472 17.8586 20.6469 17.66 20.7869C17.468 20.9249 17.2375 20.9991 17.001 20.9989C16.7607 20.9989 16.5265 20.9229 16.332 20.7819Z' fill='%23cccccc' /%3E%3C/g%3E%3C/svg%3E");
106+
background-size: contain;
107+
background-repeat: no-repeat;
108+
background-position: center;
109+
display: block;
110+
}
111+
112+
/* Highlights table styling */
113+
.highlights-table {
114+
border-collapse: collapse;
115+
border: none;
116+
}
117+
118+
.highlights-table th {
119+
vertical-align: top;
120+
border: none;
121+
padding-top: 2em;
122+
font-weight: bold;
123+
}
124+
125+
.highlights-table td {
126+
vertical-align: top;
127+
border: none;
128+
}
129+
130+
.highlights-table tr:nth-child(2) td {
131+
padding-bottom: 1em;
132+
}
133+
134+
/* Main content layout */
135+
.toc-nav-layout {
136+
display: flex;
137+
align-items: flex-start;
138+
}
139+
140+
/* TOC Navigation */
141+
#toc-nav {
142+
position: sticky;
143+
top: 20px;
144+
width: 10vw;
145+
min-width: 120px;
146+
margin-right: 32px;
147+
margin-top: 2em;
148+
}
149+
150+
#toc-nav > div {
151+
font-weight: bold;
152+
font-size: 1em;
153+
margin-bottom: 1em;
154+
text-transform: uppercase;
155+
}
156+
157+
#toc-nav ul {
158+
list-style: none;
159+
padding: 0;
160+
margin: 0;
161+
}
162+
163+
#toc-nav ul li {
164+
margin-bottom: 0.5em;
165+
}
166+
167+
#toc-nav a {
168+
color: var(--vscode-editor-foreground, #ccc);
169+
text-decoration: none !important;
170+
transition: background-color 0.2s, color 0.2s;
171+
padding: 4px 6px;
172+
margin: -4px -6px;
173+
border-radius: 4px;
174+
display: block;
175+
outline: none;
176+
}
177+
178+
#toc-nav a:hover {
179+
background-color: var(--vscode-button-secondaryHoverBackground, #1177bb);
180+
color: var(--vscode-button-secondaryForeground, #ffffff);
181+
cursor: pointer;
182+
text-decoration: none !important;
183+
}
184+
185+
/* Main content area */
186+
.notes-main {
187+
flex: 1;
188+
min-width: 0;
189+
}
190+
191+
/* Responsive breakpoint - Hide TOC on smaller screens */
192+
@media (max-width: 576px) {
193+
#toc-nav {
194+
display: none;
195+
}
196+
197+
.toc-nav-layout {
198+
flex-direction: column;
199+
}
200+
201+
.notes-main {
202+
margin-left: 0;
203+
}
204+
}

0 commit comments

Comments
 (0)