From 6f40196f3f9e11ea3cb92c91017bcce3b0f26f73 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Fri, 27 Nov 2020 06:18:47 -0500 Subject: [PATCH] rebase --- src/tasks/modorganizer.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/tasks/modorganizer.cpp b/src/tasks/modorganizer.cpp index 11d57c7..9f123d5 100644 --- a/src/tasks/modorganizer.cpp +++ b/src/tasks/modorganizer.cpp @@ -54,6 +54,11 @@ bool modorganizer::is_gamebryo_plugin() const return is_set(flags_, gamebryo); } +bool modorganizer::is_nuget_plugin() const +{ + return is_set(flags_, nuget); +} + fs::path modorganizer::source_path() { return {}; @@ -133,6 +138,12 @@ void modorganizer::do_build_and_install() } run_tool(create_this_cmake_tool()); + + // until https://gitlab.kitware.com/cmake/cmake/-/issues/20646 is resolved, + // we need a manual way of running the msbuild -t:restore + if (is_nuget_plugin()) + run_tool(create_this_msbuild_tool().targets({ "restore" })); + run_tool(create_this_msbuild_tool()); }