Update RT to 268.0.0

This commit is contained in:
PJB3005 2025-11-16 20:34:33 +01:00
parent 6347ddffb8
commit ca2bb9dcff
No known key found for this signature in database
14 changed files with 44 additions and 77 deletions

View file

@ -1,21 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<PropertyGroup>
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
<TargetFramework>$(TargetFramework)</TargetFramework>
<LangVersion>11</LangVersion>
<IsPackable>false</IsPackable>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>..\bin\Content.Client\</OutputPath>
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
<WarningsAsErrors>nullable</WarningsAsErrors>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Tools;DebugOpt</Configurations>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Nett" Version="0.15.0" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
<PackageReference Include="Nett" />
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />

View file

@ -15,8 +15,8 @@ public sealed class EntryPoint : GameClient
{
public override void Init()
{
var factory = IoCManager.Resolve<IComponentFactory>();
var prototypes = IoCManager.Resolve<IPrototypeManager>();
var factory = Dependencies.Resolve<IComponentFactory>();
var prototypes = Dependencies.Resolve<IPrototypeManager>();
factory.DoAutoRegistrations();
@ -44,9 +44,9 @@ public sealed class EntryPoint : GameClient
base.PostInit();
// DEVNOTE: The line below will disable lighting, so you can see in-game sprites without the need for lights
IoCManager.Resolve<ILightManager>().Enabled = false;
Dependencies.Resolve<ILightManager>().Enabled = false;
var stateManager = IoCManager.Resolve<IStateManager>();
var stateManager = Dependencies.Resolve<IStateManager>();
// DEVNOTE: It's recommended to look at how this works! It's for debug purposes and you probably want something prettier for the final game.
// Additionally, state manager is the primary way you'll be changing between UIScreen instances.

View file

@ -5,6 +5,7 @@ namespace Content.Client;
internal static class Program
{
[STAThread]
public static void Main(string[] args)
{
ContentStart.Start(args);

View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<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>