diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index 3a1d8d16..aa0dc87f 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -670,8 +670,8 @@ - - 1.16.0 + + 1.20.0 4.0.12 diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index e3d65e1a..01c3520c 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -611,8 +611,8 @@ - - 1.16.0 + + 1.20.0 4.0.12 diff --git a/src/QueryMaster/QueryMaster.csproj b/src/QueryMaster/QueryMaster.csproj index 7f67be1a..4cdf23ff 100644 --- a/src/QueryMaster/QueryMaster.csproj +++ b/src/QueryMaster/QueryMaster.csproj @@ -11,6 +11,6 @@ false - + \ No newline at end of file diff --git a/src/Server-Managers.sln b/src/Server-Managers.sln index 79f521bb..1809047f 100644 --- a/src/Server-Managers.sln +++ b/src/Server-Managers.sln @@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.Common", "Plugin.Com EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.Discord", "Plugin.Discord\Plugin.Discord.csproj", "{936EF260-FECF-4E9E-A21E-092D65931C7D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party Libraries", "3rd Party Libraries", "{44D8A1A2-01FF-4DD3-A201-AD9A26F7798D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdParty", "3rdParty", "{44D8A1A2-01FF-4DD3-A201-AD9A26F7798D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{F8DBCE70-4658-47CB-A508-B3951125F0ED}" EndProject @@ -46,12 +46,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.Discord.UnitTests", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerManager.Discord", "ServerManager.Discord\ServerManager.Discord.csproj", "{C4C8000D-5E45-497C-A218-B95A1567010E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{A7B846EF-9884-44DB-AF8F-3173DF1B3B66}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A7B846EF-9884-44DB-AF8F-3173DF1B3B66}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerManager.Common.UnitTests", "ServerManager.Common.UnitTests\ServerManager.Common.UnitTests.csproj", "{18271A4E-6135-466A-BCF8-80E25446F454}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryMaster.UnitTests", "QueryMaster.UnitTests\QueryMaster.UnitTests.csproj", "{A2EEBC18-DAD8-415D-98E4-258EB12369C7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{03CF4502-D197-433F-96B8-F00D3D9ACC4D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug - AutoBackup|Any CPU = Debug - AutoBackup|Any CPU @@ -337,10 +339,20 @@ Global {D2EE1483-021F-4900-BBE8-88338D1386F4} = {44D8A1A2-01FF-4DD3-A201-AD9A26F7798D} {96832688-29BD-464F-9DCE-482E37BFC751} = {44D8A1A2-01FF-4DD3-A201-AD9A26F7798D} {4CA9C894-518F-42D7-BBE2-CFDFE7A03F8A} = {44D8A1A2-01FF-4DD3-A201-AD9A26F7798D} - {A8BFC452-5BE8-41E7-BD1D-C29B944185CE} = {F8DBCE70-4658-47CB-A508-B3951125F0ED} - {1434D87A-E9FC-48B9-BEC9-E5A3003F1F2E} = {F8DBCE70-4658-47CB-A508-B3951125F0ED} {18271A4E-6135-466A-BCF8-80E25446F454} = {A7B846EF-9884-44DB-AF8F-3173DF1B3B66} {A2EEBC18-DAD8-415D-98E4-258EB12369C7} = {A7B846EF-9884-44DB-AF8F-3173DF1B3B66} + {95D4E57F-06F9-4B41-BEBB-2A8E81759BD2} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {DD0A2401-99B8-4DE1-B8ED-9B075172F8AF} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {F7A82C6A-32CD-4847-AD16-D79ADC72746E} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {630422CA-4BCC-4D1D-9701-87D8EAF0B209} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {7C99D9F7-0C65-4116-927A-94EB018C88FD} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {C4C8000D-5E45-497C-A218-B95A1567010E} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {3E0C9EE6-780F-4FEF-BA03-E38062A5FDB6} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {39C42E58-36BD-4C6B-9AD2-7F9EBCA7A68A} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {F8DBCE70-4658-47CB-A508-B3951125F0ED} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {44D8A1A2-01FF-4DD3-A201-AD9A26F7798D} = {03CF4502-D197-433F-96B8-F00D3D9ACC4D} + {1434D87A-E9FC-48B9-BEC9-E5A3003F1F2E} = {A7B846EF-9884-44DB-AF8F-3173DF1B3B66} + {A8BFC452-5BE8-41E7-BD1D-C29B944185CE} = {A7B846EF-9884-44DB-AF8F-3173DF1B3B66} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4201246C-6E53-4209-883D-A4F084C19187} diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj index fdb7fc83..8381415b 100644 --- a/src/ServerManager.Common/ServerManager.Common.csproj +++ b/src/ServerManager.Common/ServerManager.Common.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/ServerManager.WebApplication/Properties/launchSettings.json b/src/ServerManager.WebApplication/Properties/launchSettings.json index 765a1f22..dd7bebae 100644 --- a/src/ServerManager.WebApplication/Properties/launchSettings.json +++ b/src/ServerManager.WebApplication/Properties/launchSettings.json @@ -1,22 +1,6 @@ { "$schema": "http://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:36011", - "sslPort": 44353 - } - }, "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, "ServerManager.WebApplication": { "commandName": "Project", "dotnetRunMessages": "true", @@ -28,4 +12,4 @@ } } } -} +} \ No newline at end of file