diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2020-05-09 20:16:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-09 20:16:52 +0200 |
| commit | 61306eb830cba932c57bc3e83ea462a49f2ebd97 (patch) | |
| tree | 0f2c872ab1c7bf191d1ccc81eb7525622361ec7b /modules/mono/build_scripts/godot_tools_build.py | |
| parent | 5a1077008a7b5eec0f95f7a2d05ac8027b9ec8c3 (diff) | |
| parent | b61ffef0ab95320c7304c2a1a8dd8cb6d299eadf (diff) | |
| download | redot-engine-61306eb830cba932c57bc3e83ea462a49f2ebd97.tar.gz | |
Merge pull request #38596 from neikeq/msbuild-restore
Mono: Use msbuild instead of nuget.exe for restoring
Diffstat (limited to 'modules/mono/build_scripts/godot_tools_build.py')
| -rw-r--r-- | modules/mono/build_scripts/godot_tools_build.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/mono/build_scripts/godot_tools_build.py b/modules/mono/build_scripts/godot_tools_build.py index cffacf2577..8e77f3bb44 100644 --- a/modules/mono/build_scripts/godot_tools_build.py +++ b/modules/mono/build_scripts/godot_tools_build.py @@ -13,13 +13,9 @@ def build_godot_tools(source, target, env): solution_path = os.path.join(module_dir, "editor/GodotTools/GodotTools.sln") build_config = "Debug" if env["target"] == "debug" else "Release" - # Custom build target to make sure output is always copied to the data dir. - extra_build_args = ["/Target:Build;GodotTools:BuildAlwaysCopyToDataDir"] + from .solution_builder import build_solution - from .solution_builder import build_solution, nuget_restore - - nuget_restore(env, solution_path) - build_solution(env, solution_path, build_config, extra_build_args) + build_solution(env, solution_path, build_config, restore=True) # No need to copy targets. The GodotTools csproj takes care of copying them. |