Skip to content

Commit

Permalink
Perform integration for MSBuild 15+ before MSBuild 14. (#1034)
Browse files Browse the repository at this point in the history
Co-authored-by: Jean-Francois Dube <jean-francois.dube@mayahtt.com>
  • Loading branch information
dubejf and Jean-Francois Dube committed Apr 22, 2023
1 parent f8ccf03 commit b709fcc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/vcpkg/commands.integrate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,14 +329,14 @@ namespace vcpkg::Commands::Integrate
fs.write_contents(user_configuration_home / vcpkg_path_txt, paths.root.generic_u8string(), VCPKG_LINE_INFO);

#if defined(_WIN32)
integrate_install_msbuild14(fs);

fs.write_contents(user_configuration_home / vcpkg_user_props,
create_appdata_shortcut(paths.buildsystems_msbuild_props),
VCPKG_LINE_INFO);
fs.write_contents(user_configuration_home / vcpkg_user_targets,
create_appdata_shortcut(paths.buildsystems_msbuild_targets),
VCPKG_LINE_INFO);

integrate_install_msbuild14(fs);
#endif
msg::println(Color::success, msgAppliedUserIntegration);

Expand Down

0 comments on commit b709fcc

Please sign in to comment.