From 8cf5195db6b4ad9e70053cf556a0a72ff2b925a2 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 2 Aug 2019 02:07:27 +0200 Subject: [PATCH] .NET Core support. Also dropped x86 because apparently unit tests still work. --- Content.Benchmarks/Content.Benchmarks.csproj | 4 +- Content.Client/Content.Client.csproj | 3 +- .../Content.IntegrationTests.csproj | 3 +- Content.Server/Content.Server.csproj | 3 +- Content.Shared/Content.Shared.csproj | 3 +- Content.Tests/Content.Tests.csproj | 3 +- RobustToolbox | 2 +- SS14.Launcher/SS14.Launcher.csproj | 3 +- SpaceStation14.sln | 63 +------------------ 9 files changed, 10 insertions(+), 77 deletions(-) diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj index e913b4af8d..f05f418370 100644 --- a/Content.Benchmarks/Content.Benchmarks.csproj +++ b/Content.Benchmarks/Content.Benchmarks.csproj @@ -1,10 +1,10 @@  + - net472 ..\bin\Content.Benchmarks\ false false - x86;x64 + x64 Exe diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 2ff03d05f8..ae8e849fc8 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -1,10 +1,9 @@  - net472 7.3 false - x64;x86 + x64 false ..\bin\Content.Client\ diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj index 77e30e5314..ea09fae4db 100644 --- a/Content.IntegrationTests/Content.IntegrationTests.csproj +++ b/Content.IntegrationTests/Content.IntegrationTests.csproj @@ -1,11 +1,10 @@  - net472 ..\bin\Content.IntegrationTests\ false false - x86;x64 + x64 diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index bef98d239a..b8cbffb49e 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -1,10 +1,9 @@  - net472 7.3 false - x64;x86 + x64 false ..\bin\Content.Server\ diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index 2ee3a7b57a..09c5021fc6 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -1,10 +1,9 @@  - net472 7.3 false - x64;x86 + x64 false ../bin/Content.Shared diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj index fe76a34edc..5017ccb1cf 100644 --- a/Content.Tests/Content.Tests.csproj +++ b/Content.Tests/Content.Tests.csproj @@ -1,10 +1,9 @@  - net472 7.3 false - x64;x86 + x64 false ..\bin\Content.Tests\ diff --git a/RobustToolbox b/RobustToolbox index 85a4375905..c0eca4f6c2 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 85a4375905e37a218f77a54525563c4410e53305 +Subproject commit c0eca4f6c2db4a9d88d478b705f0796e25dfe980 diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj index 408c7bcc82..18a3e402bc 100644 --- a/SS14.Launcher/SS14.Launcher.csproj +++ b/SS14.Launcher/SS14.Launcher.csproj @@ -1,10 +1,9 @@  - net472 7.3 false - x64;x86 + x64 false ..\bin\SS14.Launcher\ Exe diff --git a/SpaceStation14.sln b/SpaceStation14.sln index 734804dfef..a3652ae828 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -47,130 +47,69 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.ActiveCfg = Debug|x64 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.Build.0 = Debug|x64 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.ActiveCfg = Release|x64 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.Build.0 = Release|x64 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86 - {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.ActiveCfg = Debug|x64 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.Build.0 = Debug|x64 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.ActiveCfg = Release|x64 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.Build.0 = Release|x64 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86 - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.ActiveCfg = Debug|x64 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.Build.0 = Debug|x64 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.ActiveCfg = Release|x64 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.Build.0 = Release|x64 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86 - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86 {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.Build.0 = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|Any CPU {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.ActiveCfg = Debug|Any CPU - {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.Build.0 = Debug|Any CPU + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.Build.0 = Debug|Any CPU {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.ActiveCfg = Debug|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.Build.0 = Debug|x64 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.ActiveCfg = Debug|x86 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.Build.0 = Debug|x86 {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.ActiveCfg = Release|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.Build.0 = Release|x64 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.ActiveCfg = Release|x86 - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.Build.0 = Release|x86 {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.ActiveCfg = Debug|x64 {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.Build.0 = Debug|x64 - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.ActiveCfg = Debug|x86 - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.Build.0 = Debug|x86 {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.ActiveCfg = Release|x64 {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.Build.0 = Release|x64 - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.ActiveCfg = Release|x86 - {AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.Build.0 = Release|x86 {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x64.ActiveCfg = Debug|x64 {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x64.Build.0 = Debug|x64 - {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x86.ActiveCfg = Debug|x86 - {93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|x86.Build.0 = Debug|x86 {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x64.ActiveCfg = Release|x64 {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x64.Build.0 = Release|x64 - {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x86.ActiveCfg = Release|x86 - {93F23A82-00C5-4572-964E-E7C9457726D4}.Release|x86.Build.0 = Release|x86 {0529F740-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 {0529F740-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 - {0529F740-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 - {0529F740-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 {0529F740-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 {0529F740-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 - {0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 - {0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 - {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 - {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 {B04AAE71-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 {B04AAE71-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 - {B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 - {B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.ActiveCfg = Debug|x64 {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x64.Build.0 = Debug|x64 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.ActiveCfg = Release|x86 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x86.Build.0 = Release|x86 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.ActiveCfg = Debug|x86 - {83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|x86.Build.0 = Debug|x86 {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.ActiveCfg = Release|x64 {83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|x64.Build.0 = Release|x64 - {59250BAF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|Any CPU - {59250BAF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|Any CPU {59250BAF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|Any CPU {59250BAF-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|Any CPU - {59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|Any CPU - {59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|Any CPU {59250BAF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|Any CPU {59250BAF-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|Any CPU {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.ActiveCfg = Debug|x64 {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.Build.0 = Debug|x64 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|x86 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.Build.0 = Debug|x86 {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.ActiveCfg = Release|x64 {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.Build.0 = Release|x64 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Release|x86 - {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Release|x86 {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|x64.ActiveCfg = Debug|x64 {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|x64.Build.0 = Debug|x64 - {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|x86.ActiveCfg = Debug|x86 - {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|x86.Build.0 = Debug|x86 {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|x64.ActiveCfg = Release|x64 {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|x64.Build.0 = Release|x64 - {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|x86.ActiveCfg = Release|x86 - {7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|x86.Build.0 = Release|x86 {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Debug|x64.ActiveCfg = Debug|x64 {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Debug|x64.Build.0 = Debug|x64 - {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Debug|x86.ActiveCfg = Debug|x86 - {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Debug|x86.Build.0 = Debug|x86 {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Release|x64.ActiveCfg = Release|x64 {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Release|x64.Build.0 = Release|x64 - {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Release|x86.ActiveCfg = Release|x86 - {0131AAE0-EF7D-4985-86FD-59EEC31B9A5C}.Release|x86.Build.0 = Release|x86 {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Debug|x64.ActiveCfg = Debug|x64 {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Debug|x64.Build.0 = Debug|x64 - {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Debug|x86.ActiveCfg = Debug|x86 - {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Debug|x86.Build.0 = Debug|x86 {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Release|x64.ActiveCfg = Release|x64 {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Release|x64.Build.0 = Release|x64 - {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Release|x86.ActiveCfg = Release|x86 - {47B4D2F3-6767-4ACB-A803-972FEF7215E9}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE