Skip to content

Commit 49096ee

Browse files
sean-mcmanussean-mcmanus
authored
Merge branch 'main' into seanmcm/doxygenGenerateOnCodeActionSetting
2 parents 6f60f85 + 55ef430 commit 49096ee

File tree

8 files changed

+52
-27
lines changed

8 files changed

+52
-27
lines changed

‎.github/actions/package-lock.json‎

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

‎.github/actions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@octokit/rest": "^21.1.1",
1616
"@slack/web-api": "^6.9.1",
1717
"applicationinsights": "^2.5.1",
18-
"axios": "^1.13.5",
18+
"axios": "^1.15.0",
1919
"uuid": "^8.3.2"
2020
},
2121
"devDependencies": {

‎Build/cg/cg.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,14 @@ extends:
107107
fi
108108
retryCountOnTaskFailure: 3
109109

110-
- script: |
111-
cd $(Build.SourcesDirectory)\Extension
112-
npx @vscode/vsce@3.7.1 package --yarn -o $(Build.ArtifactStagingDirectory)\Extension\cpptools.vsix
113-
name: ProcessRunner_12
110+
- script: yarn install --frozen-lockfile
111+
displayName: Install dependencies with yarn
112+
workingDirectory: $(Build.SourcesDirectory)\Extension
113+
114+
- script: if not exist node_modules\@vscode\vsce-sign\bin\vsce-sign.exe (echo Missing vsce-sign.exe && exit 1)
115+
displayName: Verify vsce-sign binary exists
116+
workingDirectory: $(Build.SourcesDirectory)\Extension
117+
118+
- script: npx vsce package --yarn -o $(Build.ArtifactStagingDirectory)\Extension\cpptools.vsix
114119
displayName: Run VSCE to package vsix
120+
workingDirectory: $(Build.SourcesDirectory)\Extension

‎Build/package/jobs_package_vsix.yml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,24 @@ jobs:
5959
- script: mkdir $(Build.ArtifactStagingDirectory)\vsix
6060
displayName: Create Staging Directory
6161

62-
- script: |
63-
cd $(Build.SourcesDirectory)\${{ parameters.srcDir }}
64-
npx @vscode/vsce@3.7.1 package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix
62+
- script: npm install --no-save --ignore-scripts=false --include=optional --force @vscode/vsce@3.7.1
63+
displayName: Install vsce
64+
workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
65+
66+
- script: npm rebuild @vscode/vsce-sign --ignore-scripts=false
67+
displayName: Rebuild vsce-sign binary
68+
workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
69+
70+
- script: if not exist node_modules\@vscode\vsce-sign\bin\vsce-sign.exe (echo Missing vsce-sign.exe && exit 1)
71+
displayName: Verify vsce-sign binary exists
72+
workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
73+
74+
- script: npx vsce package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix
6575
displayName: Run VSCE to package vsix
76+
workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
6677

6778
# sign the vsix
68-
- script: npx @vscode/vsce@3.7.1 generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest
79+
- script: npx vsce generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest
6980
displayName: generate manifest
7081
workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
7182
- script: copy $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s

‎Build/publish/jobs_publish_vsix.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,16 @@ jobs:
3131
$aadToken = az account get-access-token --query accessToken --resource $(AzureGuid) -o tsv
3232
Write-Host "##vso[task.setvariable variable=AAD_TOKEN;issecret=true]$aadToken"
3333
34-
- script: |
35-
npx @vscode/vsce@3.7.1 publish --skip-duplicate -i $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.vsix --manifestPath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.manifest --signaturePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s
34+
- script: npm install --no-save --ignore-scripts=false --include=optional --force @vscode/vsce@3.7.1
35+
displayName: Install vsce
36+
37+
- script: npm rebuild @vscode/vsce-sign --ignore-scripts=false
38+
displayName: Rebuild vsce-sign binary
39+
40+
- script: if not exist node_modules\@vscode\vsce-sign\bin\vsce-sign.exe (echo Missing vsce-sign.exe && exit 1)
41+
displayName: Verify vsce-sign binary exists
42+
43+
- script: npx vsce publish --skip-duplicate -i $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.vsix --manifestPath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.manifest --signaturePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s
3644
displayName: Publish to Marketplace
3745
env:
3846
VSCE_PAT: $(AAD_TOKEN)

‎Extension/src/common.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,6 @@ export function hasMsvcEnvironment(): boolean {
15491549
'INCLUDE',
15501550
'LIB',
15511551
'LIBPATH',
1552-
'UCRTVersion',
15531552
'UniversalCRTSdkDir',
15541553
'VCIDEInstallDir',
15551554
'VCINSTALLDIR',

‎Extension/walkthrough/installcompiler/install-compiler-windows10.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<h1 data-loc-id="walkthrough.windows.install.compiler">Install a C++ compiler on Windows</h1>
22
<p data-loc-id="walkthrough.windows.text1">If you&#39;re doing C++ development for Windows, we recommend installing the Microsoft Visual C++ (MSVC) compiler.</p>
33
<ol>
4-
<li><p data-loc-id="walkthrough.windows.text2">To install MSVC, open the VS Code terminal (CTRL + `) and paste in the following command:
5-
<pre><code style="white-space: pre-wrap;">winget install Microsoft.VisualStudio.2022.BuildTools --force --override "--wait --passive --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.20348"</code></pre>
6-
</li>
4+
<li><p data-loc-id="walkthrough.windows.text2">To install MSVC, open the VS Code terminal (CTRL + `) and paste in the following command:</p>
5+
<p><code>winget install Microsoft.<wbr>VisualStudio.<wbr>2022.<wbr>BuildTools --force --override "--wait --passive --add Microsoft.<wbr>VisualStudio.<wbr>Workload.<wbr>VCTools --add Microsoft.<wbr>VisualStudio.<wbr>Component.<wbr>VC.<wbr>Tools.<wbr>x86.<wbr>x64 --add Microsoft.<wbr>VisualStudio.<wbr>Component.<wbr>Windows10SDK.<wbr>19041"</code></p>
76
<blockquote>
87
<p><strong data-loc-id="walkthrough.windows.note1">Note</strong>: <span data-loc-id="walkthrough.windows.note1.text">You can use the C++ toolset from Visual Studio Build Tools along with Visual Studio Code to compile, build, and verify any C++ codebase as long as you also have a valid Visual Studio license (either Community, Pro, or Enterprise) that you are actively using to develop that C++ codebase.</span></p>
98
</blockquote>

‎Extension/walkthrough/installcompiler/install-compiler-windows11.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<h1 data-loc-id="walkthrough.windows.install.compiler">Install a C++ compiler on Windows</h1>
22
<p data-loc-id="walkthrough.windows.text1">If you&#39;re doing C++ development for Windows, we recommend installing the Microsoft Visual C++ (MSVC) compiler.</p>
33
<ol>
4-
<li><p data-loc-id="walkthrough.windows.text2">To install MSVC, open the VS Code terminal (CTRL + `) and paste in the following command:
5-
<pre><code style="white-space: pre-wrap;">winget install Microsoft.VisualStudio.2022.BuildTools --force --override "--wait --passive --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows11SDK.26100"</code></pre>
6-
</li>
4+
<li><p data-loc-id="walkthrough.windows.text2">To install MSVC, open the VS Code terminal (CTRL + `) and paste in the following command:</p>
5+
<p><code>winget install Microsoft.<wbr>VisualStudio.<wbr>2022.<wbr>BuildTools --force --override "--wait --passive --add Microsoft.<wbr>VisualStudio.<wbr>Workload.<wbr>VCTools --add Microsoft.<wbr>VisualStudio.<wbr>Component.<wbr>VC.<wbr>Tools.<wbr>x86.<wbr>x64 --add Microsoft.<wbr>VisualStudio.<wbr>Component.<wbr>Windows11SDK.<wbr>26100"</code></p>
76
<blockquote>
87
<p><strong data-loc-id="walkthrough.windows.note1">Note</strong>: <span data-loc-id="walkthrough.windows.note1.text">You can use the C++ toolset from Visual Studio Build Tools along with Visual Studio Code to compile, build, and verify any C++ codebase as long as you also have a valid Visual Studio license (either Community, Pro, or Enterprise) that you are actively using to develop that C++ codebase.</span></p>
98
</blockquote>

0 commit comments

Comments
 (0)