microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-11 13:56:33 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

build: force the latest VCToolsVersion; see DD-1541167 for more (#17156)

Browse Source 
Stolen from PowerToys.

BODGY
This commit is contained in:
Dustin L. Howett 2024-04-29 12:52:00 -05:00 committed by GitHub
parent 5b8eadb2ea
commit 5d2d3856a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/pipelines/templates-v2/job-build-project.yml
View File

@ -142,6 +142,10 @@ jobs:
- template: .\steps-restore-nuget.yml - template: .\steps-restore-nuget.yml
- pwsh: |-
.\build\scripts\Set-LatestVCToolsVersion.ps1
displayName: Work around DD-1541167 (VCToolsVersion)
- ${{ parameters.beforeBuildSteps }} - ${{ parameters.beforeBuildSteps }}
- task: VSBuild@1 - task: VSBuild@1

8
build/scripts/Set-LatestVCToolsVersion.ps1 Normal file
View File

@ -0,0 +1,8 @@
$VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
$VSPackages = $VSInstances.instances.instance.packages.package
$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.CRT.Source" })
$LatestVCToolsVersion = $LatestVCPackage.version;
Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
Write-Output "Updating VCToolsVersion environment variable for job"
Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

1
src/interactivity/onecore/SystemConfigurationProvider.cpp
View File

@ -61,6 +61,7 @@ void SystemConfigurationProvider::GetSettingsFromLink(
// Hence, we make it seem like the console is in fact configured to use a // Hence, we make it seem like the console is in fact configured to use a
// TrueType font by the user. // TrueType font by the user.
#pragma warning(suppress : 26485) // This isn't even really _supposed to be_ an array-to-pointer decay: it's passed as a string view.
pLinkSettings->SetFaceName(DEFAULT_TT_FONT_FACENAME); pLinkSettings->SetFaceName(DEFAULT_TT_FONT_FACENAME);
pLinkSettings->SetFontFamily(TMPF_TRUETYPE); pLinkSettings->SetFontFamily(TMPF_TRUETYPE);