From 7f2ec17651fa243118d13740670dfb8c0997cae3 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Tue, 16 Dec 2025 22:56:31 +0100 Subject: [PATCH] Okay, the Robust API thing didn't pan out. New plan. It apparently broke clean builds, as the dependencies aren't in the project asset list or something anymore. I tried to fix this, but it seems impossible to do without relying on .NET SDK internals, as there's no point in the NuGet graph walk process that seems cleanly extensible. Instead let's just do the much dumber thing: a bunch of .props files for content to import. Hooray! This also means that I have to go through and *explicitly* disable transitive dependencies everywhere in RT. This thankfully isn't too hard. --- Directory.Build.props | 21 +++++ Imports/Benchmarks.props | 6 ++ Imports/Client.props | 6 ++ Imports/Lidgren.props | 6 ++ Imports/Packaging.props | 6 ++ Imports/Server.props | 6 ++ Imports/Shared.props | 8 ++ Imports/Testing.props | 9 ++ MSBuild/Robust.Api.targets | 83 ------------------- MSBuild/Robust.ProjectReferences.targets | 12 +++ MSBuild/Robust.Properties.targets | 2 +- Robust.Benchmarks/Robust.Benchmarks.csproj | 4 + .../Robust.Client.IntegrationTests.csproj | 1 + .../Robust.Client.Tests.csproj | 2 + Robust.Client/Robust.Client.csproj | 5 ++ .../Robust.Packaging.Tests.csproj | 1 + Robust.Packaging/Robust.Packaging.csproj | 5 ++ .../Robust.Server.IntegrationTests.csproj | 1 + Robust.Server/Robust.Server.csproj | 5 ++ .../Robust.Shared.IntegrationTests.csproj | 4 + .../Robust.Shared.Scripting.csproj | 2 + .../Robust.Shared.Testing.csproj | 1 + .../Robust.Shared.Tests.csproj | 5 ++ Robust.Shared/Robust.Shared.csproj | 2 +- Robust.UnitTesting/Robust.UnitTesting.csproj | 3 + Robust.Xaml/Robust.Xaml.csproj | 2 + RobustToolbox.slnx | 12 ++- 27 files changed, 134 insertions(+), 86 deletions(-) create mode 100644 Directory.Build.props create mode 100644 Imports/Benchmarks.props create mode 100644 Imports/Client.props create mode 100644 Imports/Lidgren.props create mode 100644 Imports/Packaging.props create mode 100644 Imports/Server.props create mode 100644 Imports/Shared.props create mode 100644 Imports/Testing.props delete mode 100644 MSBuild/Robust.Api.targets create mode 100644 MSBuild/Robust.ProjectReferences.targets diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..dc7e60676 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,21 @@ + + + + + compile;contentFiles;build;buildMultitargeting;buildTransitive;analyzers + + + + + + True + + diff --git a/Imports/Benchmarks.props b/Imports/Benchmarks.props new file mode 100644 index 000000000..5be70ac48 --- /dev/null +++ b/Imports/Benchmarks.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/Imports/Client.props b/Imports/Client.props new file mode 100644 index 000000000..bd45aa661 --- /dev/null +++ b/Imports/Client.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/Imports/Lidgren.props b/Imports/Lidgren.props new file mode 100644 index 000000000..7358309dc --- /dev/null +++ b/Imports/Lidgren.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/Imports/Packaging.props b/Imports/Packaging.props new file mode 100644 index 000000000..13f6d0d69 --- /dev/null +++ b/Imports/Packaging.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/Imports/Server.props b/Imports/Server.props new file mode 100644 index 000000000..174d03988 --- /dev/null +++ b/Imports/Server.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/Imports/Shared.props b/Imports/Shared.props new file mode 100644 index 000000000..208729fb5 --- /dev/null +++ b/Imports/Shared.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Imports/Testing.props b/Imports/Testing.props new file mode 100644 index 000000000..2e610b875 --- /dev/null +++ b/Imports/Testing.props @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/MSBuild/Robust.Api.targets b/MSBuild/Robust.Api.targets deleted file mode 100644 index 7d4e06b88..000000000 --- a/MSBuild/Robust.Api.targets +++ /dev/null @@ -1,83 +0,0 @@ - - - - - false - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_RTProjectReference KeepDuplicates="false" - Include="%(_EnabledRobustApi.Project)\%(_EnabledRobustApi.Project).csproj" - ProjectDir="%(_EnabledRobustApi.ProjectDir)" - Condition="'%(_EnabledRobustApi.Project)' != ''" /> - - - - - - - - - - - - - diff --git a/MSBuild/Robust.ProjectReferences.targets b/MSBuild/Robust.ProjectReferences.targets new file mode 100644 index 000000000..604d03746 --- /dev/null +++ b/MSBuild/Robust.ProjectReferences.targets @@ -0,0 +1,12 @@ + + + + + + + diff --git a/MSBuild/Robust.Properties.targets b/MSBuild/Robust.Properties.targets index 22a2bd702..6c6cbdbf5 100644 --- a/MSBuild/Robust.Properties.targets +++ b/MSBuild/Robust.Properties.targets @@ -32,7 +32,7 @@ - + @@ -42,6 +46,7 @@ + diff --git a/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj b/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj index ea26340f6..b94c8d7ae 100644 --- a/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj +++ b/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj @@ -15,6 +15,7 @@ + diff --git a/Robust.Packaging/Robust.Packaging.csproj b/Robust.Packaging/Robust.Packaging.csproj index d6ab2e72e..aa5afc561 100644 --- a/Robust.Packaging/Robust.Packaging.csproj +++ b/Robust.Packaging/Robust.Packaging.csproj @@ -6,6 +6,11 @@ Exe + + + + + diff --git a/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj b/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj index 54bf4f93c..4cfd5db0b 100644 --- a/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj +++ b/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj @@ -17,6 +17,7 @@ + diff --git a/Robust.Server/Robust.Server.csproj b/Robust.Server/Robust.Server.csproj index e0a4c209f..11ed9746d 100644 --- a/Robust.Server/Robust.Server.csproj +++ b/Robust.Server/Robust.Server.csproj @@ -32,6 +32,10 @@ + + + + @@ -39,6 +43,7 @@ + diff --git a/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj b/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj index 598bf33c5..8d287bd29 100644 --- a/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj +++ b/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj @@ -8,6 +8,8 @@ + + @@ -17,6 +19,8 @@ + + diff --git a/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj b/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj index db95bfeb2..e9d3e0ab5 100644 --- a/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj +++ b/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj @@ -11,12 +11,14 @@ + + diff --git a/Robust.Shared.Testing/Robust.Shared.Testing.csproj b/Robust.Shared.Testing/Robust.Shared.Testing.csproj index 79160d007..0103c7bfa 100644 --- a/Robust.Shared.Testing/Robust.Shared.Testing.csproj +++ b/Robust.Shared.Testing/Robust.Shared.Testing.csproj @@ -10,6 +10,7 @@ + diff --git a/Robust.Shared.Tests/Robust.Shared.Tests.csproj b/Robust.Shared.Tests/Robust.Shared.Tests.csproj index 2cf2a4a10..13e223e20 100644 --- a/Robust.Shared.Tests/Robust.Shared.Tests.csproj +++ b/Robust.Shared.Tests/Robust.Shared.Tests.csproj @@ -6,6 +6,10 @@ + + + + @@ -15,6 +19,7 @@ + diff --git a/Robust.Shared/Robust.Shared.csproj b/Robust.Shared/Robust.Shared.csproj index c30d5e050..424cc81c6 100644 --- a/Robust.Shared/Robust.Shared.csproj +++ b/Robust.Shared/Robust.Shared.csproj @@ -16,7 +16,7 @@ - + diff --git a/Robust.UnitTesting/Robust.UnitTesting.csproj b/Robust.UnitTesting/Robust.UnitTesting.csproj index 6a6b47075..81d0d4fe5 100644 --- a/Robust.UnitTesting/Robust.UnitTesting.csproj +++ b/Robust.UnitTesting/Robust.UnitTesting.csproj @@ -6,6 +6,8 @@ + + @@ -15,6 +17,7 @@ + diff --git a/Robust.Xaml/Robust.Xaml.csproj b/Robust.Xaml/Robust.Xaml.csproj index 730c7da42..ff779e6ab 100644 --- a/Robust.Xaml/Robust.Xaml.csproj +++ b/Robust.Xaml/Robust.Xaml.csproj @@ -8,10 +8,12 @@ + + diff --git a/RobustToolbox.slnx b/RobustToolbox.slnx index a357b9cf1..25374fa30 100644 --- a/RobustToolbox.slnx +++ b/RobustToolbox.slnx @@ -14,9 +14,17 @@ + + + + + + + + + - @@ -24,6 +32,7 @@ + @@ -35,6 +44,7 @@ +