diff options
| author | Anton Lapounov <antonl@microsoft.com> | 2021-03-17 04:35:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 04:35:25 +0300 |
| commit | ffd5c13b702b489b2b3f5137e70cd89951a26dc1 (patch) | |
| tree | 5f02435636d4f3bd74faf16c6f26262cf19afd45 /src/coreclr/ToolBox | |
| parent | 66e665ffe85975b66530bbb673d662d4a47e37ba (diff) | |
Use new VS detection script in DacTableGen (#49729)
Diffstat (limited to 'src/coreclr/ToolBox')
| -rw-r--r-- | src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj b/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj index 1217406b7b1..956711339c6 100644 --- a/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj +++ b/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj @@ -8,22 +8,21 @@ <RunAnalyzers>false</RunAnalyzers> </PropertyGroup> - <ItemGroup> - <PackageReference Include="vswhere" Version="$(VSWhereVersion)" IsImplicitlyDefined="true" GeneratePathProperty="true" /> - </ItemGroup> - <Target Name="ResolveDIALibToCopy" BeforeTargets="AssignTargetPaths"> - <PropertyGroup> - <VSWherePath>"$([MSBuild]::NormalizePath('$(Pkgvswhere)','tools','vswhere.exe'))"</VSWherePath> - </PropertyGroup> <Exec - Command="$(VSWherePath) -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath" + Command=" + call "$(RepositoryEngineeringDir)native\init-vs-env.cmd" + if defined VSINSTALLDIR echo %VSINSTALLDIR%" EchoOff="true" ConsoleToMsBuild="true" StandardOutputImportance="Low"> <Output TaskParameter="ConsoleOutput" PropertyName="VSInstallationPath" /> </Exec> + <Error + Condition="!Exists('$(VSInstallationPath)')" + Text="VSINSTALLDIR environment variable was not set correctly. You may need to repair Visual Studio installation." /> + <PropertyGroup> <_MsDiaSubDir>$(BuildArchitecture)</_MsDiaSubDir> <_MsDiaSubDir Condition="'$(BuildArchitecture)' == 'x86'" /> |