From 96ef233a7959c9cd0b8073ee7f0986d706560506 Mon Sep 17 00:00:00 2001 From: 20kdc Date: Thu, 24 Dec 2020 13:38:44 +0000 Subject: [PATCH 1/2] Update RobustToolbox (PRETEND THIS IS v0.2.9) --- Content.Client/Content.Client.csproj | 3 ++- Content.Server/Content.Server.csproj | 2 +- Content.Shared/Content.Shared.csproj | 4 ++-- RobustToolbox | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 1730024..0c32b14 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -3,7 +3,7 @@ $(TargetFramework) - 8 + 9 false false ..\bin\Content.Client\ @@ -22,4 +22,5 @@ + diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index 85d908f..96577a9 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -3,7 +3,7 @@ $(TargetFramework) - 8 + 9 false false ..\bin\Content.Server\ diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index 76f6cd6..fdfbe98 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -3,7 +3,7 @@ $(TargetFramework) - 8 + 9 false false ../bin/Content.Shared @@ -25,4 +25,4 @@ false - \ No newline at end of file + diff --git a/RobustToolbox b/RobustToolbox index 74eb8e3..826dce6 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 74eb8e3e8de7e9e71c830ece29ce620aa3c88589 +Subproject commit 826dce6659cb1d04b6ef0c0bee161b642a18f114 From 4d4352adb3082ee7900de047e637b3a6beb169b2 Mon Sep 17 00:00:00 2001 From: 20kdc Date: Fri, 25 Dec 2020 19:34:55 +0000 Subject: [PATCH 2/2] Fix project listing and thus build --- RobustToolbox | 2 +- robusttemplate.sln | 132 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 826dce6..1f95fe6 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 826dce6659cb1d04b6ef0c0bee161b642a18f114 +Subproject commit 1f95fe67823e3fa8bed0635c5eb597038763a7c9 diff --git a/robusttemplate.sln b/robusttemplate.sln index c9bdc8c..a0a3f2c 100644 --- a/robusttemplate.sln +++ b/robusttemplate.sln @@ -29,6 +29,30 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetSerializer", "RobustTool EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "RobustToolbox\Lidgren.Network\Lidgren.Network.csproj", "{12D598FD-8FFA-4BAF-8594-FDB9834144FF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamlX", "XamlX", "{7D767ECE-DA99-4941-ADF3-D89FB8A58719}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{91AF0388-356D-4929-9A86-1B1F5196E921}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{7380FFC8-AFEF-4B66-8426-2D8E34221CF4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{A406137A-DEC7-4CC5-99A8-6595ACC70B92}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenToolkit.GraphicsLibraryFramework", "RobustToolbox\OpenToolkit.GraphicsLibraryFramework\OpenToolkit.GraphicsLibraryFramework.csproj", "{6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Robust.LoaderApi", "Robust.LoaderApi", "{EDB842C6-67AE-4F0E-A9F2-09C2DF1024C9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ManagedHttpListener", "ManagedHttpListener", "{154B8514-C668-4BFC-AC03-C1CC9D220640}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.HttpListener", "RobustToolbox\ManagedHttpListener\src\System.Net.HttpListener.csproj", "{389B974A-4FB9-4679-B91D-29FBB5904018}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{AF551ED1-6F07-4035-8ADE-E647A9E533AB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8A30B42B-6897-4218-9932-AA348D4A4983}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -174,6 +198,102 @@ Global {12D598FD-8FFA-4BAF-8594-FDB9834144FF}.Release|x64.Build.0 = Release|Any CPU {12D598FD-8FFA-4BAF-8594-FDB9834144FF}.Release|x86.ActiveCfg = Release|Any CPU {12D598FD-8FFA-4BAF-8594-FDB9834144FF}.Release|x86.Build.0 = Release|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Debug|x64.ActiveCfg = Debug|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Debug|x64.Build.0 = Debug|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Debug|x86.ActiveCfg = Debug|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Debug|x86.Build.0 = Debug|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Release|Any CPU.Build.0 = Release|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Release|x64.ActiveCfg = Release|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Release|x64.Build.0 = Release|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Release|x86.ActiveCfg = Release|Any CPU + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4}.Release|x86.Build.0 = Release|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Debug|x64.ActiveCfg = Debug|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Debug|x64.Build.0 = Debug|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Debug|x86.ActiveCfg = Debug|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Debug|x86.Build.0 = Debug|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Release|Any CPU.Build.0 = Release|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Release|x64.ActiveCfg = Release|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Release|x64.Build.0 = Release|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Release|x86.ActiveCfg = Release|Any CPU + {A406137A-DEC7-4CC5-99A8-6595ACC70B92}.Release|x86.Build.0 = Release|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Debug|x64.ActiveCfg = Debug|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Debug|x64.Build.0 = Debug|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Debug|x86.ActiveCfg = Debug|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Debug|x86.Build.0 = Debug|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Release|Any CPU.Build.0 = Release|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Release|x64.ActiveCfg = Release|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Release|x64.Build.0 = Release|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Release|x86.ActiveCfg = Release|Any CPU + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3}.Release|x86.Build.0 = Release|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Debug|x64.ActiveCfg = Debug|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Debug|x64.Build.0 = Debug|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Debug|x86.ActiveCfg = Debug|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Debug|x86.Build.0 = Debug|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Release|Any CPU.Build.0 = Release|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Release|x64.ActiveCfg = Release|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Release|x64.Build.0 = Release|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Release|x86.ActiveCfg = Release|Any CPU + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F}.Release|x86.Build.0 = Release|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Debug|x64.ActiveCfg = Debug|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Debug|x64.Build.0 = Debug|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Debug|x86.ActiveCfg = Debug|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Debug|x86.Build.0 = Debug|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Release|Any CPU.Build.0 = Release|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Release|x64.ActiveCfg = Release|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Release|x64.Build.0 = Release|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Release|x86.ActiveCfg = Release|Any CPU + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3}.Release|x86.Build.0 = Release|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Debug|Any CPU.Build.0 = Debug|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Debug|x64.ActiveCfg = Debug|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Debug|x64.Build.0 = Debug|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Debug|x86.ActiveCfg = Debug|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Debug|x86.Build.0 = Debug|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Release|Any CPU.ActiveCfg = Release|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Release|Any CPU.Build.0 = Release|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Release|x64.ActiveCfg = Release|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Release|x64.Build.0 = Release|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Release|x86.ActiveCfg = Release|Any CPU + {389B974A-4FB9-4679-B91D-29FBB5904018}.Release|x86.Build.0 = Release|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Debug|x64.ActiveCfg = Debug|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Debug|x64.Build.0 = Debug|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Debug|x86.ActiveCfg = Debug|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Debug|x86.Build.0 = Debug|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Release|Any CPU.Build.0 = Release|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Release|x64.ActiveCfg = Release|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Release|x64.Build.0 = Release|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Release|x86.ActiveCfg = Release|Any CPU + {AF551ED1-6F07-4035-8ADE-E647A9E533AB}.Release|x86.Build.0 = Release|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Debug|x64.ActiveCfg = Debug|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Debug|x64.Build.0 = Debug|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Debug|x86.ActiveCfg = Debug|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Debug|x86.Build.0 = Debug|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Release|Any CPU.Build.0 = Release|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Release|x64.ActiveCfg = Release|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Release|x64.Build.0 = Release|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Release|x86.ActiveCfg = Release|Any CPU + {8A30B42B-6897-4218-9932-AA348D4A4983}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931} @@ -185,5 +305,17 @@ Global {FBA7FDE5-3884-4C46-A14E-3CDDC9091007} = {F5F87A9D-C304-4833-B107-D666317F6931} {7D6AC09C-D5A1-436E-9437-BD3B3FCD3B64} = {FBA7FDE5-3884-4C46-A14E-3CDDC9091007} {12D598FD-8FFA-4BAF-8594-FDB9834144FF} = {F5F87A9D-C304-4833-B107-D666317F6931} + {7D767ECE-DA99-4941-ADF3-D89FB8A58719} = {F5F87A9D-C304-4833-B107-D666317F6931} + {91AF0388-356D-4929-9A86-1B1F5196E921} = {7D767ECE-DA99-4941-ADF3-D89FB8A58719} + {7380FFC8-AFEF-4B66-8426-2D8E34221CF4} = {91AF0388-356D-4929-9A86-1B1F5196E921} + {A406137A-DEC7-4CC5-99A8-6595ACC70B92} = {91AF0388-356D-4929-9A86-1B1F5196E921} + {19BC1F51-45E8-4BA6-854C-FDB7670AB4E3} = {91AF0388-356D-4929-9A86-1B1F5196E921} + {6E9EFBDA-DC7F-4AFE-8BEF-D75C71FFB11F} = {F5F87A9D-C304-4833-B107-D666317F6931} + {EDB842C6-67AE-4F0E-A9F2-09C2DF1024C9} = {F5F87A9D-C304-4833-B107-D666317F6931} + {EC94C69F-F0E2-44B0-BE5E-C385BECB6AD3} = {EDB842C6-67AE-4F0E-A9F2-09C2DF1024C9} + {154B8514-C668-4BFC-AC03-C1CC9D220640} = {F5F87A9D-C304-4833-B107-D666317F6931} + {389B974A-4FB9-4679-B91D-29FBB5904018} = {154B8514-C668-4BFC-AC03-C1CC9D220640} + {AF551ED1-6F07-4035-8ADE-E647A9E533AB} = {F5F87A9D-C304-4833-B107-D666317F6931} + {8A30B42B-6897-4218-9932-AA348D4A4983} = {F5F87A9D-C304-4833-B107-D666317F6931} EndGlobalSection EndGlobal