From 32a96e39ee76759e7d11c79b03c4fb3c287d68f1 Mon Sep 17 00:00:00 2001 From: peelz Date: Thu, 15 Sep 2022 18:09:32 -0400 Subject: [PATCH] Update MoonSharp --- Barotrauma/BarotraumaShared/LuaCsDependencies.props | 2 +- Libraries/moonsharp | 2 +- LinuxSolution.sln | 2 +- MacSolution.sln | 2 +- WindowsSolution.sln | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaShared/LuaCsDependencies.props b/Barotrauma/BarotraumaShared/LuaCsDependencies.props index 21439206a..dde50c674 100644 --- a/Barotrauma/BarotraumaShared/LuaCsDependencies.props +++ b/Barotrauma/BarotraumaShared/LuaCsDependencies.props @@ -3,6 +3,6 @@ - + diff --git a/Libraries/moonsharp b/Libraries/moonsharp index b9fc22da9..9366bba2f 160000 --- a/Libraries/moonsharp +++ b/Libraries/moonsharp @@ -1 +1 @@ -Subproject commit b9fc22da9e79427206e4f9ca241382aaefa03532 +Subproject commit 9366bba2f24a95ebbbdb4e714d377deac406d2a0 diff --git a/LinuxSolution.sln b/LinuxSolution.sln index 16e6b7939..e970112ea 100644 --- a/LinuxSolution.sln +++ b/LinuxSolution.sln @@ -42,7 +42,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoGame.Framework.Linux.Ne EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxTest", "Barotrauma\BarotraumaTest\LinuxTest.csproj", "{F1B80D94-8BD6-48CE-8D17-BB2A5C98BCA3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.Interpreter.netcore", "Libraries\moonsharp\src\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.netcore\MoonSharp.Interpreter.netcore.csproj", "{382DFA63-78FC-41AC-BA85-630960A56E5C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.Interpreter", "Libraries\moonsharp\MoonSharp.Interpreter\MoonSharp.Interpreter.csproj", "{382DFA63-78FC-41AC-BA85-630960A56E5C}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution diff --git a/MacSolution.sln b/MacSolution.sln index a801ae405..f3f6acae3 100644 --- a/MacSolution.sln +++ b/MacSolution.sln @@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Posix" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MacTest", "Barotrauma\BarotraumaTest\MacTest.csproj", "{20BC9336-B439-4BF1-8B65-D587DBF421D1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.Interpreter.netcore", "Libraries\moonsharp\src\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.netcore\MoonSharp.Interpreter.netcore.csproj", "{40BDE83D-61D5-481C-A53E-E0F5B23881E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.Interpreter", "Libraries\moonsharp\MoonSharp.Interpreter\MoonSharp.Interpreter.csproj", "{40BDE83D-61D5-481C-A53E-E0F5B23881E2}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution diff --git a/WindowsSolution.sln b/WindowsSolution.sln index b0d437056..efba0f9be 100644 --- a/WindowsSolution.sln +++ b/WindowsSolution.sln @@ -42,7 +42,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpFont.NetStandard", "Li EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsTest", "Barotrauma\BarotraumaTest\WindowsTest.csproj", "{C7212AE2-A925-4225-A639-AE0653EF65B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.Interpreter.netcore", "Libraries\moonsharp\src\MoonSharp.Interpreter\_Projects\MoonSharp.Interpreter.netcore\MoonSharp.Interpreter.netcore.csproj", "{2EEF2610-64A3-4E5D-95ED-0E181C1A34ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.Interpreter", "Libraries\moonsharp\MoonSharp.Interpreter\MoonSharp.Interpreter.csproj", "{2EEF2610-64A3-4E5D-95ED-0E181C1A34ED}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution