From 9ca6d62f110ce4bcedfc825e9b703020b9623a1f Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Sun, 22 Nov 2020 16:56:09 -0800 Subject: [PATCH] fix up sln and csproj files --- .vscode/launch.json | 26 +++++++ .vscode/tasks.json | 116 ++++++++++++++++++++++++++----- Kav | 2 +- KavTest.Core.sln | 79 ++++++++++++--------- KavTest.Framework.sln | 91 ++++++++++++------------ KavTest/KavTest.Core.csproj | 7 +- KavTest/KavTest.Framework.csproj | 10 +-- MoonTools.Bonk | 2 +- MoonTools.Curve | 2 +- Smuggler | 2 +- encompass-cs | 2 +- 11 files changed, 232 insertions(+), 107 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index e4221f8..3fb9ea8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,6 +1,32 @@ { "version": "0.2.0", "configurations": [ + { + "name": "Attach to Framework Debugger", + "type": "clr", + "request": "launch", + "preLaunchTask": "Build: Framework Debug", + "program": "${workspaceFolder}/KavTest/bin/Debug/net48/KavTest.exe", + "args": [], + "cwd": "${workspaceFolder}", + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen" + }, + { + "name": "Attach to Mono Debugger", + "type": "mono", + "request": "launch", + "preLaunchTask": "Build: Mono Debug", + "program": "${workspaceFolder}/KavTest/bin/Debug/net48/KavTest.exe", + "args": [], + "env": { + "LD_LIBRARY_PATH": "${workspaceFolder}/KavTest/bin/Debug/net48/lib64", + "DYLD_LIBRARY_PATH": "${workspaceFolder}/KavTest/bin/Debug/net48/osx" + }, + "cwd": "${workspaceFolder}", + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen" + }, { "name": "Attach to Core Debugger", "type": "coreclr", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 8b9dd1f..03aca1d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -21,7 +21,7 @@ }, "tasks": [ { - "label": "Build: Framework Release", + "label": "Build: Mono Release", "command": "msbuild", "args": [ "-restore:True", @@ -36,7 +36,7 @@ "problemMatcher": "$msCompile" }, { - "label": "Run: Framework Release", + "label": "Run: Mono Release", "command": "mono", "args": [ "KavTest.exe" @@ -44,10 +44,9 @@ "options": { "env": { "LD_LIBRARY_PATH": "./lib64", - "DYLD_LIBRARY_PATH": "./osx", - "FNA3D_FORCE_DRIVER": "Vulkan" + "DYLD_LIBRARY_PATH": "./osx" }, - "cwd": "${workspaceFolder}/KavTest/bin/Release/net461" + "cwd": "${workspaceFolder}/KavTest/bin/Release/net48" }, "type": "process", "group": { @@ -57,10 +56,10 @@ "problemMatcher": [] }, { - "label": "Build & Run: Framework Release", + "label": "Build & Run: Mono Release", "dependsOn": [ - "Build: Framework Release", - "Run: Framework Release" + "Build: Mono Release", + "Run: Mono Release" ], "dependsOrder": "sequence", "type": "shell", @@ -71,7 +70,7 @@ "problemMatcher": [] }, { - "label": "Build: Framework Debug", + "label": "Build: Mono Debug", "command": "msbuild", "args": [ "-restore:True", @@ -86,7 +85,7 @@ "problemMatcher": [] }, { - "label": "Run: Framework Debug", + "label": "Run: Mono Debug", "command": "mono", "args": [ "KavTest.exe" @@ -94,10 +93,9 @@ "options": { "env": { "LD_LIBRARY_PATH": "./lib64", - "DYLD_LIBRARY_PATH": "./osx", - "FNA3D_FORCE_DRIVER": "OpenGL" + "DYLD_LIBRARY_PATH": "./osx" }, - "cwd": "${workspaceFolder}/KavTest/bin/Debug/net461" + "cwd": "${workspaceFolder}/KavTest/bin/Debug/net48" }, "type": "process", "group": { @@ -107,10 +105,10 @@ "problemMatcher": [] }, { - "label": "Build & Run: Framework Debug", + "label": "Build & Run: Mono Debug", "dependsOn": [ - "Build: Framework Debug", - "Run: Framework Debug" + "Build: Mono Debug", + "Run: Mono Debug" ], "dependsOrder": "sequence", "type": "shell", @@ -219,6 +217,92 @@ "isDefault": true }, "problemMatcher": [] + }, + { + "label": "Build: Framework Debug", + "command": "MsBuild.exe", + "args": [ + "-restore:True", + "${workspaceFolder}/Anathema.Framework.sln", + "-p:Configuration=Debug", + "-p:Platform=x64" + ], + "type": "shell", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [] + }, + { + "label": "Run: Framework Debug", + "command": "Anathema.exe", + "options": { + "cwd": "${workspaceFolder}/Anathema/bin/Debug/net48" + }, + "type": "process", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [] + }, + { + "label": "Build & Run: Framework Debug", + "dependsOn": [ + "Build: Framework Debug", + "Run: Framework Debug" + ], + "dependsOrder": "sequence", + "type": "shell", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [] + }, + { + "label": "Build: Framework Release", + "command": "MsBuild.exe", + "args": [ + "-restore:True", + "${workspaceFolder}/Anathema.Framework.sln", + "-p:Configuration=Release", + "-p:Platform=x64" + ], + "type": "shell", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [] + }, + { + "label": "Run: Framework Release", + "command": "Anathema.exe", + "options": { + "cwd": "${workspaceFolder}/Anathema/bin/Release/net48" + }, + "type": "process", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [] + }, + { + "label": "Build & Run: Framework Release", + "dependsOn": [ + "Build: Framework Release", + "Run: Framework Release" + ], + "dependsOrder": "sequence", + "type": "shell", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [] } ] } diff --git a/Kav b/Kav index ed5a7df..d83aacd 160000 --- a/Kav +++ b/Kav @@ -1 +1 @@ -Subproject commit ed5a7df6143582f93589e18594d48316aaf3dca3 +Subproject commit d83aacd57f692c9732987fe755cc860fee3c5456 diff --git a/KavTest.Core.sln b/KavTest.Core.sln index e184bcb..69dd407 100644 --- a/KavTest.Core.sln +++ b/KavTest.Core.sln @@ -1,48 +1,61 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30717.126 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KavTest.Core", "KavTest\KavTest.Core.csproj", "{4589302C-174A-4173-9654-CAA6CA1B5220}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KavTest.Core", "KavTest\KavTest.Core.csproj", "{98DFC9BD-FBA1-4562-AAA0-466BED7102D3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kav", "Kav\Kav.Core.csproj", "{08398000-DF30-465A-AE07-E11D108B8A74}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "FNA\FNA.Core.csproj", "{C674DC0C-0ADF-410F-B7F5-307748973352}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kav.Core", "Kav\Kav.Core.csproj", "{E75FECE9-6919-4DF8-8847-1F7CB523D390}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smuggler.Core", "Smuggler\Smuggler.Core.csproj", "{C11884A7-61B3-41F2-A3DA-2E7A58E1DC80}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bonk", "MoonTools.Bonk\Bonk\Bonk.csproj", "{66453D48-F637-4289-9775-84639EE4005F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "encompass-cs", "encompass-cs\encompass-cs\encompass-cs.csproj", "{FEEEF90D-B4C1-4E39-929B-DC525A5AB048}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Curve", "MoonTools.Curve\Curve\Curve.csproj", "{335EAE2A-2F19-44FD-AD24-238CCE61B697}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {98DFC9BD-FBA1-4562-AAA0-466BED7102D3}.Debug|x64.ActiveCfg = Debug|x64 + {98DFC9BD-FBA1-4562-AAA0-466BED7102D3}.Debug|x64.Build.0 = Debug|x64 + {98DFC9BD-FBA1-4562-AAA0-466BED7102D3}.Release|x64.ActiveCfg = Release|x64 + {98DFC9BD-FBA1-4562-AAA0-466BED7102D3}.Release|x64.Build.0 = Release|x64 + {C674DC0C-0ADF-410F-B7F5-307748973352}.Debug|x64.ActiveCfg = Debug|x64 + {C674DC0C-0ADF-410F-B7F5-307748973352}.Debug|x64.Build.0 = Debug|x64 + {C674DC0C-0ADF-410F-B7F5-307748973352}.Release|x64.ActiveCfg = Release|x64 + {C674DC0C-0ADF-410F-B7F5-307748973352}.Release|x64.Build.0 = Release|x64 + {E75FECE9-6919-4DF8-8847-1F7CB523D390}.Debug|x64.ActiveCfg = Debug|x64 + {E75FECE9-6919-4DF8-8847-1F7CB523D390}.Debug|x64.Build.0 = Debug|x64 + {E75FECE9-6919-4DF8-8847-1F7CB523D390}.Release|x64.ActiveCfg = Release|x64 + {E75FECE9-6919-4DF8-8847-1F7CB523D390}.Release|x64.Build.0 = Release|x64 + {C11884A7-61B3-41F2-A3DA-2E7A58E1DC80}.Debug|x64.ActiveCfg = Debug|x64 + {C11884A7-61B3-41F2-A3DA-2E7A58E1DC80}.Debug|x64.Build.0 = Debug|x64 + {C11884A7-61B3-41F2-A3DA-2E7A58E1DC80}.Release|x64.ActiveCfg = Release|x64 + {C11884A7-61B3-41F2-A3DA-2E7A58E1DC80}.Release|x64.Build.0 = Release|x64 + {66453D48-F637-4289-9775-84639EE4005F}.Debug|x64.ActiveCfg = Debug|x64 + {66453D48-F637-4289-9775-84639EE4005F}.Debug|x64.Build.0 = Debug|x64 + {66453D48-F637-4289-9775-84639EE4005F}.Release|x64.ActiveCfg = Release|x64 + {66453D48-F637-4289-9775-84639EE4005F}.Release|x64.Build.0 = Release|x64 + {FEEEF90D-B4C1-4E39-929B-DC525A5AB048}.Debug|x64.ActiveCfg = Debug|x64 + {FEEEF90D-B4C1-4E39-929B-DC525A5AB048}.Debug|x64.Build.0 = Debug|x64 + {FEEEF90D-B4C1-4E39-929B-DC525A5AB048}.Release|x64.ActiveCfg = Release|x64 + {FEEEF90D-B4C1-4E39-929B-DC525A5AB048}.Release|x64.Build.0 = Release|x64 + {335EAE2A-2F19-44FD-AD24-238CCE61B697}.Debug|x64.ActiveCfg = Debug|x64 + {335EAE2A-2F19-44FD-AD24-238CCE61B697}.Debug|x64.Build.0 = Debug|x64 + {335EAE2A-2F19-44FD-AD24-238CCE61B697}.Release|x64.ActiveCfg = Release|x64 + {335EAE2A-2F19-44FD-AD24-238CCE61B697}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.ActiveCfg = Debug|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.Build.0 = Debug|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.ActiveCfg = Debug|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.Build.0 = Debug|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Release|Any CPU.Build.0 = Release|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.ActiveCfg = Release|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.Build.0 = Release|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.ActiveCfg = Release|Any CPU - {4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.Build.0 = Release|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Debug|x64.ActiveCfg = Debug|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Debug|x64.Build.0 = Debug|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Debug|x86.ActiveCfg = Debug|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Debug|x86.Build.0 = Debug|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Release|Any CPU.Build.0 = Release|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Release|x64.ActiveCfg = Release|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Release|x64.Build.0 = Release|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Release|x86.ActiveCfg = Release|Any CPU - {08398000-DF30-465A-AE07-E11D108B8A74}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {EE29AB8C-0987-4AB5-B007-05F81EFD7291} EndGlobalSection EndGlobal diff --git a/KavTest.Framework.sln b/KavTest.Framework.sln index 02646fd..02954c0 100644 --- a/KavTest.Framework.sln +++ b/KavTest.Framework.sln @@ -1,62 +1,61 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30717.126 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNATemplate.Framework", "KavTest\KavTest.Framework.csproj", "{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smuggler.Framework", "Smuggler\Smuggler.Framework.csproj", "{06664804-2B01-46F5-B8EC-07E5E2C1EADC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kav", "Kav\Kav.Framework.csproj", "{9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "FNA\FNA.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Smuggler", "Smuggler\Smuggler.Framework.csproj", "{06664804-2B01-46F5-B8EC-07E5E2C1EADC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kav.Framework", "Kav\Kav.Framework.csproj", "{9DCFEB6B-7C62-4F6B-A78F-168FAA474145}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KavTest.Framework", "KavTest\KavTest.Framework.csproj", "{A4DFCA0B-D54D-42C0-ABA9-1A1842D39927}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Curve", "MoonTools.Curve\Curve\Curve.csproj", "{572DCC26-4184-45B1-B813-5C798E106E76}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bonk", "MoonTools.Bonk\Bonk\Bonk.csproj", "{16F6F157-1C3D-4E94-A222-66AF0CC360B1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "encompass-cs", "encompass-cs\encompass-cs\encompass-cs.csproj", "{F23E4933-6B1F-4E29-B165-6C640D7B33DA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|x64.ActiveCfg = Debug|x64 + {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|x64.Build.0 = Debug|x64 + {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x64.ActiveCfg = Release|x64 + {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x64.Build.0 = Release|x64 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.ActiveCfg = Debug|x64 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.Build.0 = Debug|x64 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.ActiveCfg = Debug|x64 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.Build.0 = Debug|x64 + {9DCFEB6B-7C62-4F6B-A78F-168FAA474145}.Debug|x64.ActiveCfg = Debug|x64 + {9DCFEB6B-7C62-4F6B-A78F-168FAA474145}.Debug|x64.Build.0 = Debug|x64 + {9DCFEB6B-7C62-4F6B-A78F-168FAA474145}.Release|x64.ActiveCfg = Release|x64 + {9DCFEB6B-7C62-4F6B-A78F-168FAA474145}.Release|x64.Build.0 = Release|x64 + {A4DFCA0B-D54D-42C0-ABA9-1A1842D39927}.Debug|x64.ActiveCfg = Debug|x64 + {A4DFCA0B-D54D-42C0-ABA9-1A1842D39927}.Debug|x64.Build.0 = Debug|x64 + {A4DFCA0B-D54D-42C0-ABA9-1A1842D39927}.Release|x64.ActiveCfg = Release|x64 + {A4DFCA0B-D54D-42C0-ABA9-1A1842D39927}.Release|x64.Build.0 = Release|x64 + {572DCC26-4184-45B1-B813-5C798E106E76}.Debug|x64.ActiveCfg = Debug|x64 + {572DCC26-4184-45B1-B813-5C798E106E76}.Debug|x64.Build.0 = Debug|x64 + {572DCC26-4184-45B1-B813-5C798E106E76}.Release|x64.ActiveCfg = Release|x64 + {572DCC26-4184-45B1-B813-5C798E106E76}.Release|x64.Build.0 = Release|x64 + {16F6F157-1C3D-4E94-A222-66AF0CC360B1}.Debug|x64.ActiveCfg = Debug|x64 + {16F6F157-1C3D-4E94-A222-66AF0CC360B1}.Debug|x64.Build.0 = Debug|x64 + {16F6F157-1C3D-4E94-A222-66AF0CC360B1}.Release|x64.ActiveCfg = Release|x64 + {16F6F157-1C3D-4E94-A222-66AF0CC360B1}.Release|x64.Build.0 = Release|x64 + {F23E4933-6B1F-4E29-B165-6C640D7B33DA}.Debug|x64.ActiveCfg = Debug|x64 + {F23E4933-6B1F-4E29-B165-6C640D7B33DA}.Debug|x64.Build.0 = Debug|x64 + {F23E4933-6B1F-4E29-B165-6C640D7B33DA}.Release|x64.ActiveCfg = Release|x64 + {F23E4933-6B1F-4E29-B165-6C640D7B33DA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.ActiveCfg = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.Build.0 = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.ActiveCfg = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.Build.0 = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.Build.0 = Release|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.ActiveCfg = Release|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.Build.0 = Release|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.ActiveCfg = Release|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.Build.0 = Release|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Debug|x64.ActiveCfg = Debug|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Debug|x64.Build.0 = Debug|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Debug|x86.ActiveCfg = Debug|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Debug|x86.Build.0 = Debug|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Release|Any CPU.Build.0 = Release|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Release|x64.ActiveCfg = Release|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Release|x64.Build.0 = Release|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Release|x86.ActiveCfg = Release|Any CPU - {9B2EC2DE-7E2C-4768-B812-43AB4C7E31C5}.Release|x86.Build.0 = Release|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|x64.ActiveCfg = Debug|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|x64.Build.0 = Debug|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|x86.ActiveCfg = Debug|x86 - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Debug|x86.Build.0 = Debug|x86 - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|Any CPU.Build.0 = Release|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x64.ActiveCfg = Release|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x64.Build.0 = Release|Any CPU - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x86.ActiveCfg = Release|x86 - {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x86.Build.0 = Release|x86 + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F5E92C03-53E8-4716-B589-BC692E409E40} EndGlobalSection EndGlobal diff --git a/KavTest/KavTest.Core.csproj b/KavTest/KavTest.Core.csproj index c2c879a..4b3dfd7 100644 --- a/KavTest/KavTest.Core.csproj +++ b/KavTest/KavTest.Core.csproj @@ -1,6 +1,7 @@ obj\$(MSBuildKavTest) + x64 @@ -15,7 +16,7 @@ KavTest true win-x64;osx-x64;linux-x64 - + @@ -23,13 +24,13 @@ - + - + diff --git a/KavTest/KavTest.Framework.csproj b/KavTest/KavTest.Framework.csproj index c5d1593..04de559 100644 --- a/KavTest/KavTest.Framework.csproj +++ b/KavTest/KavTest.Framework.csproj @@ -1,12 +1,14 @@ obj\$(MSBuildKavTest) + x64 WinExe - net461 + net48 KavTest + x64 false false 8.0 @@ -15,7 +17,7 @@ KavTest true win-x64;osx-x64;linux-x64 - + $(DefaultItemExcludes);DllMap.cs @@ -26,13 +28,13 @@ - + - + diff --git a/MoonTools.Bonk b/MoonTools.Bonk index 2f341aa..094cf4b 160000 --- a/MoonTools.Bonk +++ b/MoonTools.Bonk @@ -1 +1 @@ -Subproject commit 2f341aaeae07d2cb9b8f9be0ff5688543dcd582b +Subproject commit 094cf4b3d2cc5197cc8e0719f0dd368d50afe00e diff --git a/MoonTools.Curve b/MoonTools.Curve index 1a14f25..f1120a2 160000 --- a/MoonTools.Curve +++ b/MoonTools.Curve @@ -1 +1 @@ -Subproject commit 1a14f2595ad83dae3d6a715506bf2f735168416c +Subproject commit f1120a2572a7aa16b859da81bd6a4a5e7a8ea19b diff --git a/Smuggler b/Smuggler index 4c78ed3..ae6794e 160000 --- a/Smuggler +++ b/Smuggler @@ -1 +1 @@ -Subproject commit 4c78ed3d392af9d5c004ad1f6f133d94f1bd36d9 +Subproject commit ae6794e71bab538cc82e75f77ab0ed07a993320a diff --git a/encompass-cs b/encompass-cs index bdd9f59..4538c0f 160000 --- a/encompass-cs +++ b/encompass-cs @@ -1 +1 @@ -Subproject commit bdd9f595493609444d8ebb31b9d07b7ef320eafb +Subproject commit 4538c0f3c9bbff1f17633eff897b61998e5fec3d