Skip to content

Commit 43fd836

Browse files
Nulllink fix (#4114)
## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions.
1 parent d7da7ca commit 43fd836

2 files changed

Lines changed: 18 additions & 13 deletions

File tree

Content.Packaging/ServerPackaging.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@ public static class ServerPackaging
4343
"System.Diagnostics.EventLog.Messages", // Starlight
4444
};
4545

46-
// Starlight
47-
private static readonly HashSet<string> ServerForceContentAssemblies = new()
48-
{
49-
"Microsoft.Extensions.Configuration.dll",
50-
"Microsoft.Extensions.Configuration.Abstractions.dll",
51-
"Microsoft.Extensions.Configuration.Binder.dll",
52-
};
53-
5446
private static readonly HashSet<string> BinSkipFolders = new()
5547
{
5648
// Roslyn localization files, screw em.
@@ -219,11 +211,7 @@ private static IEnumerable<string> GetContentAssemblyNamesToCopy(DepsHandler dep
219211
var depsContent = deps.RecursiveGetLibrariesFrom("Content.Server").SelectMany(GetLibraryNames);
220212
var depsRobust = deps.RecursiveGetLibrariesFrom("Robust.Server").SelectMany(GetLibraryNames);
221213

222-
// Starlight start
223-
var depsContentExclusive = depsContent
224-
.Where(p => !depsRobust.Contains(p) || ServerForceContentAssemblies.Contains(p))
225-
.ToHashSet();
226-
// Starlight end
214+
var depsContentExclusive = depsContent.Except(depsRobust).ToHashSet();
227215

228216
// Remove .dll suffix and apply filtering.
229217
var names = depsContentExclusive.Select(p => p[..^4]).Where(p => !ServerNotExtraAssemblies.Any(p.StartsWith));

Directory.Build.targets

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<!--
3+
Serilog.Sinks.Http 7.2.0 (pulled transitively via Serilog.Sinks.Loki in Robust.Server)
4+
hard-pins Microsoft.Extensions.Configuration to 3.1.9. Orleans 10.0.1 (Content.Server)
5+
requires 10.0.0 — ConfigurationSection.TryGetValue was added there.
6+
7+
RobustToolbox has no Directory.Build.targets, so MSBuild traverses up and finds this file
8+
for all Robust.* projects too. Adding explicit references here pins the minimum version to
9+
10.0.0 in Robust.Server's dependency graph without touching the submodule.
10+
-->
11+
<ItemGroup Condition="'$(MSBuildProjectName)' == 'Robust.Server'">
12+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
13+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
16+
</ItemGroup>
17+
</Project>

0 commit comments

Comments
 (0)