Dependency update / fixes / skrungle bungle (#23745)
* Give .props files 2-space indents.
* Move to Central Package Management.
Allows us to store NuGet package versions all in one place. Yay!
* Update NuGet packages and fix code for changes.
Notable:
Changes to ILVerify.
Npgsql doesn't need hacks for inet anymore, now we need hacks to make the old code work with this new reality.
NUnit's analyzers are already complaining and I didn't even update it to 4.x yet.
TerraFX changed to GetLastSystemError so error handling had to be changed.
Buncha APIs have more NRT annotations.
* Remove dotnet-eng NuGet package source.
I genuinely don't know what this was for, and Central Package Management starts throwing warnings about it, so YEET.
* Remove Robust.Physics project.
Never used.
* Remove erroneous NVorbis reference.
Should be VorbisPizza and otherwise wasn't used.
* Sandbox fixes
* Remove unused unit test package references.
Castle.Core and NUnit.ConsoleRunner.
* Update NUnit to 4.0.1
This requires replacing all the old assertion methods because they removed them 🥲
* Oh so that's what dotnet-eng was used for. Yeah ok that makes sense.
* Add Robust.Analyzers.Test
* Update submodule
* commit to re-run CI
This commit is contained in:
committed by
GitHub
parent
d2a1eae2d9
commit
a6c9c36b68
@@ -9,6 +9,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Diagnostics;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using NpgsqlTypes;
|
||||
|
||||
namespace Content.Server.Database
|
||||
{
|
||||
@@ -48,8 +49,8 @@ namespace Content.Server.Database
|
||||
.Property(p => p.LastSeenAddress)
|
||||
.HasConversion(ipConverter);
|
||||
|
||||
var ipMaskConverter = new ValueConverter<(IPAddress address, int mask), string>(
|
||||
v => InetToString(v.address, v.mask),
|
||||
var ipMaskConverter = new ValueConverter<NpgsqlInet, string>(
|
||||
v => InetToString(v.Address, v.Netmask),
|
||||
v => StringToInet(v)
|
||||
);
|
||||
|
||||
@@ -98,11 +99,11 @@ namespace Content.Server.Database
|
||||
return $"{address}/{mask}";
|
||||
}
|
||||
|
||||
private static (IPAddress, int) StringToInet(string inet) {
|
||||
private static NpgsqlInet StringToInet(string inet) {
|
||||
var idx = inet.IndexOf('/', StringComparison.Ordinal);
|
||||
return (
|
||||
return new NpgsqlInet(
|
||||
IPAddress.Parse(inet.AsSpan(0, idx)),
|
||||
int.Parse(inet.AsSpan(idx + 1), provider: CultureInfo.InvariantCulture)
|
||||
byte.Parse(inet.AsSpan(idx + 1), provider: CultureInfo.InvariantCulture)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user