Skip to content

[build] Use $(VSINSTALLDIR), not $(VSINSTALLROOT) #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 6 commits into from
Oct 10, 2022
Merged

[build] Use $(VSINSTALLDIR), not $(VSINSTALLROOT) #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28d7840
[build] Use $(VSINSTALLDIR), not $(VSINSTALLROOT)
jonpryor Oct 7, 2022
7cbfe43
Fails on CI. (Of course!)
jonpryor Oct 7, 2022
70e50b4
Why %VSINSTALLROOT%?
jonpryor Oct 7, 2022
2f0d464
Did the squircle work?
jonpryor Oct 7, 2022
0a6669f
Fixity fix?
jonpryor Oct 7, 2022
ab4b9e3
Remove debug logging
jonpryor Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ variables:
1ESWindowsImage: AzurePipelinesWindows2022compliant
1ESMacPool: Azure Pipelines
1ESMacImage: internal-macos-11
VSInstallRoot: C:\Program Files\Microsoft Visual Studio\2022\Enterprise

jobs:
- job: windows_build
Expand Down Expand Up @@ -85,6 +84,8 @@ jobs:
name: $(1ESWindowsPool)
demands:
- ImageOverride -equals $(1ESWindowsImage)
variables:
VSINSTALLDIR: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
timeoutInMinutes: 20
workspace:
clean: all
Expand Down
6 changes: 4 additions & 2 deletions build-tools/scripts/NativeToolchain.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform ('windows')) And '$(VSINSTALLROOT)' != '' ">
<_VcvarsallPath>$(VSINSTALLROOT)\VC\Auxiliary\Build\vcvarsall.bat</_VcvarsallPath>
<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform ('windows')) ">
<_VSInstallDir Condition=" '$(VsInstallRoot)' != '' ">$(VsInstallRoot)</_VSInstallDir>
<_VSInstallDir Condition=" '$(_VSInstallDir)' == '' And '$(VsInstallDir)' != '' ">$(VsInstallDir)</_VSInstallDir>
<_VcvarsallPath Condition=" '$(_VSInstallDir)' != '' ">$(_VSInstallDir)\VC\Auxiliary\Build\vcvarsall.bat</_VcvarsallPath>
</PropertyGroup>

<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform ('windows')) And Exists ('$(_VcvarsallPath)') ">
Expand Down