Update to .NET 6 and C# 10 (#5233)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Space-Stories · Nov 9, 2021 · af579b1 · af579b1
1 parent 29f3d2d
commit af579b1
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 43 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 6.0.100
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 6.0.100
       - name: Install dependencies
         run: dotnet restore
       - name: Build

diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj
@@ -8,7 +8,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Client\</OutputPath>

diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -6,7 +6,7 @@
     <OutputPath>..\bin\Content.IntegrationTests\</OutputPath>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
   </PropertyGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>

diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -68,9 +68,9 @@ public async Task Test()
                 // Test for components existing
                 Assert.True(human.TryGetComponent(out cuffed!), $"Human has no {nameof(CuffableComponent)}");
                 Assert.True(human.TryGetComponent(out hands!), $"Human has no {nameof(HandsComponent)}");
-                Assert.True(human.TryGetComponent(out SharedBodyComponent _), $"Human has no {nameof(SharedBodyComponent)}");
-                Assert.True(cuffs.TryGetComponent(out HandcuffComponent _), $"Handcuff has no {nameof(HandcuffComponent)}");
-                Assert.True(secondCuffs.TryGetComponent(out HandcuffComponent _), $"Second handcuffs has no {nameof(HandcuffComponent)}");
+                Assert.True(human.TryGetComponent(out SharedBodyComponent? _), $"Human has no {nameof(SharedBodyComponent)}");
+                Assert.True(cuffs.TryGetComponent(out HandcuffComponent? _), $"Handcuff has no {nameof(HandcuffComponent)}");
+                Assert.True(secondCuffs.TryGetComponent(out HandcuffComponent? _), $"Second handcuffs has no {nameof(HandcuffComponent)}");
 
                 // Test to ensure cuffed players register the handcuffs
                 cuffed.TryAddNewCuffs(human, cuffs);

diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs
@@ -55,7 +55,7 @@ public async Task Test()
                 // Test for climb components existing
                 // Players and tables should have these in their prototypes.
                 Assert.That(human.TryGetComponent(out climbing!), "Human has no climbing");
-                Assert.That(table.TryGetComponent(out ClimbableComponent _), "Table has no climbable");
+                Assert.That(table.TryGetComponent(out ClimbableComponent? _), "Table has no climbable");
 
                 // Now let's make the player enter a climbing transitioning state.
                 climbing.IsClimbing = true;

diff --git a/Content.Server.Database/Content.Server.Database.csproj b/Content.Server.Database/Content.Server.Database.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server.Database\</OutputPath>
@@ -13,12 +13,12 @@
   <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.3" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.2" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 </Project>
diff --git a/Content.Server.Database/ModelPostgres.cs b/Content.Server.Database/ModelPostgres.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Net;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 
@@ -28,6 +29,11 @@ protected override void OnConfiguring(DbContextOptionsBuilder options)
             options.ReplaceService<IRelationalTypeMappingSource, CustomNpgsqlTypeMappingSource>();
 
             ((IDbContextOptionsBuilderInfrastructure) options).AddOrUpdateExtension(new SnakeCaseExtension());
+
+            options.ConfigureWarnings(x =>
+            {
+                x.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning);
+            });
         }
 
         public PostgresServerDbContext(DbContextOptions<ServerDbContext> options) : base(options)
@@ -82,7 +88,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             {
                 foreach(var property in entity.GetProperties())
                 {
-                    if (property.FieldInfo.FieldType == typeof(DateTime) || property.FieldInfo.FieldType == typeof(DateTime?))
+                    if (property.FieldInfo?.FieldType == typeof(DateTime) || property.FieldInfo?.FieldType == typeof(DateTime?))
                         property.SetColumnType("timestamp with time zone");
                 }
             }

diff --git a/Content.Server.Database/ModelSqlite.cs b/Content.Server.Database/ModelSqlite.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.Net;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
@@ -25,6 +26,11 @@ protected override void OnConfiguring(DbContextOptionsBuilder options)
                 options.UseSqlite("dummy connection string");
 
             ((IDbContextOptionsBuilderInfrastructure) options).AddOrUpdateExtension(new SnakeCaseExtension());
+
+            options.ConfigureWarnings(x =>
+            {
+                x.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning);
+            });
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)

diff --git a/Content.Server.Database/SnakeCaseNaming.cs b/Content.Server.Database/SnakeCaseNaming.cs
@@ -33,7 +33,12 @@ public ExtensionInfo(IDbContextOptionsExtension extension) : base(extension) {}
 
             public override string LogFragment => "Snake Case Extension";
 
-            public override long GetServiceProviderHashCode() => 0;
+            public override int GetServiceProviderHashCode() => 0;
+
+            public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
+            {
+                return false;
+            }
 
             public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
             {
@@ -118,26 +123,26 @@ public virtual void ProcessEntityTypeAdded(
 
             if (entityType.BaseType is null)
             {
-                entityTypeBuilder.ToTable(RewriteName(entityType.GetTableName()), entityType.GetSchema());
+                entityTypeBuilder.ToTable(RewriteName(entityType.GetTableName()!), entityType.GetSchema());
 
                 if (entityType.GetViewNameConfigurationSource() == ConfigurationSource.Convention)
                 {
-                    entityTypeBuilder.ToView(RewriteName(entityType.GetViewName()), entityType.GetViewSchema());
+                    entityTypeBuilder.ToView(RewriteName(entityType.GetViewName()!), entityType.GetViewSchema());
                 }
             }
         }
 
         public void ProcessEntityTypeBaseTypeChanged(
             IConventionEntityTypeBuilder entityTypeBuilder,
-            IConventionEntityType newBaseType,
-            IConventionEntityType oldBaseType,
+            IConventionEntityType? newBaseType,
+            IConventionEntityType? oldBaseType,
             IConventionContext<IConventionEntityType> context)
         {
             var entityType = entityTypeBuilder.Metadata;
 
             if (newBaseType is null)
             {
-                entityTypeBuilder.ToTable(RewriteName(entityType.GetTableName()), entityType.GetSchema());
+                entityTypeBuilder.ToTable(RewriteName(entityType.GetTableName()!), entityType.GetSchema());
             }
             else
             {
@@ -173,8 +178,8 @@ public void ProcessForeignKeyOwnershipChanged(IConventionForeignKeyBuilder relat
         public void ProcessEntityTypeAnnotationChanged(
             IConventionEntityTypeBuilder entityTypeBuilder,
             string name,
-            IConventionAnnotation annotation,
-            IConventionAnnotation oldAnnotation,
+            IConventionAnnotation? annotation,
+            IConventionAnnotation? oldAnnotation,
             IConventionContext<IConventionAnnotation> context)
         {
             var entityType = entityTypeBuilder.Metadata;
@@ -216,7 +221,7 @@ public void ProcessEntityTypeAnnotationChanged(
                 && (string)annotation.Value != ownership.PrincipalEntityType.GetTableName())
             {
                 foreach (var property in entityType.GetProperties()
-                    .Except(entityType.FindPrimaryKey().Properties)
+                    .Except(entityType.FindPrimaryKey()!.Properties)
                     .Where(p => p.Builder.CanSetColumnName(null)))
                 {
                     RewriteColumnName(property.Builder);
@@ -271,7 +276,7 @@ public void ProcessModelFinalizing(IConventionModelBuilder modelBuilder, IConven
 
                         if (property.GetColumnNameConfigurationSource(identifier.Value) == ConfigurationSource.Convention)
                         {
-                            columnName = property.GetColumnName(identifier.Value);
+                            columnName = property.GetColumnName(identifier.Value)!;
                             if (columnName.StartsWith(entityType.ShortName() + '_', StringComparison.Ordinal))
                             {
                                 property.Builder.HasColumnName(
@@ -314,7 +319,7 @@ private void RewriteColumnName(IConventionPropertyBuilder propertyBuilder)
                     if (name == "Id")
                         name = entityType.GetTableName() + name;
                     propertyBuilder.HasColumnName(
-                        RewriteName(name), identifier.Value);
+                        RewriteName(name!), identifier.Value);
                 }
             }
         }

diff --git a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
@@ -2,7 +2,6 @@
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Foam;
 using Content.Shared.Inventory;
@@ -51,7 +50,7 @@ protected override void ReactWithEntity(IEntity entity, double solutionFraction)
                         slot == EquipmentSlotDefines.Slots.IDCARD)
                         continue;
 
-                    if (inventory.TryGetSlotItem(slot, out ItemComponent _))
+                    if (inventory.TryGetSlotItem(slot, out ItemComponent? _))
                         protection += 0.025f;
                 }
             }

diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server\</OutputPath>

diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
@@ -93,6 +93,11 @@ private static async Task DeleteCharacterSlot(ServerDbContext db, NetUserId user
                 .Where(p => p.Preference.UserId == userId.UserId && p.Slot == slot)
                 .SingleOrDefaultAsync();
 
+            if (profile == null)
+            {
+                return;
+            }
+
             db.Profile.Remove(profile);
         }
 

diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
@@ -5,7 +5,6 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Shared;
 using Content.Shared.CCVar;
 using Content.Shared.Preferences;
 using Microsoft.Data.Sqlite;
@@ -382,8 +381,8 @@ public MSLogger(ISawmill sawmill)
                 _sawmill = sawmill;
             }
 
-            public void Log<TState>(MSLogLevel logLevel, EventId eventId, TState state, Exception exception,
-                Func<TState, Exception, string> formatter)
+            public void Log<TState>(MSLogLevel logLevel, EventId eventId, TState state, Exception? exception,
+                Func<TState, Exception?, string> formatter)
             {
                 var lvl = logLevel switch
                 {

diff --git a/Content.Server/Inventory/InventoryHelpers.cs b/Content.Server/Inventory/InventoryHelpers.cs
@@ -19,7 +19,7 @@ public static bool SpawnItemInSlot(this InventoryComponent inventory, Slots slot
                 return false;
 
             // If we don't have that slot or there's already an item there, we do nothing.
-            if (!inventory.HasSlot(slot) || inventory.TryGetSlotItem(slot, out ItemComponent _))
+            if (!inventory.HasSlot(slot) || inventory.TryGetSlotItem(slot, out ItemComponent? _))
                 return false;
 
             // If the prototype in question doesn't exist, we do nothing.

diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs
@@ -178,7 +178,7 @@ bool Check()
                 if (!inventory.HasSlot(slot))
                     return false;
 
-                if (inventory.TryGetSlotItem(slot, out ItemComponent _))
+                if (inventory.TryGetSlotItem(slot, out ItemComponent? _))
                 {
                     user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-occupied",("owner", Owner)));
                     return false;
@@ -403,7 +403,7 @@ private void HandleUserInterfaceMessage(ServerBoundUserInterfaceMessage obj)
 
                     if (Owner.TryGetComponent<InventoryComponent>(out var inventory))
                     {
-                        if (inventory.TryGetSlotItem(inventoryMessage.Slot, out ItemComponent _))
+                        if (inventory.TryGetSlotItem(inventoryMessage.Slot, out ItemComponent? _))
                             placingItem = false;
 
                         if (placingItem)

diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <Configurations>Release;Debug</Configurations>

diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Tests\</OutputPath>

diff --git a/Content.Tools/Content.Tools.csproj b/Content.Tools/Content.Tools.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Content.YAMLLinter/Content.YAMLLinter.csproj b/Content.YAMLLinter/Content.YAMLLinter.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
         <OutputPath>..\bin\Content.YAMLLinter\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>

diff --git a/Pow3r/Pow3r.csproj b/Pow3r/Pow3r.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 

diff --git a/RobustToolbox b/RobustToolbox
+1 −1		.github/workflows/build-test.yml
+1 −1		.github/workflows/codeql-analysis.yml
+1 −1		.github/workflows/publish-client.yml
+2 −2		.github/workflows/test-content.yml
+2 −2		MSBuild/Robust.Engine.props
+1 −1		MSBuild/Robust.Properties.targets
+4 −2		Robust.Client/Player/LocalPlayer.cs
+1 −1		Robust.Client/Robust.Client.csproj
+6 −6		Robust.Server/Console/Commands/TestbedCommand.cs
+23 −21		Robust.Server/GameObjects/EntitySystems/ActorSystem.cs
+7 −10		Robust.Server/GameObjects/EntitySystems/ViewSubscriberSystem.cs
+3 −3		Robust.Server/GameStates/PVSSystem.cs
+8 −0		Robust.Server/Player/IPlayerSession.cs
+13 −4		Robust.Server/Player/PlayerSession.cs
+1 −1		Robust.Server/ServerStatus/StatusHost.cs
+3 −0		Robust.Shared/ContentPack/Sandbox.yml
+1 −1		Robust.Shared/GameObjects/Component.cs
+5 −0		Robust.Shared/GameObjects/Components/MetaDataComponent.cs
+4 −75		Robust.Shared/GameObjects/Entity.cs
+68 −5		Robust.Shared/GameObjects/EntityManager.Components.cs
+10 −6		Robust.Shared/GameObjects/EntityManager.cs
+10 −0		Robust.Shared/GameObjects/IEntityManager.Components.cs
+6 −6		Robust.Shared/Map/MapManager.cs
+2 −2		Robust.Shared/Network/NetManager.ServerAuth.cs
+3 −6		Robust.Shared/Serialization/RobustMappedStringSerializer.MappedStringDict.cs
+12 −3		Robust.Shared/Utility/StreamExt.cs
+2 −2		Robust.UnitTesting/Client/UserInterface/StylesheetTest.cs
+1 −1		Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
+1 −1		Robust.UnitTesting/Shared/Map/MapManager_Tests.cs