tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix accidental C# 8.0 usage.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-08-22 11:06:10 +02:00
parent 09b1066122
commit 44fdf4022e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.IntegrationTests/Content.IntegrationTests.csproj
View File

@@ -7,6 +7,7 @@
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<LangVersion>7.3</LangVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" /> <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup> <ItemGroup>

4
Content.IntegrationTests/ContentIntegrationTest.cs
View File

@@ -11,7 +11,7 @@ namespace Content.IntegrationTests
{ {
protected override ClientIntegrationInstance StartClient(ClientIntegrationOptions options = null) protected override ClientIntegrationInstance StartClient(ClientIntegrationOptions options = null)
{ {
options ??= new ClientIntegrationOptions(); options = options ?? new ClientIntegrationOptions();
// ReSharper disable once RedundantNameQualifier // ReSharper disable once RedundantNameQualifier
options.ClientContentAssembly = typeof(Client.EntryPoint).Assembly; options.ClientContentAssembly = typeof(Client.EntryPoint).Assembly;
options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly; options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly;
@@ -33,7 +33,7 @@ namespace Content.IntegrationTests
protected override ServerIntegrationInstance StartServer(ServerIntegrationOptions options = null) protected override ServerIntegrationInstance StartServer(ServerIntegrationOptions options = null)
{ {
options ??= new ServerIntegrationOptions(); options = options ?? new ServerIntegrationOptions();
options.ServerContentAssembly = typeof(Server.EntryPoint).Assembly; options.ServerContentAssembly = typeof(Server.EntryPoint).Assembly;
options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly; options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly;
return base.StartServer(options); return base.StartServer(options);