From a70054ac4402764827e6a90a982d4f420f43931e Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sun, 4 Jul 2021 21:59:49 +0200 Subject: [PATCH] Update submodule, add linguini to solution. Closes #5 --- Content.Server/Program.cs | 6 +++- RobustTemplate.sln | 63 +++++++++++++++++++++++++++++++++++++++ RobustToolbox | 2 +- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/Content.Server/Program.cs b/Content.Server/Program.cs index acc6979..3f74a1e 100644 --- a/Content.Server/Program.cs +++ b/Content.Server/Program.cs @@ -10,7 +10,11 @@ namespace Content.Server /* // DEVNOTE: If you want to use RobustToolbox as a library, use the method below instead. - ContentStart.StartLibrary(args); + ContentStart.StartLibrary(args, new ServerOptions() + { + // DEVNOTE: Your options here. + Sandboxing = false, + }); */ } } diff --git a/RobustTemplate.sln b/RobustTemplate.sln index c901af8..d3c7d1e 100644 --- a/RobustTemplate.sln +++ b/RobustTemplate.sln @@ -59,6 +59,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Generators", "Robust EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{BDF16A97-6269-4CA1-8D67-785DDD357B30}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linguini", "Linguini", "{D23906E1-8276-4D63-9E06-F1194DCCBE3A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguini.Bundle", "RobustToolbox\Linguini\Linguini.Bundle\Linguini.Bundle.csproj", "{0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguini.Shared", "RobustToolbox\Linguini\Linguini.Shared\Linguini.Shared.csproj", "{3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguini.Syntax", "RobustToolbox\Linguini\Linguini.Syntax\Linguini.Syntax.csproj", "{4789A7B8-FC16-4606-8544-94291C148937}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralRules.Generator", "RobustToolbox\Linguini\PluralRules.Generator\PluralRules.Generator.csproj", "{72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -336,6 +346,54 @@ Global {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|x64.Build.0 = Release|Any CPU {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|x86.ActiveCfg = Release|Any CPU {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|x86.Build.0 = Release|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Debug|x64.ActiveCfg = Debug|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Debug|x64.Build.0 = Debug|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Debug|x86.ActiveCfg = Debug|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Debug|x86.Build.0 = Debug|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Release|Any CPU.Build.0 = Release|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Release|x64.ActiveCfg = Release|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Release|x64.Build.0 = Release|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Release|x86.ActiveCfg = Release|Any CPU + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D}.Release|x86.Build.0 = Release|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Debug|x64.ActiveCfg = Debug|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Debug|x64.Build.0 = Debug|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Debug|x86.ActiveCfg = Debug|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Debug|x86.Build.0 = Debug|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Release|Any CPU.Build.0 = Release|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Release|x64.ActiveCfg = Release|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Release|x64.Build.0 = Release|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Release|x86.ActiveCfg = Release|Any CPU + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A}.Release|x86.Build.0 = Release|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Debug|x64.ActiveCfg = Debug|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Debug|x64.Build.0 = Debug|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Debug|x86.ActiveCfg = Debug|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Debug|x86.Build.0 = Debug|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Release|Any CPU.Build.0 = Release|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Release|x64.ActiveCfg = Release|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Release|x64.Build.0 = Release|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Release|x86.ActiveCfg = Release|Any CPU + {4789A7B8-FC16-4606-8544-94291C148937}.Release|x86.Build.0 = Release|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Debug|x64.ActiveCfg = Debug|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Debug|x64.Build.0 = Debug|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Debug|x86.ActiveCfg = Debug|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Debug|x86.Build.0 = Debug|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Release|Any CPU.Build.0 = Release|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Release|x64.ActiveCfg = Release|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Release|x64.Build.0 = Release|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Release|x86.ActiveCfg = Release|Any CPU + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931} @@ -362,5 +420,10 @@ Global {D56D47F6-2C26-42D2-BA00-C39824CFAF55} = {F5F87A9D-C304-4833-B107-D666317F6931} {62452255-1DE7-4D37-BB01-A690EC7E3156} = {F5F87A9D-C304-4833-B107-D666317F6931} {BDF16A97-6269-4CA1-8D67-785DDD357B30} = {F5F87A9D-C304-4833-B107-D666317F6931} + {D23906E1-8276-4D63-9E06-F1194DCCBE3A} = {F5F87A9D-C304-4833-B107-D666317F6931} + {0B3BC868-306D-4D0D-93E2-38FBC24A4F1D} = {D23906E1-8276-4D63-9E06-F1194DCCBE3A} + {3D1D4CE5-5029-4EDB-882A-CD7951FF1B7A} = {D23906E1-8276-4D63-9E06-F1194DCCBE3A} + {4789A7B8-FC16-4606-8544-94291C148937} = {D23906E1-8276-4D63-9E06-F1194DCCBE3A} + {72910CCC-6EA7-41CE-9B56-9FFCFBA7BAF2} = {D23906E1-8276-4D63-9E06-F1194DCCBE3A} EndGlobalSection EndGlobal diff --git a/RobustToolbox b/RobustToolbox index 6506171..986ec3e 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 6506171ea04a9c4a4781fa3991f630e9cb35981b +Subproject commit 986ec3ef062bd6977cedf357c77d049e4e18a017