space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update some NuGet dependencies.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-05-29 01:45:31 +02:00
parent b32f695509
commit 00f6564351
9 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs
View File

@@ -208,9 +208,9 @@ namespace Robust.Client.ResourceManagement
RSI = rsi;
}
private static readonly JsonSchema4 RSISchema = GetSchema();
private static readonly JsonSchema RSISchema = GetSchema();
private static JsonSchema4 GetSchema()
private static JsonSchema GetSchema()
{
try
{
@@ -222,7 +222,7 @@ namespace Robust.Client.ResourceManagement
schema = schemaReader.ReadToEnd();
}
return JsonSchema4.FromJsonAsync(schema).Result;
return JsonSchema.FromJsonAsync(schema).Result;
}
catch (Exception e)
{

14
Robust.Client/Robust.Client.csproj
View File

@@ -12,18 +12,18 @@
</PropertyGroup>
<Import Project="..\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup>
<PackageReference Include="DiscordRichPresence" Version="1.0.95" />
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="DiscordRichPresence" Version="1.0.108" />
<PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
<PackageReference Include="NVorbis" Version="0.8.6" />
<PackageReference Include="SharpZipLib" Version="1.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NJsonSchema" Version="9.13.34" />
<PackageReference Include="SharpZipLib" Version="1.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NJsonSchema" Version="10.0.8" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0007" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0006" />
<PackageReference Include="System.Memory" Version="4.5.2" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="YamlDotNet" Version="5.0.1" />
<PackageReference Include="YamlDotNet" Version="6.0.0" />
<PackageReference Include="OpenTK" Version="3.0.1" />
<PackageReference Include="SharpFont" Version="4.0.1" />
<!-- Including SharpFont.Dependencies to silence a warning -->

2
Robust.Client/Utility/DiscordRichPresence.cs
View File

@@ -111,7 +111,7 @@ namespace Robust.Client.Utility
if (newValue)
{
if (_client == null || _client.Disposed)
if (_client == null || _client.IsDisposed)
{
_start();
}

11
Robust.Client/app.config
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

4
Robust.Server/Robust.Server.csproj
View File

@@ -13,9 +13,9 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="1.9.71" />
<PackageReference Include="ConcurrentDataStructures" Version="0.2.0" />
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="YamlDotNet" Version="5.0.1" />
<PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Lidgren.Network\Lidgren.Network.csproj" />

4
Robust.Shared.Maths/Robust.Shared.Maths.csproj
View File

@@ -11,7 +11,7 @@
</PropertyGroup>
<Import Project="..\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>
</Project>

12
Robust.Shared/Robust.Shared.csproj
View File

@@ -10,16 +10,16 @@
</PropertyGroup>
<Import Project="..\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="Mono.Cecil" Version="0.10.0" />
<PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<PackageReference Include="NetSerializer" Version="4.1.0" />
<PackageReference Include="Nett" Version="0.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NGettext" Version="0.6.3" />
<PackageReference Include="SharpZipLib" Version="1.0.0" />
<PackageReference Include="System.Memory" Version="4.5.2" />
<PackageReference Include="SharpZipLib" Version="1.1.0" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="YamlDotNet" Version="5.0.1" />
<PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Lidgren.Network\Lidgren.Network.csproj" />

14
Robust.UnitTesting/Robust.UnitTesting.csproj
View File

@@ -10,20 +10,20 @@
</PropertyGroup>
<Import Project="..\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.3.1" />
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="Castle.Core" Version="4.4.0" />
<PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
<PackageReference Include="Microsoft.CodeCoverage" Version="15.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="Moq" Version="4.11.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Smocks.ExtensionPackage" Version="0.7.5-beta2" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="YamlDotNet" Version="5.0.1" />
<PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Lidgren.Network\Lidgren.Network.csproj" />

4
Robust.UnitTesting/app.config
View File

@@ -6,10 +6,6 @@
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>