Merge pull request #2 from 20kdc/robust-paint-prep-work

Update to latest RobustToolbox
This commit is contained in:
moonheart08 2020-12-17 15:22:19 -06:00 committed by GitHub
commit e52fa6bb93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions

View file

@ -22,5 +22,4 @@
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
</ItemGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.Engine.targets" />
<Target Name="ContentAfterBuild" DependsOnTargets="ClientAfterBuild" AfterTargets="Build" />
</Project>
</Project>

View file

@ -12,7 +12,6 @@
</PropertyGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
@ -22,4 +21,4 @@
<ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
</ItemGroup>
</Project>
</Project>

@ -1 +1 @@
Subproject commit 7aaeac81b0d2e2b5479d8a834eaba911b797a351
Subproject commit 74eb8e3e8de7e9e71c830ece29ce620aa3c88589