Version: 167.0.2

(cherry picked from commit 6211cf2e03)

.editorconfig

@@ -7,23 +7,8 @@ indent_size = 4
 trim_trailing_whitespace = true
 charset = utf-8
 
-max_line_length = 120
-
-# ReSharper properties
-resharper_csharp_max_line_length = 120
-resharper_csharp_wrap_after_declaration_lpar = true
-resharper_csharp_wrap_arguments_style = chop_if_long
-resharper_csharp_wrap_parameters_style = chop_if_long
-resharper_keep_existing_attribute_arrangement = true
-resharper_place_field_attribute_on_same_line = if_owner_is_single_line
-resharper_wrap_chained_binary_patterns = chop_if_long
-resharper_wrap_chained_method_calls = chop_if_long
-
 [*.{csproj,xml,yml,dll.config,targets,props}]
 indent_size = 2
 
-[nuget.config]
-indent_size = 2
-
 [*.gdsl]
 indent_style = tab

.github/CODEOWNERS

@@ -7,6 +7,3 @@
 **/Toolshed/** @moonheart08
 *Command.cs @moonheart08
 *Commands.cs @moonheart08
-
-# Physics
-**/Robust.Shared/Physics/** @metalgearsloth

.github/workflows/build-docfx.yml

@@ -5,30 +5,30 @@ on:
     - cron: "0 0 * * 0"
 jobs:
   docfx:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+   runs-on: ubuntu-latest
+   steps:
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
 
-      - name: Install dependencies
-        run: dotnet restore
+    - name: Install dependencies
+      run: dotnet restore
 
-      - name: Build Project
-        run: dotnet build --no-restore /p:WarningsAsErrors=nullable
+    - name: Build Project
+      run: dotnet build --no-restore /p:WarningsAsErrors=nullable
 
-      - name: Build DocFX
-        uses: nikeee/docfx-action@v1.0.0
-        with:
-          args: Robust.Docfx/docfx.json
+    - name: Build DocFX
+      uses: nikeee/docfx-action@v1.0.0
+      with:
+        args: Robust.Docfx/docfx.json
 
-      - name: Publish Docfx Documentation on GitHub Pages
-        uses: maxheld83/ghpages@master
-        env:
-          BUILD_DIR: Robust.Docfx/_robust-site
-          GH_PAT: ${{ secrets.GH_PAT }}
+    - name: Publish Docfx Documentation on GitHub Pages
+      uses: maxheld83/ghpages@master
+      env:
+        BUILD_DIR: Robust.Docfx/_robust-site
+        GH_PAT: ${{ secrets.GH_PAT }}

.github/workflows/build-test.yml

@@ -2,32 +2,32 @@ name: Build & Test
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest] # , macos-latest] - temporarily disabled due to libfreetype.dll errors.
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore /p:WarningsAsErrors=nullable
+    - name: Test Engine
+      run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
+
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --no-restore /p:WarningsAsErrors=nullable
-      - name: Robust.UnitTesting
-        run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
-      - name: Robust.Analyzers.Tests
-        run: dotnet test --no-build Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj -- NUnit.ConsoleOut=0

.github/workflows/codeql-analysis.yml

@@ -11,8 +11,14 @@
 #
 name: "CodeQL"
 
-on:
-  workflow_dispatch
+#on:
+#  push:
+#    branches: [ master ]
+#  pull_request:
+#    # The branches below must be a subset of the branches above
+#    branches: [ master ]
+#  schedule:
+#    - cron: '30 18 * * 6'
 
 jobs:
   analyze:
@@ -22,50 +28,50 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["csharp"]
+        language: [ 'csharp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - name: Checkout repository
+      uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 7.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
 
-      - name: Build
-        run: dotnet build
+    - name: Build
+      run: dotnet build
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
 
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-      #- run: |
-      #   make bootstrap
-      #   make release
+    #- run: |
+    #   make bootstrap
+    #   make release
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/publish-client.yml

@@ -3,50 +3,51 @@
 on:
   push:
     tags:
-      - "v*"
+    - 'v*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Parse version
-        id: parse_version
-        shell: pwsh
-        run: |
-          $ver = [regex]::Match($env:GITHUB_REF, "refs/tags/v?(.+)").Groups[1].Value
-          echo ("::set-output name=version::{0}" -f $ver)
+    - name: Parse version
+      id: parse_version
+      shell: pwsh
+      run: |
+        $ver = [regex]::Match($env:GITHUB_REF, "refs/tags/v?(.+)").Groups[1].Value
+        echo ("::set-output name=version::{0}" -f $ver)
 
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
 
-      - name: Package client
-        run: Tools/package_client_build.py -p windows mac linux
+    - name: Package client
+      run: Tools/package_client_build.py -p windows mac linux
 
-      - name: Shuffle files around
-        run: |
-          mkdir "release/${{ steps.parse_version.outputs.version }}"
-          mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
+    - name: Shuffle files around
+      run: |
+        mkdir "release/${{ steps.parse_version.outputs.version }}"
+        mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
 
-      - name: Upload files to Suns
-        uses: appleboy/scp-action@master
-        with:
-          host: suns.spacestation14.com
-          username: robust-build-push
-          key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
-          source: "release/${{ steps.parse_version.outputs.version }}"
-          target: "/var/lib/robust-builds/builds/"
-          strip_components: 1
+    - name: Upload files to centcomm
+      uses: appleboy/scp-action@master
+      with:
+        host: centcomm.spacestation14.io
+        username: robust-build-push
+        key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
+        source: "release/${{ steps.parse_version.outputs.version }}"
+        target: "/var/lib/robust-builds/builds/"
+        strip_components: 1
+
+    - name: Update manifest JSON
+      uses: appleboy/ssh-action@master
+      with:
+        host: centcomm.spacestation14.io
+        username: robust-build-push
+        key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
+        script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}
 
-      - name: Update manifest JSON
-        uses: appleboy/ssh-action@master
-        with:
-          host: suns.spacestation14.com
-          username: robust-build-push
-          key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
-          script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}

.github/workflows/test-content.yml

@@ -2,39 +2,40 @@ name: Test content master against engine
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out content
-        uses: actions/checkout@v4.2.2
-        with:
-          repository: space-wizards/space-station-14
-          submodules: recursive
+    - name: Check out content
+      uses: actions/checkout@v3.6.0
+      with:
+        repository: space-wizards/space-station-14
+        submodules: recursive
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
-      - name: Disable submodule autoupdate
-        run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
+    - name: Disable submodule autoupdate
+      run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 
-      - name: Check out engine version
-        run: |
-          cd RobustToolbox
-          git fetch origin ${{ github.sha }}
-          git checkout FETCH_HEAD
-          git submodule update --init --recursive
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --configuration Tools --no-restore
-      - name: Content.Tests
-        run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
-      - name: Content.IntegrationTests
-        run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n
+    - name: Check out engine version
+      run: |
+        cd RobustToolbox
+        git fetch origin ${{ github.sha }}
+        git checkout FETCH_HEAD
+        git submodule update --init --recursive
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Tools --no-restore
+    - name: Content.Tests
+      run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
+    - name: Content.IntegrationTests
+      run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n

Directory.Packages.props

@@ -1,78 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!--
-    We actually set ManagePackageVersionsCentrally manually in another import file.
-    Since .NET SDK 8.0.300, ManagePackageVersionsCentrally is automatically set if Directory.Packages.props exists.
-    https://github.com/NuGet/NuGet.Client/pull/5572
-    We actively negate this here, as we have some packages in tree we don't want such automatic behavior for.
-    We use Directory.Build.props to get copy the state *after* our MSBuild config but before Nuget's config.
-    -->
-    <ManagePackageVersionsCentrally />
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
-    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.8" />
-    <PackageVersion Include="Linguini.Bundle" Version="0.8.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.12.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24059.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.ILVerification" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="NUnit" Version="4.3.2" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.5.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="Nett" Version="0.15.0" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
-    <PackageVersion Include="OpenTK.OpenAL" Version="4.7.7" />
-    <PackageVersion Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" />
-    <PackageVersion Include="Pidgin" Version="3.3.0" />
-    <PackageVersion Include="Robust.Natives" Version="0.1.1" />
-    <PackageVersion Include="Robust.Natives.Cef" Version="131.3.5" />
-    <PackageVersion Include="Robust.Shared.AuthLib" Version="0.1.2" />
-    <PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
-    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
-    <PackageVersion Include="Serilog" Version="4.2.0" />
-    <PackageVersion Include="Serilog.Sinks.Loki" Version="4.0.0-beta3" />
-    <PackageVersion Include="SharpZstd.Interop" Version="1.5.2-beta2" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.7" />
-    <PackageVersion Include="SpaceWizards.HttpListener" Version="0.1.1" />
-    <PackageVersion Include="SpaceWizards.NFluidsynth" Version="0.2.2" />
-    <PackageVersion Include="SpaceWizards.SharpFont" Version="1.0.2" />
-    <PackageVersion Include="SpaceWizards.Sodium" Version="0.2.1" />
-    <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.26100.1" />
-    <PackageVersion Include="TerraFX.Interop.Xlib" Version="6.4.0" />
-    <PackageVersion Include="VorbisPizza" Version="1.3.0" />
-    <PackageVersion Include="YamlDotNet" Version="16.3.0" />
-    <PackageVersion Include="prometheus-net" Version="8.2.1" />
-    <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
-    <PackageVersion Include="PolySharp" Version="1.15.0" />
-
-    <!-- Transitive deps that we need to pin versions for to avoid NuGet warnings. -->
-    <PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
-    <PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0" />
-  </ItemGroup>
-</Project>

Lidgren.Network/CursedHorrorsBeyondOurWildestImagination.cs

@@ -1,9 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// So I wanted to mess with NetIncomingMessage and NetOutgoingMessage from tests.
-// Now.. the instructors are internal...
-// Unless...
-// I mean we have this project here from the weird way we're compiling Lidgren.
-// I could just put this in here... it wouldn't touch the main Lidgren repo at all...
-[assembly: InternalsVisibleTo("Robust.UnitTesting")]
-

Lidgren.Network/Lidgren.Network.csproj

@@ -10,14 +10,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
     <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
-
-    <Nullable>enable</Nullable>
-    <LangVersion>13.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="CursedHorrorsBeyondOurWildestImagination.cs" />
-
     <Compile Include="Lidgren.Network\Lidgren.Network\**\*.cs">
      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
 
-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->
 

MSBuild/Robust.Engine.props

@@ -1,8 +1,8 @@
 <Project>
     <!-- Engine-specific properties. Content should not use this file. -->
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
-        <LangVersion>13</LangVersion>
+        <TargetFramework>net7.0</TargetFramework>
+        <LangVersion>11</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>

MSBuild/Robust.Properties.targets

@@ -3,8 +3,7 @@
   <!-- Import this at the end of any project files in Robust and Content. -->
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <Import Project="Robust.Custom.targets" Condition="Exists('Robust.Custom.targets')"/>
@@ -28,5 +27,5 @@
   <Import Project="Robust.Analyzers.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
 
   <!-- serialization generator -->
-  <Import Project="Robust.Serialization.Generator.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
+  <Import Project="Robust.Serialization.Generator.targets" />
 </Project>

MSBuild/XamlIL.targets

@@ -24,16 +24,12 @@
     <RobustInjectorsConfiguration>$(Configuration)</RobustInjectorsConfiguration>
     <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'DebugOpt'">Debug</RobustInjectorsConfiguration>
     <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'Tools'">Release</RobustInjectorsConfiguration>
-    <RobustInjectorsConfiguration Condition="'$(UseArtifactsOutput)' == 'true' And '$(RuntimeIdentifier)' != ''">$(RobustInjectorsConfiguration)_$(RuntimeIdentifier)</RobustInjectorsConfiguration>
-    <RobustInjectorsConfiguration Condition="'$(UseArtifactsOutput)' == 'true'">$(RobustInjectorsConfiguration.ToLower())</RobustInjectorsConfiguration>
-    <CompileRobustXamlTaskAssemblyFile Condition="'$(UseArtifactsOutput)' != 'true'">$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll</CompileRobustXamlTaskAssemblyFile>
-    <CompileRobustXamlTaskAssemblyFile Condition="'$(UseArtifactsOutput)' == 'true'">$(MSBuildThisFileDirectory)\..\..\artifacts\bin\Robust.Client.Injectors\$(RobustInjectorsConfiguration)\Robust.Client.Injectors.dll</CompileRobustXamlTaskAssemblyFile>
   </PropertyGroup>
 
   <UsingTask
     Condition="'$(_RobustUseExternalMSBuild)' != 'true' And $(DesignTimeBuild) != true"
     TaskName="CompileRobustXamlTask"
-    AssemblyFile="$(CompileRobustXamlTaskAssemblyFile)"/>
+    AssemblyFile="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll"/>
   <Target
     Name="CompileRobustXaml"
     Condition="Exists('@(IntermediateAssembly)')"

OpenToolkit.GraphicsLibraryFramework/GLFWException.cs

@@ -61,5 +61,18 @@ namespace OpenToolkit.GraphicsLibraryFramework
             : base(message, innerException)
         {
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GLFWException"/> class with the specified context
+        /// and the serialization information.
+        /// </summary>
+        /// <param name="info">The <see cref="SerializationInfo"/> associated with this exception.</param>
+        /// <param name="context">
+        /// A <see cref="StreamingContext"/> that represents the context of this exception.
+        /// </param>
+        protected GLFWException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }

Resources/EnginePrototypes/Audio/audio_entities.yml

@@ -1,8 +0,0 @@
-- type: entity
-  id: Audio
-  name: Audio
-  description: Audio entity used by engine
-  save: false
-  components:
-    - type: Transform
-      gridTraversal: false

Resources/EnginePrototypes/Debug/rotation.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: debugRotation
   abstract: true
-  categories: [ Debug ]
+  categories: [ debug ]
   components:
   - type: Sprite
     netsync: false

Resources/EnginePrototypes/Shaders/stockshaders.yml

@@ -4,12 +4,6 @@
   kind: canvas
   light_mode: unshaded
 
-# Simple mix blend
-- type: shader
-  id: Mix
-  kind: canvas
-  blend_mode: Mix
-
 - type: shader
   id: shaded
   kind: canvas
@@ -18,8 +12,3 @@
   id: bgra
   kind: source
   path: "/Shaders/Internal/bgra.swsl"
-
-- type: shader
-  id: ColorPicker
-  kind: source
-  path: "/Shaders/color_picker.swsl"

Resources/EnginePrototypes/entityCategory.yml

@@ -1,26 +1,17 @@
 # debug related entities
 - type: entityCategory
-  id: Debug
+  id: debug
   name: entity-category-name-debug
   description: entity-category-desc-debug
-  suffix: entity-category-suffix-debug
 
 # entities that spawn other entities
 - type: entityCategory
-  id: Spawner
+  id: spawner
   name: entity-category-name-spawner
   description: entity-category-desc-spawner
 
-# simple category that just exists to hide prototypes in spawn menus
+# entities that should be hidden from the spawn menu
 - type: entityCategory
-  id: HideSpawnMenu
+  id: hideSpawnMenu
   name: entity-category-name-hide
   description: entity-category-desc-hide
-  hideSpawnMenu: true
-  inheritable: false
-
-# Entity prototypes added by the fork. With CVar you can hide all entities without this category
-- type: entityCategory
-  id: ForkFiltered
-  name: entity-category-name-fork
-  description: entity-category-desc-fork

Resources/Locale/en-US/_engine_lib.ftl

@@ -20,15 +20,6 @@ zzzz-object-pronoun = { GENDER($ent) ->
    *[neuter] it
    }
 
-# Used internally by the DAT-OBJ() function.
-# Not used in en-US. Created for supporting other languages.
-zzzz-dat-object = { GENDER($ent) ->
-    [male] him
-    [female] her
-    [epicene] them
-   *[neuter] it
-   }
-
 # Used internally by the POSS-PRONOUN() function.
 zzzz-possessive-pronoun = { GENDER($ent) ->
     [male] his

Resources/Locale/en-US/commands.ftl

@@ -9,11 +9,7 @@ cmd-parse-failure-float = {$arg} is not a valid float.
 cmd-parse-failure-bool = {$arg} is not a valid bool.
 cmd-parse-failure-uid = {$arg} is not a valid entity UID.
 cmd-parse-failure-mapid = {$arg} is not a valid MapId.
-cmd-parse-failure-enum = {$arg} is not a {$enum} Enum.
-cmd-parse-failure-grid = {$arg} is not a valid grid.
-cmd-parse-failure-cultureinfo = "{$arg}" is not valid CultureInfo.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
-cmd-parse-failure-session = There is no session with username: {$username}
 
 cmd-error-file-not-found = Could not find file: {$file}.
 cmd-error-dir-not-found = Could not find directory: {$dir}.
@@ -21,15 +17,15 @@ cmd-error-dir-not-found = Could not find directory: {$dir}.
 cmd-failure-no-attached-entity = There is no entity attached to this shell.
 
 ## 'help' command
-cmd-help-desc = Display general help or help text for a specific command
-cmd-help-help = Usage: help [command name]
+cmd-oldhelp-desc = Display general help or help text for a specific command
+cmd-oldhelp-help = Usage: help [command name]
     When no command name is provided, displays general-purpose help text. If a command name is provided, displays help text for that command.
 
-cmd-help-no-args = To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'. To search for commands, use 'list <filter>'.
-cmd-help-unknown = Unknown command: { $command }
-cmd-help-top = { $command } - { $description }
-cmd-help-invalid-args = Invalid amount of arguments.
-cmd-help-arg-cmdname = [command name]
+cmd-oldhelp-no-args = To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'. To search for commands, use 'list <filter>'.
+cmd-oldhelp-unknown = Unknown command: { $command }
+cmd-oldhelp-top = { $command } - { $description }
+cmd-oldhelp-invalid-args = Invalid amount of arguments.
+cmd-oldhelp-arg-cmdname = [command name]
 
 ## 'cvar' command
 cmd-cvar-desc = Gets or sets a CVar.
@@ -45,13 +41,6 @@ cmd-cvar-compl-list = List available CVars
 cmd-cvar-arg-name = <name | ?>
 cmd-cvar-value-hidden = <value hidden>
 
-## 'cvar_subs' command
-cmd-cvar_subs-desc = Lists the OnValueChanged subscriptions for a CVar.
-cmd-cvar_subs-help = Usage: cvar_subs <name>
-
-cmd-cvar_subs-invalid-args = Must provide exactly one argument.
-cmd-cvar_subs-arg-name = <name>
-
 ## 'list' command
 cmd-list-desc = Lists available commands, with optional search filter
 cmd-list-help = Usage: list [filter]
@@ -157,7 +146,6 @@ cmd-savemap-not-exist = Target map does not exist.
 cmd-savemap-init-warning = Attempted to save a post-init map without forcing the save.
 cmd-savemap-attempt = Attempting to save map {$mapId} to {$path}.
 cmd-savemap-success = Map successfully saved.
-cmd-savemap-error = Could not save map! See server log for details.
 cmd-hint-savemap-id = <MapID>
 cmd-hint-savemap-path = <Path>
 cmd-hint-savemap-force = [bool]
@@ -255,6 +243,9 @@ cmd-bind-arg-command = <InputCommand>
 cmd-net-draw-interp-desc = Toggles the debug drawing of the network interpolation.
 cmd-net-draw-interp-help = Usage: net_draw_interp
 
+cmd-net-draw-interp-desc = Toggles the debug drawing of the network interpolation.
+cmd-net-draw-interp-help = Usage: net_draw_interp
+
 cmd-net-watch-ent-desc = Dumps all network updates for an EntityId to the console.
 cmd-net-watch-ent-help = Usage: net_watchent <0|EntityUid>
 
@@ -295,7 +286,7 @@ cmd-lsgrid-desc = Lists grids.
 cmd-lsgrid-help = lsgrid
 
 cmd-addmap-desc = Adds a new empty map to the round. If the mapID already exists, this command does nothing.
-cmd-addmap-help = addmap <mapID> [pre-init]
+cmd-addmap-help = addmap <mapID> [initialize]
 
 cmd-rmmap-desc = Removes a map from the world. You cannot remove nullspace.
 cmd-rmmap-help = rmmap <mapId>
@@ -306,9 +297,16 @@ cmd-savegrid-help = savegrid <gridID> <Path>
 cmd-testbed-desc = Loads a physics testbed on the specified map.
 cmd-testbed-help = testbed <mapid> <test>
 
+cmd-saveconfig-desc = Saves the client configuration to the config file.
+cmd-saveconfig-help = saveconfig
+
 ## 'flushcookies' command
 # Note: the flushcookies command is from Robust.Client.WebView, it's not in the main engine code.
 
+cmd-flushcookies-desc = Flush CEF cookie storage to disk
+cmd-flushcookies-help = This ensure cookies are properly saved to disk in the event of unclean shutdowns.
+    Note that the actual operation is asynchronous.
+
 ## 'addcomp' command
 cmd-addcomp-desc = Adds a component to an entity.
 cmd-addcomp-help = addcomp <uid> <componentName>
@@ -384,9 +382,9 @@ cmd-tp-desc = Teleports a player to any location in the round.
 cmd-tp-help = tp <x> <y> [<mapID>]
 
 cmd-tpto-desc = Teleports the current player or the specified players/entities to the location of the first player/entity.
-cmd-tpto-help = tpto <username|uid> [username|NetEntity]...
-cmd-tpto-destination-hint = destination (NetEntity or username)
-cmd-tpto-victim-hint = entity to teleport (NetEntity or username)
+cmd-tpto-help = tpto <username|uid> [username|uid]...
+cmd-tpto-destination-hint = destination (uid or username)
+cmd-tpto-victim-hint = entity to teleport (uid or username)
 cmd-tpto-parse-error = Cant resolve entity or player: {$str}
 
 cmd-listplayers-desc = Lists all players currently connected.
@@ -429,20 +427,11 @@ cmd-entfo-help = Usage: entfo <entityuid>
     The entity UID can be prefixed with 'c' to convert it to a client entity UID.
 
 cmd-fuck-desc = Throws an exception
-cmd-fuck-help = Usage: fuck
+cmd-fuck-help = Throws an exception
 
-cmd-showpos-desc = Show the position of all entities on the screen.
+cmd-showpos-desc = Enables debug drawing over all entity positions in the game.
 cmd-showpos-help = Usage: showpos
 
-cmd-showrot-desc = Show the rotation of all entities on the screen.
-cmd-showrot-help = Usage: showrot
-
-cmd-showvel-desc = Show the local velocity of all entites on the screen.
-cmd-showvel-help = Usage: showvel
-
-cmd-showangvel-desc = Show the angular velocity of all entities on the screen.
-cmd-showangvel-help = Usage: showangvel
-
 cmd-sggcell-desc = Lists entities on a snap grid cell.
 cmd-sggcell-help = Usage: sggcell <gridID> <vector2i>\nThat vector2i param is in the form x<int>,y<int>.
 
@@ -455,6 +444,9 @@ cmd-showanchored-help = Usage: showanchored
 cmd-dmetamem-desc = Dumps a type's members in a format suitable for the sandbox configuration file.
 cmd-dmetamem-help = Usage: dmetamem <type>
 
+cmd-dmetamem-desc = Displays chunk bounds for the purposes of rendering.
+cmd-dmetamem-help = Usage: showchunkbb <type>
+
 cmd-launchauth-desc = Load authentication tokens from launcher data to aid in testing of live servers.
 cmd-launchauth-help = Usage: launchauth <account name>
 
@@ -497,7 +489,7 @@ cmd-net_entityreport-help = Usage: net_entityreport
 cmd-net_refresh-desc = Requests a full server state.
 cmd-net_refresh-help = Usage: net_refresh
 
-cmd-net_graph-desc = Toggles the net statistics panel.
+cmd-net_graph-desc = Toggles the net statistics pannel.
 cmd-net_graph-help = Usage: net_graph
 
 cmd-net_watchent-desc = Dumps all network updates for an EntityId to the console.
@@ -521,6 +513,9 @@ cmd-profsnap-help = Usage: profsnap
 cmd-devwindow-desc = Dev Window
 cmd-devwindow-help = Usage: devwindow
 
+cmd-devwindow-desc = Open file
+cmd-devwindow-help = Usage: testopenfile
+
 cmd-scene-desc = Immediately changes the UI scene/state.
 cmd-scene-help = Usage: scene <className>
 
@@ -531,11 +526,14 @@ cmd-hwid-desc = Returns the current HWID (HardWare ID).
 cmd-hwid-help = Usage: hwid
 
 cmd-vvread-desc = Retrieve a path's value using VV (View Variables).
-cmd-vvread-help = Usage: vvread <path>
+cmd-vvread-desc = Usage: vvread <path>
 
 cmd-vvwrite-desc = Modify a path's value using VV (View Variables).
 cmd-vvwrite-help = Usage: vvwrite <path>
 
+cmd-vv-desc = Opens View Variables (VV).
+cmd-vv-help = Usage: vv <path|entity ID|guihover>
+
 cmd-vvinvoke-desc = Invoke/Call a path with arguments using VV.
 cmd-vvinvoke-help = Usage: vvinvoke <path> [arguments...]
 
@@ -563,18 +561,3 @@ cmd-vfs_ls-hint-path = <path>
 
 cmd-reloadtiletextures-desc = Reloads the tile texture atlas to allow hot reloading tile sprites
 cmd-reloadtiletextures-help = Usage: reloadtiletextures
-
-cmd-audio_length-desc = Shows the length of an audio file
-cmd-audio_length-help = Usage: audio_length { cmd-audio_length-arg-file-name }
-cmd-audio_length-arg-file-name = <file name>
-
-## PVS
-cmd-pvs-override-info-desc = Prints information about any PVS overrides associated with an entity.
-cmd-pvs-override-info-empty = Entity {$nuid} has no PVS overrides.
-cmd-pvs-override-info-global = Entity {$nuid} has a global override.
-cmd-pvs-override-info-clients = Entity {$nuid} has a session override for {$clients}.
-
-cmd-localization_set_culture-desc = Set DefaultCulture for the client LocalizationManager
-cmd-localization_set_culture-help = Usage: localization_set_culture <cultureName>
-cmd-localization_set_culture-culture-name = <cultureName>
-cmd-localization_set_culture-changed = Localization changed to { $code } ({ $nativeName } / { $englishName })

Resources/Locale/en-US/custom-controls.ftl

@@ -4,20 +4,9 @@ entity-spawn-window-title = Entity Spawn Panel
 entity-spawn-window-search-bar-placeholder = search
 entity-spawn-window-clear-button = Clear
 entity-spawn-window-replace-button-text = Replace
+entity-spawn-window-erase-button-text = Erase Mode
 entity-spawn-window-override-menu-tooltip = Override placement
 
-## TileSpawnWindow
-
-tile-spawn-window-title = Place Tiles
-
 ## Console
 
 console-line-edit-placeholder = Command Here
-
-## OutputPanel
-
-output-panel-scroll-down-button-text = Scroll Down
-
-## Common Used
-
-window-erase-button-text = Erase Mode

Resources/Locale/en-US/entity-category.ftl

@@ -1,12 +1,8 @@
 entity-category-name-debug = Debug
 entity-category-desc-debug = Entity prototypes intended for debugging & testing.
-entity-category-suffix-debug = Debug
 
 entity-category-name-spawner = Spawner
 entity-category-desc-spawner = Entity prototypes that spawn other entities.
 
 entity-category-name-hide = Hidden
-entity-category-desc-hide = Entity prototypes that should be hidden from entity spawn menus
-
-entity-category-name-fork = Fork Filtered
-entity-category-desc-fork = Entity prototypes added by the fork. With CVar you can hide all entities without this category
+entity-category-desc-hide = Entity prototypes that should be hidden from the spawn menu

Resources/Locale/en-US/physics/grid_merging.ftl

@@ -1,8 +0,0 @@
-cmd-merge_grids-desc = Combines 2 grids into 1 grid
-cmd-merge_grids-help = merge_grids <gridUid1> <gridUid2> <offsetX> <offsetY> [angle]
-
-cmd-merge_grids-hintA = Grid A
-cmd-merge_grids-hintB = Grid B
-cmd-merge_grids-xOffset = X offset
-cmd-merge_grids-yOffset = Y offset
-cmd-merge_grids-angle = [Angle]

Resources/Locale/en-US/toolshed-commands.ftl

@@ -1,8 +1,4 @@
-command-help-usage =
-    Usage:
-command-help-invertible =
-    The behaviour of this command can be inverted using the "not" prefix.
-command-description-tpto =
+command-description-tpto =
     Teleport the given entities to some target entity.
 command-description-player-list =
     Returns a list of all player sessions.
@@ -23,7 +19,7 @@ command-description-buildinfo =
 command-description-cmd-list =
     Returns a list of all commands, for this side.
 command-description-explain =
-    Explains the given expression, providing command descriptions and signatures. This only works for valid expressions, it can't explain commands that it fails to parse.
+    Explains the given expression, providing command descriptions and signatures.
 command-description-search =
     Searches through the input for the provided value.
 command-description-stopwatch =
@@ -42,7 +38,8 @@ command-description-as =
 command-description-count =
     Counts the amount of entries in it's input, returning an integer.
 command-description-map =
-    Maps the input over the given block.
+    Maps the input over the given block, with the provided expected return type.
+    This command may be modified to not need an explicit return type in the future.
 command-description-select =
     Selects N objects or N% of objects from the input.
     One can additionally invert this command with not to make it select everything except N objects instead.
@@ -56,8 +53,10 @@ command-description-entities =
     Returns all entities on the server.
 command-description-paused =
     Filters the input entities by whether or not they are paused.
+    This command can be inverted with not.
 command-description-with =
     Filters the input entities by whether or not they have the given component.
+    This command can be inverted with not.
 command-description-fuck =
     Throws an exception.
 command-description-ecscomp-listty =
@@ -71,9 +70,9 @@ command-description-ls-in =
 command-description-methods-get =
     Returns all methods associated with the input type.
 command-description-methods-overrides =
-    Returns all methods overridden on the input type.
+    Returns all methods overriden on the input type.
 command-description-methods-overridesfrom =
-    Returns all methods overridden from the given type on the input type.
+    Returns all methods overriden from the given type on the input type.
 command-description-cmd-moo =
     Asks the important questions.
 command-description-cmd-descloc =
@@ -96,8 +95,6 @@ command-description-vars =
     Provides a list of all variables set in this session.
 command-description-any =
     Returns true if there's any values in the input, otherwise false.
-command-description-contains =
-    Returns whether the input enumerable contains the specified value.
 command-description-ArrowCommand =
     Assigns the input to a variable.
 command-description-isempty =
@@ -122,8 +119,6 @@ command-description-splat =
     "Splats" a block, value, or variable, creating N copies of it in a list.
 command-description-val =
     Casts the given value, block, or variable to the given type. This is mostly a workaround for current limitations of variables.
-command-description-var =
-    Returns the contents of the given variable. This will attempt to automatically infer a variables type. Compound commands that modify a variable may need to use the 'val' command instead.
 command-description-actor-controlled =
     Filters entities by whether or not they're actively controlled.
 command-description-actor-session =
@@ -148,7 +143,7 @@ command-description-max =
     Returns the maximum of two values.
 command-description-BitAndCommand =
     Performs bitwise AND.
-command-description-bitor =
+command-description-BitOrCommand =
     Performs bitwise OR.
 command-description-BitXorCommand =
     Performs bitwise XOR.
@@ -202,11 +197,11 @@ command-description-mappos =
 command-description-pos =
     Returns an entity's coordinates.
 command-description-tp-coords =
-    Teleports the given entities to the target coordinates.
+    Teleports the target to the given coordinates.
 command-description-tp-to =
-    Teleports the given entities to the target entity.
+    Teleports the target to the given other entity.
 command-description-tp-into =
-    Teleports the given entities "into" the target entity, attaching it at (0 0) relative to it.
+    Teleports the target "into" the given other entity, attaching it at (0 0) relative to it.
 command-description-comp-get =
     Gets the given component from the given entity.
 command-description-comp-add =
@@ -224,9 +219,9 @@ command-description-MulVecCommand =
 command-description-DivVecCommand =
     Divides every element in the input by a scalar (single value).
 command-description-rng-to =
-    Returns a number between the input (inclusive) and the argument (exclusive).
+    Returns a number from its input to its argument (i.e. n..m inclusive)
 command-description-rng-from =
-    Returns a number between the argument (inclusive) and the input (exclusive))
+    Returns a number to its input from its argument (i.e. m..n inclusive)
 command-description-rng-prob =
     Returns a boolean based on the input probability/chance (from 0 to 1)
 command-description-sum =
@@ -276,7 +271,7 @@ command-description-ModVecCommand =
     Performs the modulus operation over the input with the given constant right-hand value.
 command-description-BitAndNotCommand =
     Performs bitwise AND-NOT over the input.
-command-description-bitornot =
+command-description-BitOrNotCommand =
     Performs bitwise OR-NOT over the input.
 command-description-BitXnorCommand =
     Performs bitwise XNOR over the input.
@@ -423,6 +418,6 @@ command-description-tee =
     This essentially lets you have a branch in your code to do multiple operations on one value.
 command-description-cmd-info =
     Returns a CommandSpec for the given command.
-    On its own, this means it'll print the command's help message.
+    On it's own, this means it'll print the comamnd's help message.
 command-description-comp-rm =
     Removes the given component from the entity.

Resources/Locale/en-US/userinterface.ftl

@@ -1,2 +0,0 @@
-popup-copy-button = Copy
-popup-title = Alert!

Resources/Locale/en-US/view-variables.ftl

@@ -10,18 +10,3 @@ view-variable-instance-entity-client-components-search-bar-placeholder = Search
 view-variable-instance-entity-server-components-search-bar-placeholder = Search
 view-variable-instance-entity-add-window-server-components = Add Component [S]
 view-variable-instance-entity-add-window-client-components = Add Component [C]
-
-
-## SoundSpecifier
-vv-sound-none = None
-vv-sound-path = Path
-vv-sound-collection = Collection
-
-vv-sound-volume = volume
-vv-sound-pitch = Pitch
-vv-sound-max-distance = Max Distance
-vv-sound-rolloff-factor = Rolloff Factor
-vv-sound-reference-distance = Reference Distance
-vv-sound-loop = Loop
-vv-sound-play-offset = Play Offset (s)
-vv-sound-variation = Pitch variation

Resources/Locale/pt-BR/commands.ftl

@@ -136,7 +136,6 @@ cmd-savemap-not-exist = O mapa de destino não existe.
 cmd-savemap-init-warning = Tentativa de salvar um mapa pós-inicialização sem forçar o salvamento.
 cmd-savemap-attempt = Tentando salvar o mapa {$mapId} em {$path}.
 cmd-savemap-success = Mapa salvo com sucesso.
-cmd-savemap-error = Não foi possível salvar o mapa! Consulte o log do servidor para obter detalhes.
 cmd-hint-savemap-id = <MapID>
 cmd-hint-savemap-path = <Path>
 cmd-hint-savemap-force = [bool]

Resources/Shaders/color_picker.swsl

@@ -1,46 +0,0 @@
-// Simple shader for creating a box with colours varying along the x and y axes.
-
-uniform highp vec2 size;
-uniform highp vec2 offset;
-
-uniform highp vec4 xAxis;
-uniform highp vec4 yAxis;
-uniform highp vec4 baseColor;
-
-uniform bool hsv;
-
-void fragment() 
-{
-    // Calculate local uv coordinates.
-    // I.e., if using this shader to draw a box to the screen, (0,0) is the bottom left of the box.
-    
-    highp float yCoords = 1.0/SCREEN_PIXEL_SIZE.y - FRAGCOORD.y;
-    highp vec2 uv = vec2(FRAGCOORD.x - offset.x,  yCoords - offset.y);
-    uv /= size;
-    uv.y = 1.0 - uv.y;
-    
-    highp vec4 modulate = baseColor + uv.x * xAxis + uv.y * yAxis;
-    
-    if (hsv)
-    {
-        modulate.xyz = hsv2rgb(modulate.xyz);
-    }
-    
-    // The UV used for the texture lookup is the TEXTURE UV coordinate, which is different from the coordinates computed above.
-	COLOR = zTexture(UV) * modulate;
-}
-
-
-// hsv to RGB conversion taken from www.shadertoy.com/view/MsS3Wc
-
-// The MIT License
-// Copyright © 2014 Inigo Quilez
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// https://www.youtube.com/c/InigoQuilez
-// https://iquilezles.org
-
-highp vec3 hsv2rgb( in highp vec3 c )
-{
-    highp vec3 rgb = clamp( abs(mod(c.x*6.0+vec3(0.0,4.0,2.0),6.0)-3.0)-1.0, 0.0, 1.0 );
-	return c.z * mix( vec3(1.0), rgb, c.y);
-}

Robust.Analyzers.Tests/AccessAnalyzer_Test.cs

@@ -1,8 +1,12 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
-using VerifyCS = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.AccessAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+using Robust.Analyzers;
+
+using VerifyCS = Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.AccessAnalyzer>;
+using static Microsoft.CodeAnalysis.Testing.DiagnosticResult;
 
 namespace Robust.Analyzers.Tests;
 
@@ -12,20 +16,15 @@ public sealed class AccessAnalyzer_Test
 {
     public Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<AccessAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<AccessAnalyzer, NUnitVerifier>()
         {
             TestState =
             {
+                AdditionalReferences = { typeof(AccessAnalyzer).Assembly },
                 Sources = { code }
             },
         };
 
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.AccessAttribute.cs",
-            "Robust.Shared.Analyzers.AccessPermissions.cs"
-        );
-
         // ExpectedDiagnostics cannot be set, so we need to AddRange here...
         test.TestState.ExpectedDiagnostics.AddRange(expected);
 

Robust.Analyzers.Tests/Aliases.cs

@@ -1,8 +0,0 @@
-// OH BOY. TURNS OUT IT GETS EVEN MORE CURSED.
-//
-// So because we're compiling a copy of Robust.Roslyn.Shared into every analyzer project,
-// the test project sees multiple copies of it. This would make it impossible to use.
-// UNLESS you use this obscure C# feature called "extern alias"
-// that I guarantee you you've never heard of before, and are now concerned about.
-
-extern alias SerializationGenerator;

Robust.Analyzers.Tests/ByRefEventAnalyzerTest.cs

@@ -1,114 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.ByRefEventAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture, TestOf(typeof(ByRefEventAnalyzer))]
-public sealed class ByRefEventAnalyzerTest
-{
-    private const string EventBusDef = """
-        namespace Robust.Shared.GameObjects;
-
-        public readonly struct EntityUid;
-
-        public sealed class EntitySystem
-        {
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-        }
-
-        public sealed class EntityEventBus
-        {
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-        }
-        """;
-
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<ByRefEventAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.GameObjects.EventBusAttributes.cs"
-        );
-
-        test.TestState.Sources.Add(("EntityEventBus.cs", EventBusDef));
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task TestSuccess()
-    {
-        const string code = """
-            using Robust.Shared.GameObjects;
-
-            [ByRefEvent]
-            public readonly struct RefEvent;
-            public readonly struct ValueEvent;
-
-            public static class Foo
-            {
-                public static void Bar(EntityEventBus bus)
-                {
-                    bus.RaiseLocalEvent(default(EntityUid), new ValueEvent());
-                    var refEv = new RefEvent();
-                    bus.RaiseLocalEvent(default(EntityUid), ref refEv);
-                }
-            }
-            """;
-
-        await Verifier(code);
-    }
-
-    [Test]
-    public async Task TestWrong()
-    {
-        const string code = """
-            using Robust.Shared.GameObjects;
-
-            [ByRefEvent]
-            public readonly struct RefEvent;
-            public readonly struct ValueEvent;
-
-            public static class Foo
-            {
-                public static void Bar(EntityEventBus bus)
-                {
-                    bus.RaiseLocalEvent(default(EntityUid), new RefEvent());
-                    var valueEv = new ValueEvent();
-                    bus.RaiseLocalEvent(default(EntityUid), ref valueEv);
-                }
-            }
-            """;
-
-        await Verifier(
-            code,
-            // /0/Test0.cs(11,49): error RA0015: Tried to raise a by-ref event 'RefEvent' by value
-            VerifyCS.Diagnostic(ByRefEventAnalyzer.ByRefEventRaisedByValueRule).WithSpan(11, 49, 11, 63).WithArguments("RefEvent"),
-            // /0/Test0.cs(13,49): error RA0016: Tried to raise a value event 'ValueEvent' by-ref
-            VerifyCS.Diagnostic(ByRefEventAnalyzer.ByValueEventRaisedByRefRule).WithSpan(13, 49, 13, 60).WithArguments("ValueEvent")
-        );
-    }
-}

Robust.Analyzers.Tests/ComponentPauseGeneratorTest.cs

@@ -1,344 +0,0 @@
-extern alias SerializationGenerator;
-using System.Linq;
-using System.Reflection;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Text;
-using NUnit.Framework;
-using SerializationGenerator::Robust.Roslyn.Shared;
-using SerializationGenerator::Robust.Serialization.Generator;
-
-namespace Robust.Analyzers.Tests;
-
-[TestFixture]
-[TestOf(typeof(ComponentPauseGenerator))]
-[Parallelizable(ParallelScope.All)]
-public sealed class ComponentPauseGeneratorTest
-{
-    private const string TypesCode = """
-        global using System;
-        global using Robust.Shared.Analyzers;
-        global using Robust.Shared.GameObjects;
-
-        namespace Robust.Shared.Analyzers
-        {
-            [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-            public sealed class AutoGenerateComponentPauseAttribute : Attribute
-            {
-                public bool Dirty = false;
-            }
-
-            [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-            public sealed class AutoPausedFieldAttribute : Attribute;
-
-            [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-            public sealed class AutoNetworkedFieldAttribute : Attribute
-            {
-            }
-        }
-
-        namespace Robust.Shared.GameObjects
-        {
-            public interface IComponent;
-        }
-        """;
-
-    [Test]
-    public void TestBasic()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestNullable()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan? Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    if (component.Foo.HasValue)
-                        component.Foo = component.Foo.Value + args.PausedTime;
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestAutoState()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField, AutoNetworkedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                    Dirty(uid, component);
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestExplicitDirty()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause(Dirty = true)]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                    Dirty(uid, component);
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestDiagnosticNotIComponent()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNotComponent, new LinePositionSpan(new LinePosition(1, 28), new LinePosition(1, 40)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticNoFields()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNoFields, new LinePositionSpan(new LinePosition(1, 28), new LinePosition(1, 40)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticNoParentAttribute()
-    {
-        var result = RunGenerator("""
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo, Fooz;
-
-                [AutoPausedField]
-                public TimeSpan Bar { get; set; }
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(3, 20), new LinePosition(3, 23))),
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(3, 25), new LinePosition(3, 29))),
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(6, 20), new LinePosition(6, 23)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticWrongType()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public int Foo, Fooz;
-
-                [AutoPausedField]
-                public int Bar { get; set; }
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(4, 15), new LinePosition(4, 18))),
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(4, 20), new LinePosition(4, 24))),
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(7, 15), new LinePosition(7, 18)))
-        ]);
-    }
-
-    private static void ExpectSource(GeneratorRunResult result, string expected)
-    {
-        Assert.That(result.GeneratedSources, Has.Length.EqualTo(1));
-
-        var source = result.GeneratedSources[0];
-
-        Assert.That(source.SourceText.ToString(), Is.EqualTo(expected));
-    }
-
-    private static void ExpectNoSource(GeneratorRunResult result)
-    {
-        Assert.That(result.GeneratedSources, Is.Empty);
-    }
-
-    private static void ExpectNoDiagnostics(GeneratorRunResult result)
-    {
-        Assert.That(result.Diagnostics, Is.Empty);
-    }
-
-    private static void ExpectDiagnostics(GeneratorRunResult result, (string code, LinePositionSpan span)[] diagnostics)
-    {
-        Assert.Multiple(() =>
-        {
-            Assert.That(result.Diagnostics, Has.Length.EqualTo(diagnostics.Length));
-            foreach (var (code, span) in diagnostics)
-            {
-                Assert.That(
-                    result.Diagnostics.Any(x => x.Id == code && x.Location.GetLineSpan().Span == span),
-                    $"Expected diagnostic with code {code} and location {span}");
-            }
-        });
-    }
-
-    private static GeneratorRunResult RunGenerator(string source)
-    {
-        var compilation = (Compilation)CSharpCompilation.Create("compilation",
-            new[]
-            {
-                CSharpSyntaxTree.ParseText(source, path: "Source.cs"),
-                CSharpSyntaxTree.ParseText(TypesCode, path: "Types.cs")
-            },
-            new[] { MetadataReference.CreateFromFile(typeof(Binder).GetTypeInfo().Assembly.Location) },
-            new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
-
-        var generator = new ComponentPauseGenerator();
-        GeneratorDriver driver = CSharpGeneratorDriver.Create(generator);
-        driver = driver.RunGeneratorsAndUpdateCompilation(compilation, out var newCompilation, out _);
-        var result = driver.GetRunResult();
-
-        return result.Results[0];
-    }
-}

Robust.Analyzers.Tests/DataDefinitionAnalyzerTest.cs

@@ -1,90 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DataDefinitionAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class DataDefinitionAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DataDefinitionAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using System;
-            using Robust.Shared.ViewVariables;
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            namespace Robust.Shared.ViewVariables
-            {
-                public sealed class ViewVariablesAttribute : Attribute
-                {
-                    public readonly VVAccess Access = VVAccess.ReadOnly;
-
-                    public ViewVariablesAttribute() { }
-
-                    public ViewVariablesAttribute(VVAccess access)
-                    {
-                        Access = access;
-                    }
-                }
-                public enum VVAccess : byte
-                {
-                    ReadOnly = 0,
-                    ReadWrite = 1,
-                }
-            }
-
-            namespace Robust.Shared.Serialization.Manager.Attributes
-            {
-                public class DataFieldBaseAttribute : Attribute;
-                public class DataFieldAttribute : DataFieldBaseAttribute;
-                public sealed class DataDefinitionAttribute : Attribute;
-            }
-
-            [DataDefinition]
-            public sealed partial class Foo
-            {
-                [DataField, ViewVariables(VVAccess.ReadWrite)]
-                public int Bad;
-
-                [DataField]
-                public int Good;
-
-                [DataField, ViewVariables]
-                public int Good2;
-
-                [DataField, ViewVariables(VVAccess.ReadOnly)]
-                public int Good3;
-
-                [ViewVariables]
-                public int Good4;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(35,17): info RA0028: Data field Bad in data definition Foo has ViewVariables attribute with ReadWrite access, which is redundant
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldNoVVReadWriteRule).WithSpan(35, 17, 35, 50).WithArguments("Bad", "Foo")
-        );
-    }
-}

Robust.Analyzers.Tests/DependencyAssignAnalyzerTest.cs

@@ -1,57 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DependencyAssignAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class DependencyAssignAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DependencyAssignAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.DependencyAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.IoC;
-
-            public sealed class Foo
-            {
-                [Dependency]
-                private object? Field;
-
-                public Foo()
-                {
-                    Field = "A";
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,9): warning RA0025: Tried to assign to [Dependency] field 'Field'. Remove [Dependency] or inject it via field injection instead.
-            VerifyCS.Diagnostic().WithSpan(10, 9, 10, 20).WithArguments("Field"));
-    }
-}

Robust.Analyzers.Tests/DuplicateDependencyAnalyzerTest.cs

@@ -1,62 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DuplicateDependencyAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-[TestOf(typeof(DuplicateDependencyAnalyzer))]
-public sealed class DuplicateDependencyAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DuplicateDependencyAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.DependencyAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.IoC;
-
-            public sealed class Foo
-            {
-                [Dependency]
-                private object? Field;
-
-                [Dependency]
-                private object? Field2;
-
-                [Dependency]
-                private string? DifferentField;
-
-                private string? NonDependency1;
-                private string? NonDependency2;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(9,21): warning RA0032: Another [Dependency] field of type 'object?' already exists in this type as field 'Field'
-            VerifyCS.Diagnostic().WithSpan(9, 21, 9, 27).WithArguments("object?", "Field"));
-    }
-}

Robust.Analyzers.Tests/ForbidLiteralAnalyzerTest.cs

@@ -1,189 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.ForbidLiteralAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class ForbidLiteralAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<ForbidLiteralAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.ForbidLiteralAttribute.cs"
-        );
-
-        test.TestState.Sources.Add(("TestTypeDefs.cs", TestTypeDefs));
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    private const string TestTypeDefs = """
-        using System.Collections.Generic;
-        using Robust.Shared.Analyzers;
-
-        public sealed class TestClass
-        {
-            public static void OneParameterForbidden([ForbidLiteral] string value) { }
-            public static void TwoParametersFirstForbidden([ForbidLiteral] string first, string second) { }
-            public static void TwoParametersBothForbidden([ForbidLiteral] string first, [ForbidLiteral] string second) { }
-            public static void ListParameterForbidden([ForbidLiteral] List<string> values) { }
-            public static void ParamsListParameterForbidden([ForbidLiteral] params List<string> values) { }
-        }
-
-        public record struct StringWrapper(string value)
-        {
-            private readonly string _value = value;
-
-            public static implicit operator string(StringWrapper wrapper)
-            {
-                return wrapper._value;
-            }
-        }
-    """;
-
-    [Test]
-    public async Task TestOneParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.OneParameterForbidden(_constValue);
-                    TestClass.OneParameterForbidden(StaticValue);
-                    TestClass.OneParameterForbidden(WrappedValue);
-                    TestClass.OneParameterForbidden("baz");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(12,41): error RA0033: The "value" parameter of OneParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(12, 41, 12, 46).WithArguments("value", "OneParameterForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestTwoParametersFirstForbidden()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-
-                public void Test()
-                {
-                    TestClass.TwoParametersFirstForbidden(_constValue, "whatever");
-                    TestClass.TwoParametersFirstForbidden(_constValue, _constValue);
-                    TestClass.TwoParametersFirstForbidden("foo", "whatever");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(9,47): error RA0033: The "first" parameter of TwoParametersFirstForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(9, 47, 9, 52).WithArguments("first", "TwoParametersFirstForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestTwoParametersBothForbidden()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-
-                public void Test()
-                {
-                    TestClass.TwoParametersBothForbidden(_constValue, _constValue);
-                    TestClass.TwoParametersBothForbidden(_constValue, StaticValue);
-                    TestClass.TwoParametersBothForbidden(_constValue, "whatever");
-                    TestClass.TwoParametersBothForbidden("whatever", _constValue);
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,59): error RA0033: The "second" parameter of TwoParametersBothForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 59, 10, 69).WithArguments("second", "TwoParametersBothForbidden"),
-            // /0/Test0.cs(11,46): error RA0033: The "first" parameter of TwoParametersBothForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(11, 46, 11, 56).WithArguments("first", "TwoParametersBothForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestListParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.ListParameterForbidden([_constValue, StaticValue, WrappedValue]);
-                    TestClass.ListParameterForbidden(["foo", _constValue, "bar"]);
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,43): warning RA0033: The "values" parameter of ListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 43, 10, 48).WithArguments("values", "ListParameterForbidden"),
-            // /0/Test0.cs(10,63): warning RA0033: The "values" parameter of ListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 63, 10, 68).WithArguments("values", "ListParameterForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestParamsListParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.ParamsListParameterForbidden(_constValue, StaticValue, WrappedValue);
-                    TestClass.ParamsListParameterForbidden("foo", _constValue, "bar");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,48): warning RA0033: The "values" parameter of ParamsListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 48, 10, 53).WithArguments("values", "ParamsListParameterForbidden"),
-            // /0/Test0.cs(10,68): warning RA0033: The "values" parameter of ParamsListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 68, 10, 73).WithArguments("values", "ParamsListParameterForbidden")
-        );
-    }
-}

Robust.Analyzers.Tests/MustCallBaseAnalyzerTest.cs

@@ -1,91 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.MustCallBaseAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class MustCallBaseAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<MustCallBaseAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.MustCallBaseAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class Foo
-            {
-                [MustCallBase]
-                public virtual void Function()
-                {
-
-                }
-
-                [MustCallBase(true)]
-                public virtual void Function2()
-                {
-
-                }
-            }
-
-            public class Bar : Foo
-            {
-                public override void Function()
-                {
-
-                }
-
-                public override void Function2()
-                {
-
-                }
-            }
-
-            public class Baz : Foo
-            {
-                public override void Function()
-                {
-                    base.Function();
-                }
-            }
-
-            public class Bal : Bar
-            {
-                public override void Function2()
-                {
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(20,26): warning RA0028: Overriders of this function must always call the base function
-            VerifyCS.Diagnostic().WithSpan(20, 26, 20, 34),
-            // /0/Test0.cs(41,26): warning RA0028: Overriders of this function must always call the base function
-            VerifyCS.Diagnostic().WithSpan(41, 26, 41, 35));
-    }
-}

Robust.Analyzers.Tests/NoUncachedRegexAnalyzerTest.cs

@@ -1,56 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.NoUncachedRegexAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class NoUncachedRegexAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<NoUncachedRegexAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using System.Text.RegularExpressions;
-
-            public static class Foo
-            {
-                public static void Bad()
-                {
-                    Regex.Replace("foo", "bar", "baz");
-                }
-
-                public static void Good()
-                {
-                    var r = new Regex("bar");
-                    r.Replace("foo", "baz");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(7,9): warning RA0026: Usage of a static Regex function that takes in a pattern string. This can cause constant re-parsing of the pattern.
-            VerifyCS.Diagnostic().WithSpan(7, 9, 7, 43)
-        );
-    }
-}

Robust.Analyzers.Tests/PreferNonGenericVariantForTest.cs

@@ -1,70 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferNonGenericVariantForAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class PreferNonGenericVariantForTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<PreferNonGenericVariantForAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class Bar { };
-            public class Baz { };
-            public class Okay { };
-
-            public static class Foo
-            {
-                [PreferNonGenericVariantFor(typeof(Bar), typeof(Baz))]
-                public static void DoFoo<T>() { }
-            }
-
-            public class Test
-            {
-                public void DoBad()
-                {
-                    Foo.DoFoo<Bar>();
-                }
-
-                public void DoGood()
-                {
-                    Foo.DoFoo<Okay>();
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(17,9): warning RA0029: Use the non-generic variant of this method for type Bar
-            VerifyCS.Diagnostic().WithSpan(17, 9, 17, 25).WithArguments("Bar")
-        );
-    }
-}

Robust.Analyzers.Tests/PreferOtherTypeAnalyzerTest.cs

@@ -1,61 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class PreferOtherTypeAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<PreferOtherTypeAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public ProtoId<EntityPrototype> Bad = new();
-
-                public ProtoId<ReagentPrototype> Good = new();
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(12,12): warning RA0031: Use the specific type EntProtoId instead of ProtoId when the type argument is EntityPrototype
-            VerifyCS.Diagnostic().WithSpan(12, 12, 12, 48).WithArguments("EntProtoId", "ProtoId", "EntityPrototype")
-        );
-    }
-}

Robust.Analyzers.Tests/PreferOtherTypeFixerTest.cs

@@ -1,80 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-public sealed class PreferOtherTypeFixerTest
-{
-    private static Task Verifier(string code, string fixedCode, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpCodeFixTest<PreferOtherTypeAnalyzer, PreferOtherTypeFixer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-            FixedState =
-            {
-                Sources = { fixedCode },
-            }
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        TestHelper.AddEmbeddedSources(
-            test.FixedState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public ProtoId<EntityPrototype> Foo = new();
-            }
-            """;
-
-        const string fixedCode = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public EntProtoId Foo = new();
-            }
-            """;
-
-        await Verifier(code, fixedCode,
-        // /0/Test0.cs(12,12): error RA0031: Use the specific type EntProtoId instead of ProtoId when the type argument is EntityPrototype
-        VerifyCS.Diagnostic().WithSpan(12, 12, 12, 48).WithArguments("EntProtoId", "ProtoId", "EntityPrototype"));
-    }
-}

Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj

@@ -1,49 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
-  </PropertyGroup>
-
-  <Import Project="..\MSBuild\Robust.Properties.targets"/>
-  <Import Project="..\MSBuild\Robust.Engine.props"/>
-
-  <!-- Engine source files needed to make the tests work -->
-  <ItemGroup>
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" LogicalName="Robust.Shared.Analyzers.AccessAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" LogicalName="Robust.Shared.Analyzers.AccessPermissions.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\MustCallBaseAttribute.cs" LogicalName="Robust.Shared.IoC.MustCallBaseAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferNonGenericVariantForAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferOtherTypeAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\ForbidLiteralAttribute.cs" LogicalName="Robust.Shared.Analyzers.ForbidLiteralAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\IoC\DependencyAttribute.cs" LogicalName="Robust.Shared.IoC.DependencyAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\GameObjects\EventBusAttributes.cs" LogicalName="Robust.Shared.GameObjects.EventBusAttributes.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
+  <Import Project="..\MSBuild\Robust.Engine.props" />
+  
   <PropertyGroup>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <PackageVersion Update="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit" Version="1.1.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1"/>
+    <PackageReference Include="NUnit" Version="3.13.2"/>
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0"/>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1"/>
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing"/>
-    <PackageReference Include="NUnit"/>
-    <PackageReference Include="NUnit3TestAdapter"/>
-    <PackageReference Include="NUnit.Analyzers"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
-
-    <!-- Needed to fix transitive dependency versions -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="System.Formats.Asn1" />
-  </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Robust.Analyzers\Robust.Analyzers.csproj"/>
-    <ProjectReference Include="..\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj" Aliases="SerializationGenerator" />
   </ItemGroup>
 </Project>

Robust.Analyzers.Tests/TestHelper.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Robust.Analyzers.Tests;
-
-public static class TestHelper
-{
-    public static void AddEmbeddedSources(SolutionState state, params string[] embeddedFiles)
-    {
-        AddEmbeddedSources(state, (IEnumerable<string>) embeddedFiles);
-    }
-
-    public static void AddEmbeddedSources(SolutionState state, IEnumerable<string> embeddedFiles)
-    {
-        foreach (var fileName in embeddedFiles)
-        {
-            using var stream = typeof(AccessAnalyzer_Test).Assembly.GetManifestResourceStream(fileName)!;
-            state.Sources.Add((fileName, SourceText.From(stream)));
-        }
-    }
-}

Robust.Analyzers/AccessAnalyzer.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 using Robust.Shared.Analyzers.Implementation;
 
 namespace Robust.Analyzers

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -1,10 +1,9 @@
-#nullable enable
+#nullable enable
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 using static Microsoft.CodeAnalysis.SymbolEqualityComparer;
 
 namespace Robust.Analyzers;
@@ -17,27 +16,37 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor ByRefEventSubscribedByValueRule = new(
         Diagnostics.IdByRefEventSubscribedByValue,
         "By-ref event subscribed to by value",
-        "Tried to subscribe to a by-ref event '{0}' by value",
+        "Tried to subscribe to a by-ref event '{0}' by value.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
         "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
     );
 
-    public static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
+    private static readonly DiagnosticDescriptor ByValueEventSubscribedByRefRule = new(
+        Diagnostics.IdValueEventRaisedByRef,
+        "Value event subscribed to by-ref",
+        "Tried to subscribe to a value event '{0}' by-ref.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure that methods subscribing to value events do not have the ref keyword for the event argument."
+    );
+
+    private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
         Diagnostics.IdByRefEventRaisedByValue,
         "By-ref event raised by value",
-        "Tried to raise a by-ref event '{0}' by value",
+        "Tried to raise a by-ref event '{0}' by value.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
         "Make sure to use the ref keyword when raising ref events."
     );
 
-    public static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
+    private static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
         Diagnostics.IdValueEventRaisedByRef,
         "Value event raised by-ref",
-        "Tried to raise a value event '{0}' by-ref",
+        "Tried to raise a value event '{0}' by-ref.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -46,6 +55,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
         ByRefEventSubscribedByValueRule,
+        ByValueEventSubscribedByRefRule,
         ByRefEventRaisedByValueRule,
         ByValueEventRaisedByRefRule
     );
@@ -54,44 +64,94 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     {
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
         context.EnableConcurrentExecution();
-        context.RegisterCompilationStartAction(compilationContext =>
-        {
-            var raiseMethods = compilationContext.Compilation
-                .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
-                .GetMembers()
-                .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
-                .Cast<IMethodSymbol>();
-
-            var busRaiseMethods = compilationContext.Compilation
-                .GetTypeByMetadataName("Robust.Shared.GameObjects.EntityEventBus")?
-                .GetMembers()
-                .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
-                .Cast<IMethodSymbol>();
-
-            if (raiseMethods == null)
-                return;
-
-            if (busRaiseMethods != null)
-                raiseMethods = raiseMethods.Concat(busRaiseMethods);
-
-            var raiseMethodsArray = raiseMethods.ToArray();
-
-            compilationContext.RegisterOperationAction(
-                ctx => CheckEventRaise(ctx, raiseMethodsArray),
-                OperationKind.Invocation);
-        });
+        context.RegisterOperationAction(CheckEventSubscription, OperationKind.Invocation);
+        context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
     }
 
-    private static void CheckEventRaise(
-        OperationAnalysisContext context,
-        IReadOnlyCollection<IMethodSymbol> raiseMethods)
+    private void CheckEventSubscription(OperationAnalysisContext context)
     {
         if (context.Operation is not IInvocationOperation operation)
             return;
 
-        if (!operation.TargetMethod.Name.Contains("RaiseLocalEvent"))
+        var subscribeMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("SubscribeLocalEvent"))
+            .Cast<IMethodSymbol>();
+
+        if (subscribeMethods == null)
             return;
 
+        if (!subscribeMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
+            return;
+
+        var typeArguments = operation.TargetMethod.TypeArguments;
+        if (typeArguments.Length < 1 || typeArguments.Length > 2)
+            return;
+
+        if (operation.Arguments.First().Value is not IDelegateCreationOperation delegateCreation)
+            return;
+
+        if (delegateCreation.Target is not IMethodReferenceOperation methodReference)
+            return;
+
+        var eventParameter = methodReference.Method.Parameters.LastOrDefault();
+        if (eventParameter == null)
+            return;
+
+        ITypeSymbol eventArgument;
+        switch (typeArguments.Length)
+        {
+            case 1:
+                eventArgument = typeArguments[0];
+                break;
+            case 2:
+                eventArgument = typeArguments[1];
+                break;
+            default:
+                return;
+        }
+
+        var byRefAttribute = context.Compilation.GetTypeByMetadataName(ByRefAttribute);
+        if (byRefAttribute == null)
+            return;
+
+        var isByRefEventType = eventArgument
+            .GetAttributes()
+            .Any(attribute => attribute.AttributeClass?.Equals(byRefAttribute, Default) ?? false);
+        var parameterIsRef = eventParameter.RefKind == RefKind.Ref;
+
+        if (isByRefEventType != parameterIsRef)
+        {
+            var descriptor = isByRefEventType ? ByRefEventSubscribedByValueRule : ByValueEventSubscribedByRefRule;
+            var diagnostic = Diagnostic.Create(descriptor, operation.Syntax.GetLocation(), eventArgument);
+            context.ReportDiagnostic(diagnostic);
+        }
+    }
+
+    private void CheckEventRaise(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation operation)
+            return;
+
+        var raiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        var busRaiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntityEventBus")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        if (raiseMethods == null)
+            return;
+
+        if (busRaiseMethods != null)
+            raiseMethods = raiseMethods.Concat(busRaiseMethods);
+
         if (!raiseMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
         {
             // If you try to do this normally by concatenating like busRaiseMethods above

Robust.Analyzers/DataDefinitionAnalyzer.cs

@@ -5,9 +5,6 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-using Robust.Shared.Serialization.Manager.Definition;
-using Robust.Shared.ViewVariables;
 
 namespace Robust.Analyzers;
 
@@ -17,14 +14,11 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private const string DataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataDefinitionAttribute";
     private const string ImplicitDataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.ImplicitDataDefinitionForInheritorsAttribute";
     private const string DataFieldBaseNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataFieldBaseAttribute";
-    private const string ViewVariablesNamespace = "Robust.Shared.ViewVariables.ViewVariablesAttribute";
-    private const string DataFieldAttributeName = "DataField";
-    private const string ViewVariablesAttributeName = "ViewVariables";
 
     private static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
         Diagnostics.IdDataDefinitionPartial,
         "Type must be partial",
-        "Type {0} is a DataDefinition but is not partial",
+        "Type {0} is a DataDefinition but is not partial.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -34,7 +28,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor NestedDataDefinitionPartialRule = new(
         Diagnostics.IdNestedDataDefinitionPartial,
         "Type must be partial",
-        "Type {0} contains nested data definition {1} but is not partial",
+        "Type {0} contains nested data definition {1} but is not partial.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -44,7 +38,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataFieldWritableRule = new(
         Diagnostics.IdDataFieldWritable,
         "Data field must not be readonly",
-        "Data field {0} in data definition {1} is readonly",
+        "Data field {0} in data definition {1} is readonly.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -54,36 +48,15 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataFieldPropertyWritableRule = new(
         Diagnostics.IdDataFieldPropertyWritable,
         "Data field property must have a setter",
-        "Data field property {0} in data definition {1} does not have a setter",
+        "Data field property {0} in data definition {1} does not have a setter.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
         "Make sure to add a setter."
     );
 
-    private static readonly DiagnosticDescriptor DataFieldRedundantTagRule = new(
-        Diagnostics.IdDataFieldRedundantTag,
-        "Data field has redundant tag specified",
-        "Data field {0} in data definition {1} has an explicitly set tag that matches autogenerated tag",
-        "Usage",
-        DiagnosticSeverity.Info,
-        true,
-        "Make sure to remove the tag string from the data field attribute."
-    );
-
-    public static readonly DiagnosticDescriptor DataFieldNoVVReadWriteRule = new(
-        Diagnostics.IdDataFieldNoVVReadWrite,
-        "Data field has VV ReadWrite",
-        "Data field {0} in data definition {1} has ViewVariables attribute with ReadWrite access, which is redundant",
-        "Usage",
-        DiagnosticSeverity.Info,
-        true,
-        "Make sure to remove the ViewVariables attribute."
-    );
-
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule,
-        DataFieldRedundantTagRule, DataFieldNoVVReadWriteRule
+        DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule
     );
 
     public override void Initialize(AnalysisContext context)
@@ -151,18 +124,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
             {
                 context.ReportDiagnostic(Diagnostic.Create(DataFieldWritableRule, context.Node.GetLocation(), fieldSymbol.Name, type.Name));
             }
-
-            if (HasRedundantTag(fieldSymbol))
-            {
-                TryGetAttributeLocation(field, DataFieldAttributeName, out var location);
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, fieldSymbol.Name, type.Name));
-            }
-
-            if (HasVVReadWrite(fieldSymbol))
-            {
-                TryGetAttributeLocation(field, ViewVariablesAttributeName, out var location);
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, fieldSymbol.Name, type.Name));
-            }
         }
     }
 
@@ -187,18 +148,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         {
             context.ReportDiagnostic(Diagnostic.Create(DataFieldPropertyWritableRule, context.Node.GetLocation(), propertySymbol.Name, type.Name));
         }
-
-        if (HasRedundantTag(propertySymbol))
-        {
-            TryGetAttributeLocation(property, DataFieldAttributeName, out var location);
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, propertySymbol.Name, type.Name));
-        }
-
-        if (HasVVReadWrite(propertySymbol))
-        {
-            TryGetAttributeLocation(property, ViewVariablesAttributeName, out var location);
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, propertySymbol.Name, type.Name));
-        }
     }
 
     private static bool IsReadOnlyDataField(ITypeSymbol type, ISymbol field)
@@ -267,24 +216,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return false;
     }
 
-    private static bool TryGetAttributeLocation(MemberDeclarationSyntax syntax, string attributeName, out Location location)
-    {
-        foreach (var attributeList in syntax.AttributeLists)
-        {
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() != attributeName)
-                    continue;
-
-                location = attribute.GetLocation();
-                return true;
-            }
-        }
-        // Default to the declaration syntax's location
-        location = syntax.GetLocation();
-        return false;
-    }
-
     private static bool IsReadOnlyMember(ITypeSymbol type, ISymbol member)
     {
         if (member is IFieldSymbol field)
@@ -316,57 +247,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return false;
     }
 
-    private static bool HasRedundantTag(ISymbol symbol)
-    {
-        if (!IsDataField(symbol, out var _, out var attribute))
-            return false;
-
-        // No args, no problem
-        if (attribute.ConstructorArguments.Length == 0)
-            return false;
-
-        // If a tag is explicitly specified, it will be the first argument...
-        var tagArgument = attribute.ConstructorArguments[0];
-        // ...but the first arg could also something else, since tag is optional
-        // so we make sure that it's a string
-        if (tagArgument.Value is not string explicitName)
-            return false;
-
-        // Get the name that sourcegen would provide
-        var automaticName = DataDefinitionUtility.AutoGenerateTag(symbol.Name);
-
-        // If the explicit name matches the sourcegen name, we have a redundancy
-        return explicitName == automaticName;
-    }
-
-    private static bool HasVVReadWrite(ISymbol symbol)
-    {
-        if (!IsDataField(symbol, out _, out _))
-            return false;
-
-        // Make sure it has ViewVariablesAttribute
-        AttributeData? viewVariablesAttribute = null;
-        foreach (var attr in symbol.GetAttributes())
-        {
-            if (attr.AttributeClass?.ToDisplayString() == ViewVariablesNamespace)
-            {
-                viewVariablesAttribute = attr;
-            }
-        }
-        if (viewVariablesAttribute == null)
-            return false;
-
-        // Default is ReadOnly, which is fine
-        if (viewVariablesAttribute.ConstructorArguments.Length == 0)
-            return false;
-
-        var accessArgument = viewVariablesAttribute.ConstructorArguments[0];
-        if (accessArgument.Value is not byte accessByte)
-            return false;
-
-        return (VVAccess)accessByte == VVAccess.ReadWrite;
-    }
-
     private static bool IsImplicitDataDefinition(ITypeSymbol type)
     {
         if (HasAttribute(type, ImplicitDataDefinitionNamespace))

Robust.Analyzers/DataDefinitionFixer.cs

@@ -1,25 +1,23 @@
 #nullable enable
 using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxKind;
-using static Robust.Roslyn.Shared.Diagnostics;
+using static Robust.Analyzers.Diagnostics;
 
 namespace Robust.Analyzers;
 
 [ExportCodeFixProvider(LanguageNames.CSharp)]
 public sealed class DefinitionFixer : CodeFixProvider
 {
-    private const string DataFieldAttributeName = "DataField";
-
-    private const string ViewVariablesAttributeName = "ViewVariables";
-
     public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
-        IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable,
-        IdDataFieldRedundantTag, IdDataFieldNoVVReadWrite
+        IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable
     );
 
     public override Task RegisterCodeFixesAsync(CodeFixContext context)
@@ -36,10 +34,6 @@ public sealed class DefinitionFixer : CodeFixProvider
                     return RegisterDataFieldFix(context, diagnostic);
                 case IdDataFieldPropertyWritable:
                     return RegisterDataFieldPropertyFix(context, diagnostic);
-                case IdDataFieldRedundantTag:
-                    return RegisterRedundantTagFix(context, diagnostic);
-                case IdDataFieldNoVVReadWrite:
-                    return RegisterVVReadWriteFix(context, diagnostic);
             }
         }
 
@@ -78,110 +72,6 @@ public sealed class DefinitionFixer : CodeFixProvider
         return document.WithSyntaxRoot(root);
     }
 
-    private static async Task RegisterRedundantTagFix(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<MemberDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        // Find the DataField attribute
-        AttributeSyntax? dataFieldAttribute = null;
-        foreach (var attributeList in token.AttributeLists)
-        {
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() == DataFieldAttributeName)
-                {
-                    dataFieldAttribute = attribute;
-                    break;
-                }
-            }
-            if (dataFieldAttribute != null)
-                break;
-        }
-
-        if (dataFieldAttribute == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Remove explicitly set tag",
-            c => RemoveRedundantTag(context.Document, dataFieldAttribute, c),
-            "Remove explicitly set tag"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> RemoveRedundantTag(Document document, AttributeSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-
-        if (syntax.ArgumentList == null)
-            return document;
-
-        AttributeSyntax? newSyntax;
-        if (syntax.ArgumentList.Arguments.Count == 1)
-        {
-            // If this is the only argument, delete the ArgumentList so we don't leave empty parentheses
-            newSyntax = syntax.RemoveNode(syntax.ArgumentList, SyntaxRemoveOptions.KeepNoTrivia);
-        }
-        else
-        {
-            // Remove the first argument, which is the tag
-            var newArgs = syntax.ArgumentList.Arguments.RemoveAt(0);
-            var newArgList = syntax.ArgumentList.WithArguments(newArgs);
-            // Construct a new attribute with the tag removed
-            newSyntax = syntax.WithArgumentList(newArgList);
-        }
-
-        root = root!.ReplaceNode(syntax, newSyntax!);
-
-        return document.WithSyntaxRoot(root);
-    }
-
-    private static async Task RegisterVVReadWriteFix(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<MemberDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Remove ViewVariables attribute",
-            c => RemoveVVAttribute(context.Document, token, c),
-            "Remove ViewVariables attribute"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> RemoveVVAttribute(Document document, MemberDeclarationSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-
-        var newLists = new SyntaxList<AttributeListSyntax>();
-        foreach (var attributeList in syntax.AttributeLists)
-        {
-            var attributes = new SeparatedSyntaxList<AttributeSyntax>();
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() != ViewVariablesAttributeName)
-                {
-                    attributes = attributes.Add(attribute);
-                }
-            }
-            // Don't add empty lists []
-            if (attributes.Count > 0)
-                newLists = newLists.Add(attributeList.WithAttributes(attributes));
-        }
-        var newSyntax = syntax.WithAttributeLists(newLists);
-
-        root = root!.ReplaceNode(syntax, newSyntax);
-
-        return document.WithSyntaxRoot(root);
-    }
-
     private static async Task RegisterDataFieldFix(CodeFixContext context, Diagnostic diagnostic)
     {
         var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);

Robust.Analyzers/DependencyAssignAnalyzer.cs

@@ -1,61 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class DependencyAssignAnalyzer : DiagnosticAnalyzer
-{
-    private const string DependencyAttributeType = "Robust.Shared.IoC.DependencyAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new (
-        Diagnostics.IdDependencyFieldAssigned,
-        "Assignment to dependency field",
-        "Tried to assign to [Dependency] field '{0}'. Remove [Dependency] or inject it via field injection instead.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.EnableConcurrentExecution();
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.RegisterOperationAction(CheckAssignment, OperationKind.SimpleAssignment);
-    }
-
-    private static void CheckAssignment(OperationAnalysisContext context)
-    {
-        if (context.Operation is not ISimpleAssignmentOperation assignment)
-            return;
-
-        if (assignment.Target is not IFieldReferenceOperation fieldRef)
-            return;
-
-        var field = fieldRef.Field;
-        var attributes = field.GetAttributes();
-        if (attributes.Length == 0)
-            return;
-
-        var depAttribute = context.Compilation.GetTypeByMetadataName(DependencyAttributeType);
-        if (!HasAttribute(attributes, depAttribute))
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(Rule, assignment.Syntax.GetLocation(), field.Name));
-    }
-
-    private static bool HasAttribute(ImmutableArray<AttributeData> attributes, ISymbol symbol)
-    {
-        foreach (var attribute in attributes)
-        {
-            if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, symbol))
-                return true;
-        }
-
-        return false;
-    }
-}

Robust.Analyzers/Diagnostics.cs

@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;
 
-namespace Robust.Roslyn.Shared;
+namespace Robust.Analyzers;
 
 public static class Diagnostics
 {
@@ -18,25 +18,13 @@ public static class Diagnostics
     public const string IdInvalidNotNullableFlagType = "RA0011";
     public const string IdNotNullableFlagValueType = "RA0012";
     public const string IdByRefEventSubscribedByValue = "RA0013";
+    public const string IdValueEventSubscribedByRef = "RA0014";
     public const string IdByRefEventRaisedByValue = "RA0015";
     public const string IdValueEventRaisedByRef = "RA0016";
     public const string IdDataDefinitionPartial = "RA0017";
     public const string IdNestedDataDefinitionPartial = "RA0018";
     public const string IdDataFieldWritable = "RA0019";
     public const string IdDataFieldPropertyWritable = "RA0020";
-    public const string IdComponentPauseNotComponent = "RA0021";
-    public const string IdComponentPauseNoFields = "RA0022";
-    public const string IdComponentPauseNoParentAttribute = "RA0023";
-    public const string IdComponentPauseWrongTypeAttribute = "RA0024";
-    public const string IdDependencyFieldAssigned = "RA0025";
-    public const string IdUncachedRegex = "RA0026";
-    public const string IdDataFieldRedundantTag = "RA0027";
-    public const string IdMustCallBase = "RA0028";
-    public const string IdDataFieldNoVVReadWrite = "RA0029";
-    public const string IdUseNonGenericVariant = "RA0030";
-    public const string IdPreferOtherType = "RA0031";
-    public const string IdDuplicateDependency = "RA0032";
-    public const string IdForbidLiteral = "RA0033";
 
     public static SuppressionDescriptor MeansImplicitAssignment =>
         new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");

Robust.Analyzers/DuplicateDependencyAnalyzer.cs

@@ -1,126 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-#nullable enable
-
-/// <summary>
-/// Analyzer that detects duplicate <c>[Dependency]</c> fields inside a single type.
-/// </summary>
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class DuplicateDependencyAnalyzer : DiagnosticAnalyzer
-{
-    private const string DependencyAttributeType = "Robust.Shared.IoC.DependencyAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdDuplicateDependency,
-        "Duplicate dependency field",
-        "Another [Dependency] field of type '{0}' already exists in this type with field '{1}'",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterCompilationStartAction(compilationContext =>
-        {
-            var dependencyAttributeType = compilationContext.Compilation.GetTypeByMetadataName(DependencyAttributeType);
-            if (dependencyAttributeType == null)
-                return;
-
-            compilationContext.RegisterSymbolStartAction(symbolContext =>
-                {
-                    var typeSymbol = (INamedTypeSymbol)symbolContext.Symbol;
-                    // Only deal with non-static classes, doesn't make sense to have dependencies in anything else.
-                    if (typeSymbol.TypeKind != TypeKind.Class || typeSymbol.IsStatic)
-                        return;
-
-                    var state = new AnalyzerState(dependencyAttributeType);
-                    symbolContext.RegisterSyntaxNodeAction(state.AnalyzeField, SyntaxKind.FieldDeclaration);
-                    symbolContext.RegisterSymbolEndAction(state.End);
-                },
-                SymbolKind.NamedType);
-        });
-    }
-
-    private sealed class AnalyzerState(INamedTypeSymbol dependencyAttributeType)
-    {
-        private readonly Dictionary<ITypeSymbol, List<IFieldSymbol>> _dependencyFields = new(SymbolEqualityComparer.Default);
-
-        public void AnalyzeField(SyntaxNodeAnalysisContext context)
-        {
-            var field = (FieldDeclarationSyntax)context.Node;
-            if (field.AttributeLists.Count == 0)
-                return;
-
-            if (context.ContainingSymbol is not IFieldSymbol fieldSymbol)
-                return;
-
-            // Can't have [Dependency]s for non-reference types.
-            if (!fieldSymbol.Type.IsReferenceType)
-                return;
-
-            if (!IsDependency(context.ContainingSymbol))
-                return;
-
-            lock (_dependencyFields)
-            {
-                if (!_dependencyFields.TryGetValue(fieldSymbol.Type, out var dependencyFields))
-                {
-                    dependencyFields = [];
-                    _dependencyFields.Add(fieldSymbol.Type, dependencyFields);
-                }
-
-                dependencyFields.Add(fieldSymbol);
-            }
-        }
-
-        private bool IsDependency(ISymbol symbol)
-        {
-            foreach (var attributeData in symbol.GetAttributes())
-            {
-                if (SymbolEqualityComparer.Default.Equals(attributeData.AttributeClass, dependencyAttributeType))
-                    return true;
-            }
-
-            return false;
-        }
-
-        public void End(SymbolAnalysisContext context)
-        {
-            lock (_dependencyFields)
-            {
-                foreach (var pair in _dependencyFields)
-                {
-                    var fieldType = pair.Key;
-                    var fields = pair.Value;
-                    if (fields.Count <= 1)
-                        continue;
-
-                    // Sort so we can have deterministic order to skip reporting for a single field.
-                    // Whichever sorts first doesn't get reported.
-                    fields.Sort(static (a, b) => string.Compare(a.Name, b.Name, StringComparison.Ordinal));
-
-                    // Start at index 1 to skip first field.
-                    var firstField = fields[0];
-                    for (var i = 1; i < fields.Count; i++)
-                    {
-                        var field = fields[i];
-
-                        context.ReportDiagnostic(
-                            Diagnostic.Create(Rule, field.Locations[0], fieldType.ToDisplayString(), firstField.Name));
-                    }
-                }
-            }
-        }
-    }
-}

Robust.Analyzers/ExplicitInterfaceAnalyzer.cs

@@ -10,7 +10,6 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 using Document = Microsoft.CodeAnalysis.Document;
 
 namespace Robust.Analyzers

Robust.Analyzers/ExplicitVirtualAnalyzer.cs

@@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/ForbidLiteralAnalyzer.cs

@@ -1,101 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class ForbidLiteralAnalyzer : DiagnosticAnalyzer
-{
-    private const string ForbidLiteralType = "Robust.Shared.Analyzers.ForbidLiteralAttribute";
-
-    public static DiagnosticDescriptor ForbidLiteralRule = new(
-        Diagnostics.IdForbidLiteral,
-        "Parameter forbids literal values",
-        "The {0} parameter of {1} forbids literal values",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true,
-        "Pass in a validated wrapper type like ProtoId, or a const or static value."
-    );
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [ForbidLiteralRule];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
-        context.EnableConcurrentExecution();
-        context.RegisterOperationAction(AnalyzeOperation, OperationKind.Invocation);
-    }
-
-    private void AnalyzeOperation(OperationAnalysisContext context)
-    {
-        if (context.Operation is not IInvocationOperation invocationOperation)
-            return;
-
-        // Check each parameter of the method invocation
-        foreach (var argumentOperation in invocationOperation.Arguments)
-        {
-            // Check for our attribute on the parameter
-            if (!AttributeHelper.HasAttribute(argumentOperation.Parameter, ForbidLiteralType, out _))
-                continue;
-
-            // Handle parameters using the params keyword
-            if (argumentOperation.Syntax is InvocationExpressionSyntax subExpressionSyntax)
-            {
-                // Check each param value
-                foreach (var subArgument in subExpressionSyntax.ArgumentList.Arguments)
-                {
-                    CheckArgumentSyntax(context, argumentOperation, subArgument);
-                }
-                continue;
-            }
-
-            // Not params, so just check the single parameter
-            if (argumentOperation.Syntax is not ArgumentSyntax argumentSyntax)
-                continue;
-
-            CheckArgumentSyntax(context, argumentOperation, argumentSyntax);
-        }
-    }
-
-    private void CheckArgumentSyntax(OperationAnalysisContext context, IArgumentOperation operation, ArgumentSyntax argumentSyntax)
-    {
-        // Handle collection types
-        if (argumentSyntax.Expression is CollectionExpressionSyntax collectionExpressionSyntax)
-        {
-            // Check each value of the collection
-            foreach (var elementSyntax in collectionExpressionSyntax.Elements)
-            {
-                if (elementSyntax is not ExpressionElementSyntax expressionSyntax)
-                    continue;
-
-                // Check if a literal was passed in
-                if (expressionSyntax.Expression is not LiteralExpressionSyntax)
-                    continue;
-
-                context.ReportDiagnostic(Diagnostic.Create(ForbidLiteralRule,
-                    expressionSyntax.GetLocation(),
-                    operation.Parameter.Name,
-                    (context.Operation as IInvocationOperation).TargetMethod.Name
-                ));
-            }
-            return;
-        }
-
-        // Not a collection, just a single value to check
-        // Check if it's a literal
-        if (argumentSyntax.Expression is not LiteralExpressionSyntax)
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(ForbidLiteralRule,
-            argumentSyntax.GetLocation(),
-            operation.Parameter.Name,
-            (context.Operation as IInvocationOperation).TargetMethod.Name
-        ));
-    }
-}

Robust.Analyzers/MeansImplicitAssigmentSuppressor.cs

@@ -2,7 +2,6 @@ using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers
 {

Robust.Analyzers/MustCallBaseAnalyzer.cs

@@ -1,111 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-#nullable enable
-
-/// <summary>
-/// Enforces <c>MustCallBaseAttribute</c>.
-/// </summary>
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class MustCallBaseAnalyzer : DiagnosticAnalyzer
-{
-    private const string Attribute = "Robust.Shared.Analyzers.MustCallBaseAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdMustCallBase,
-        "No base call in overriden function",
-        "Overriders of this function must always call the base function",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Method);
-    }
-
-    private static void AnalyzeSymbol(SymbolAnalysisContext context)
-    {
-        if (context.Symbol is not IMethodSymbol { IsOverride: true } method)
-            return;
-
-        var attrSymbol = context.Compilation.GetTypeByMetadataName(Attribute);
-        if (attrSymbol == null)
-            return;
-
-        if (DoesMethodOverriderHaveAttribute(method, attrSymbol) is not { } data)
-            return;
-
-        if (data is { onlyOverrides: true, depth: < 2 })
-            return;
-
-        var syntax = (MethodDeclarationSyntax) method.DeclaringSyntaxReferences[0].GetSyntax();
-        if (HasBaseCall(syntax))
-            return;
-
-        var diag = Diagnostic.Create(Rule, syntax.Identifier.GetLocation());
-        context.ReportDiagnostic(diag);
-    }
-
-    private static (int depth, bool onlyOverrides)? DoesMethodOverriderHaveAttribute(
-        IMethodSymbol method,
-        INamedTypeSymbol attributeSymbol)
-    {
-        var depth = 0;
-        while (method.OverriddenMethod != null)
-        {
-            depth += 1;
-            method = method.OverriddenMethod;
-            if (GetAttribute(method, attributeSymbol) is not { } attribute)
-                continue;
-
-            var onlyOverrides = attribute.ConstructorArguments is [{Kind: TypedConstantKind.Primitive, Value: true}];
-            return (depth, onlyOverrides);
-        }
-
-        return null;
-    }
-
-    private static bool HasBaseCall(MethodDeclarationSyntax syntax)
-    {
-        return syntax.Accept(new BaseCallLocator());
-    }
-
-    private static AttributeData? GetAttribute(ISymbol namedTypeSymbol, INamedTypeSymbol attrSymbol)
-    {
-        return namedTypeSymbol.GetAttributes()
-            .SingleOrDefault(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attrSymbol));
-    }
-
-    private sealed class BaseCallLocator : CSharpSyntaxVisitor<bool>
-    {
-        public override bool VisitBaseExpression(BaseExpressionSyntax node)
-        {
-            return true;
-        }
-
-        public override bool DefaultVisit(SyntaxNode node)
-        {
-            foreach (var childNode in node.ChildNodes())
-            {
-                if (childNode is not CSharpSyntaxNode cSharpSyntax)
-                    continue;
-
-                if (cSharpSyntax.Accept(this))
-                    return true;
-            }
-
-            return false;
-        }
-    }
-}

Robust.Analyzers/NoUncachedRegexAnalyzer.cs

@@ -1,66 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class NoUncachedRegexAnalyzer : DiagnosticAnalyzer
-{
-    private const string RegexTypeName = "Regex";
-    private const string RegexType = $"System.Text.RegularExpressions.{RegexTypeName}";
-
-    private static readonly DiagnosticDescriptor Rule = new (
-        Diagnostics.IdUncachedRegex,
-        "Use of uncached static Regex function",
-        "Usage of a static Regex function that takes in a pattern string. This can cause constant re-parsing of the pattern.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public static readonly HashSet<string> BadFunctions =
-    [
-        "Count",
-        "EnumerateMatches",
-        "IsMatch",
-        "Match",
-        "Matches",
-        "Replace",
-        "Split"
-    ];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.EnableConcurrentExecution();
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.RegisterOperationAction(CheckInvocation, OperationKind.Invocation);
-    }
-
-    private static void CheckInvocation(OperationAnalysisContext context)
-    {
-        if (context.Operation is not IInvocationOperation invocation)
-            return;
-
-        // All Regex functions we care about are static.
-        var targetMethod = invocation.TargetMethod;
-        if (!targetMethod.IsStatic)
-            return;
-
-        // Bail early.
-        if (targetMethod.ContainingType.Name != "Regex")
-            return;
-
-        var regexType = context.Compilation.GetTypeByMetadataName(RegexType);
-        if (!SymbolEqualityComparer.Default.Equals(regexType, targetMethod.ContainingType))
-            return;
-
-        if (!BadFunctions.Contains(targetMethod.Name))
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(Rule, invocation.Syntax.GetLocation()));
-    }
-}

Robust.Analyzers/NotNullableFlagAnalyzer.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 
@@ -32,7 +31,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
 
     private static readonly DiagnosticDescriptor InvalidNotNullableImplementationRule = new (
         Diagnostics.IdInvalidNotNullableFlagImplementation,
-        "Invalid NotNullable flag implementation",
+        "Invalid NotNullable flag implementation.",
         "NotNullable flag is either not typed as bool, or does not have a default value equaling false",
         "Usage",
         DiagnosticSeverity.Error,
@@ -42,7 +41,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor InvalidNotNullableTypeRule = new (
         Diagnostics.IdInvalidNotNullableFlagType,
         "Failed to resolve type parameter",
-        "Failed to resolve type parameter \"{0}\"",
+        "Failed to resolve type parameter \"{0}\".",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -50,7 +49,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
 
     private static readonly DiagnosticDescriptor NotNullableFlagValueTypeRule = new (
         Diagnostics.IdNotNullableFlagValueType,
-        "NotNullable flag not supported for value types",
+        "NotNullable flag not supported for value types.",
         "Value types as generic arguments are not supported for NotNullable flags",
         "Usage",
         DiagnosticSeverity.Error,

Robust.Analyzers/PreferGenericVariantAnalyzer.cs

@@ -11,7 +11,6 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/PreferNonGenericVariantForAnalyzer.cs

@@ -1,65 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PreferNonGenericVariantForAnalyzer : DiagnosticAnalyzer
-{
-    private const string AttributeType = "Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute";
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        UseNonGenericVariantDescriptor
-    );
-
-    private static readonly DiagnosticDescriptor UseNonGenericVariantDescriptor = new(
-        Diagnostics.IdUseNonGenericVariant,
-        "Consider using the non-generic variant of this method",
-        "Use the non-generic variant of this method for type {0}",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true,
-        "Use the generic variant of this method.");
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
-        context.EnableConcurrentExecution();
-        context.RegisterOperationAction(CheckForNonGenericVariant, OperationKind.Invocation);
-    }
-
-    private void CheckForNonGenericVariant(OperationAnalysisContext obj)
-    {
-        if (obj.Operation is not IInvocationOperation invocationOperation) return;
-
-        var preferNonGenericAttribute = obj.Compilation.GetTypeByMetadataName(AttributeType);
-
-        HashSet<ITypeSymbol> forTypes = [];
-        foreach (var attribute in invocationOperation.TargetMethod.GetAttributes())
-        {
-            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferNonGenericAttribute))
-                continue;
-
-            foreach (var type in attribute.ConstructorArguments[0].Values)
-                forTypes.Add((ITypeSymbol)type.Value);
-
-            break;
-        }
-
-        if (forTypes == null)
-            return;
-
-        foreach (var typeArg in invocationOperation.TargetMethod.TypeArguments)
-        {
-            if (forTypes.Contains(typeArg))
-            {
-                obj.ReportDiagnostic(
-                Diagnostic.Create(UseNonGenericVariantDescriptor,
-                    invocationOperation.Syntax.GetLocation(), typeArg.Name));
-            }
-        }
-    }
-}

Robust.Analyzers/PreferOtherTypeAnalyzer.cs

@@ -1,75 +0,0 @@
-#nullable enable
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PreferOtherTypeAnalyzer : DiagnosticAnalyzer
-{
-    private const string AttributeType = "Robust.Shared.Analyzers.PreferOtherTypeAttribute";
-
-    private static readonly DiagnosticDescriptor PreferOtherTypeDescriptor = new(
-        Diagnostics.IdPreferOtherType,
-        "Use the specific type",
-        "Use the specific type {0} instead of {1} when the type argument is {2}",
-        "Usage",
-        DiagnosticSeverity.Error,
-        true,
-        "Use the specific type.");
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        PreferOtherTypeDescriptor
-    );
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
-        context.EnableConcurrentExecution();
-        context.RegisterSyntaxNodeAction(AnalyzeField, SyntaxKind.VariableDeclaration);
-    }
-
-    private void AnalyzeField(SyntaxNodeAnalysisContext context)
-    {
-        if (context.Node is not VariableDeclarationSyntax node)
-            return;
-
-        // Get the type of the generic being used
-        if (node.Type is not GenericNameSyntax genericName)
-            return;
-        var genericSyntax = genericName.TypeArgumentList.Arguments[0];
-        if (context.SemanticModel.GetSymbolInfo(genericSyntax).Symbol is not { } genericType)
-            return;
-
-        // Look for the PreferOtherTypeAttribute
-        var symbolInfo = context.SemanticModel.GetSymbolInfo(node.Type);
-        if (symbolInfo.Symbol?.GetAttributes() is not { } attributes)
-            return;
-
-        var preferOtherTypeAttribute = context.Compilation.GetTypeByMetadataName(AttributeType);
-
-        foreach (var attribute in attributes)
-        {
-            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferOtherTypeAttribute))
-                continue;
-
-            // See if the generic type argument matches the type the attribute specifies
-            if (attribute.ConstructorArguments[0].Value is not ITypeSymbol checkedType)
-                return;
-            if (!SymbolEqualityComparer.Default.Equals(checkedType, genericType))
-                continue;
-
-            if (attribute.ConstructorArguments[1].Value is not ITypeSymbol replacementType)
-                continue;
-            context.ReportDiagnostic(Diagnostic.Create(PreferOtherTypeDescriptor,
-                context.Node.GetLocation(),
-                replacementType.Name,
-                symbolInfo.Symbol.Name,
-                genericType.Name));
-        }
-    }
-}

Robust.Analyzers/PreferOtherTypeFixer.cs

@@ -1,97 +0,0 @@
-#nullable enable
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Robust.Roslyn.Shared.Diagnostics;
-
-namespace Robust.Analyzers;
-
-[ExportCodeFixProvider(LanguageNames.CSharp)]
-public sealed class PreferOtherTypeFixer : CodeFixProvider
-{
-    private const string PreferOtherTypeAttributeName = "PreferOtherTypeAttribute";
-
-    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
-        IdPreferOtherType
-    );
-
-    public override FixAllProvider GetFixAllProvider()
-    {
-        return WellKnownFixAllProviders.BatchFixer;
-    }
-
-    public override Task RegisterCodeFixesAsync(CodeFixContext context)
-    {
-        foreach (var diagnostic in context.Diagnostics)
-        {
-            switch (diagnostic.Id)
-            {
-                case IdPreferOtherType:
-                    return RegisterReplaceType(context, diagnostic);
-            }
-        }
-
-        return Task.CompletedTask;
-    }
-
-    private static async Task RegisterReplaceType(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<VariableDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Replace type",
-            c => ReplaceType(context.Document, token, c),
-            "Replace type"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> ReplaceType(Document document, VariableDeclarationSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-        var model = await document.GetSemanticModelAsync(cancellation);
-
-        if (model == null)
-            return document;
-
-        if (syntax.Type is not GenericNameSyntax genericNameSyntax)
-            return document;
-        var genericTypeSyntax = genericNameSyntax.TypeArgumentList.Arguments[0];
-        if (model.GetSymbolInfo(genericTypeSyntax).Symbol is not {} genericTypeSymbol)
-            return document;
-
-        var symbolInfo = model.GetSymbolInfo(syntax.Type);
-        if (symbolInfo.Symbol?.GetAttributes() is not { } attributes)
-            return document;
-
-        foreach (var attribute in attributes)
-        {
-            if (attribute.AttributeClass?.Name != PreferOtherTypeAttributeName)
-                continue;
-
-            if (attribute.ConstructorArguments[0].Value is not ITypeSymbol checkedTypeSymbol)
-                continue;
-
-            if (!SymbolEqualityComparer.Default.Equals(checkedTypeSymbol, genericTypeSymbol))
-                continue;
-
-            if (attribute.ConstructorArguments[1].Value is not ITypeSymbol replacementTypeSymbol)
-                continue;
-
-            var replacementIdentifier = SyntaxFactory.IdentifierName(replacementTypeSymbol.Name);
-            var replacementSyntax = syntax.WithType(replacementIdentifier);
-
-            root = root!.ReplaceNode(syntax, replacementSyntax);
-            return document.WithSyntaxRoot(root);
-        }
-
-        return document;
-    }
-}

Robust.Analyzers/Robust.Analyzers.csproj

@@ -1,47 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>10</LangVersion>
+  </PropertyGroup>
+
   <ItemGroup>
-    <!-- Needed for NotNullableFlagAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" LinkBase="Implementations" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Needed for NotNullableFlagAnalyzer. -->
+    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" />
+  </ItemGroup>
+  
   <ItemGroup>
     <!-- Needed for FriendAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" />
+    <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Needed for PreferGenericVariantAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!-- Needed for PreferNonGenericVariantAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferNonGenericVariantForAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Needed for PreferOtherTypeAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferOtherTypeAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Needed for DataDefinitionAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Serialization\Manager\Definition\DataDefinitionUtility.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\ViewVariables\ViewVariablesAttribute.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\Serialization\NetSerializableAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
-  <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
-
-  <PropertyGroup>
-    <Nullable>disable</Nullable>
-    <!--
-    Rider seems to get really confused with hot reload if we directly compile in the above-linked classes.
-    As such, they have an #if to change their namespace in this project.
-    -->
-    <DefineConstants>$(DefineConstants);ROBUST_ANALYZERS_IMPL</DefineConstants>
-  </PropertyGroup>
-
 </Project>

Robust.Analyzers/SerializableAnalyzer.cs

@@ -10,7 +10,6 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers
 {

Robust.Analyzers/TaskResultAnalyzer.cs

@@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Benchmarks/Collections/ValueListEnumerationBenchmarks.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.Collections;
-
-namespace Robust.Benchmarks.Collections;
-
-[Virtual]
-public class ValueListEnumerationBenchmarks
-{
-    [Params(4, 16, 64)]
-    public int N { get; set; }
-
-    private sealed class Data(int i)
-    {
-        public readonly int I = i;
-    }
-
-    private ValueList<Data> _valueList;
-    private Data[] _array = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        var list = new List<Data>(N);
-        for (var i = 0; i < N; i++)
-        {
-            list.Add(new(i));
-        }
-
-        _array = list.ToArray();
-        _valueList = new(list.ToArray());
-    }
-
-    [Benchmark]
-    public int ValueList()
-    {
-        var total = 0;
-        foreach (var ev in _valueList)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int ValueListSpan()
-    {
-        var total = 0;
-        foreach (var ev in _valueList.Span)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int Array()
-    {
-        var total = 0;
-        foreach (var ev in _array)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int Span()
-    {
-        var total = 0;
-        foreach (var ev in _array.AsSpan())
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-}

Robust.Benchmarks/Configs/DefaultSQLConfig.cs

@@ -1,18 +1,15 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using BenchmarkDotNet.Analysers;
 using BenchmarkDotNet.Columns;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
-using BenchmarkDotNet.EventProcessors;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Filters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Order;
 using BenchmarkDotNet.Reports;
-using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Validators;
 using Robust.Benchmarks.Exporters;
 
@@ -26,8 +23,7 @@ public sealed class DefaultSQLConfig : IConfig
 
     public IEnumerable<IExporter> GetExporters()
     {
-        //yield return SQLExporter.Default;
-        yield break;
+        yield return SQLExporter.Default;
     }
 
     public IEnumerable<IColumnProvider> GetColumnProviders() => DefaultConfig.Instance.GetColumnProviders();
@@ -48,16 +44,10 @@ public sealed class DefaultSQLConfig : IConfig
 
     public IEnumerable<BenchmarkLogicalGroupRule> GetLogicalGroupRules() => DefaultConfig.Instance.GetLogicalGroupRules();
 
-    public IEnumerable<EventProcessor> GetEventProcessors() => DefaultConfig.Instance.GetEventProcessors();
-
-    public IEnumerable<IColumnHidingRule> GetColumnHidingRules() => DefaultConfig.Instance.GetColumnHidingRules();
     public IOrderer Orderer => DefaultConfig.Instance.Orderer!;
-    public ICategoryDiscoverer? CategoryDiscoverer => DefaultConfig.Instance.CategoryDiscoverer;
     public SummaryStyle SummaryStyle => DefaultConfig.Instance.SummaryStyle;
     public ConfigUnionRule UnionRule => DefaultConfig.Instance.UnionRule;
     public string ArtifactsPath => DefaultConfig.Instance.ArtifactsPath;
     public CultureInfo CultureInfo => DefaultConfig.Instance.CultureInfo!;
     public ConfigOptions Options => DefaultConfig.Instance.Options;
-    public TimeSpan BuildTimeout => DefaultConfig.Instance.BuildTimeout;
-    public IReadOnlyList<Conclusion> ConfigAnalysisConclusion => DefaultConfig.Instance.ConfigAnalysisConclusion;
 }

Robust.Benchmarks/EntityManager/AddRemoveComponentBenchmark.cs

@@ -26,8 +26,9 @@ public partial class AddRemoveComponentBenchmark
             .InitializeInstance();
 
         _entityManager = _simulation.Resolve<IEntityManager>();
-        var map = _simulation.CreateMap().Uid;
-        var coords = new EntityCoordinates(map, default);
+
+        var coords = new MapCoordinates(0, 0, new MapId(1));
+        _simulation.AddMap(coords.MapId);
 
         for (var i = 0; i < N; i++)
         {

Robust.Benchmarks/EntityManager/ComponentIteratorBenchmark.cs

@@ -29,8 +29,8 @@ public partial class ComponentIteratorBenchmark
 
         Comps = new A[N+2];
 
-        var map = _simulation.CreateMap().MapId;
-        var coords = new MapCoordinates(default, map);
+        var coords = new MapCoordinates(0, 0, new MapId(1));
+        _simulation.AddMap(coords.MapId);
 
         for (var i = 0; i < N; i++)
         {

Robust.Benchmarks/EntityManager/GetComponentBenchmark.cs

@@ -31,8 +31,8 @@ public partial class GetComponentBenchmark
 
         Comps = new A[N+2];
 
-        var map = _simulation.CreateMap().Uid;
-        var coords = new EntityCoordinates(map, default);
+        var coords = new MapCoordinates(0, 0, new MapId(1));
+        _simulation.AddMap(coords.MapId);
 
         for (var i = 0; i < N; i++)
         {

Robust.Benchmarks/EntityManager/HasComponentBenchmark.cs

@@ -1,96 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Engines;
-using JetBrains.Annotations;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.EntityManager;
-
-[Virtual]
-public partial class HasComponentBenchmark
-{
-    private static readonly Consumer Consumer = new();
-
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    private ComponentRegistration _compReg = default!;
-
-    private A _dummyA = new();
-
-    [UsedImplicitly]
-    [Params(1, 10, 100, 1000)]
-    public int N;
-
-    [GlobalSetup]
-    public void GlobalSetup()
-    {
-        _simulation = RobustServerSimulation
-            .NewSimulation()
-            .RegisterComponents(f => f.RegisterClass<A>())
-            .InitializeInstance();
-
-        _entityManager = _simulation.Resolve<IEntityManager>();
-        var map = _simulation.CreateMap().Uid;
-        var coords = new EntityCoordinates(map, default);
-        _compReg = _entityManager.ComponentFactory.GetRegistration(typeof(A));
-
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, coords);
-            _entityManager.AddComponent<A>(uid);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentGeneric()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent<A>(uid);
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentCompReg()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent(uid, _compReg);
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentType()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent(uid, typeof(A));
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentGetType()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var type = _dummyA.GetType();
-            var result = _entityManager.HasComponent(uid, type);
-            Consumer.Consume(result);
-        }
-    }
-
-    [ComponentProtoName("A")]
-    public sealed partial class A : Component
-    {
-    }
-}

Robust.Benchmarks/EntityManager/SpawnDeleteEntityBenchmark.cs

@@ -29,9 +29,10 @@ public partial class SpawnDeleteEntityBenchmark
             .InitializeInstance();
 
         _entityManager = _simulation.Resolve<IEntityManager>();
-        var (map, mapId) = _simulation.CreateMap();
-        _mapCoords = new MapCoordinates(default, mapId);
-        _entCoords = new EntityCoordinates(map, 0, 0);
+
+        _mapCoords = new MapCoordinates(0, 0, new MapId(1));
+        var uid = _simulation.AddMap(_mapCoords.MapId);
+        _entCoords = new EntityCoordinates(uid, 0, 0);
     }
 
     [Benchmark(Baseline = true)]

Robust.Benchmarks/Exporters/SQLExporter.cs

@@ -15,10 +15,11 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Npgsql;
 using Npgsql.Internal;
+using Npgsql.Internal.TypeHandlers;
+using Npgsql.Internal.TypeHandling;
 
 namespace Robust.Benchmarks.Exporters;
 
-/*
 public sealed class SQLExporter : IExporter
 {
     private static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions
@@ -97,9 +98,7 @@ public sealed class SQLExporter : IExporter
 
     public string Name => "sql";
 }
-*/
 
-/*
 // https://github.com/npgsql/efcore.pg/issues/1107#issuecomment-945126627
 class JsonOverrideTypeHandlerResolverFactory : TypeHandlerResolverFactory
 {
@@ -139,7 +138,6 @@ class JsonOverrideTypeHandlerResolverFactory : TypeHandlerResolverFactory
             => null; // Let the built-in resolver do this
     }
 }
-*/
 
 public sealed class DesignTimeContextFactoryPostgres : IDesignTimeDbContextFactory<BenchmarkContext>
 {

Robust.Benchmarks/Physics/BoxStackBenchmark.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Microsoft.Extensions.Configuration;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-[MediumRunJob]
-public class PhysicsBoxStackBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 30; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void BoxStack()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 10000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(-40, 0), new Vector2(40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-
-        var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10));
-        fixtures.CreateFixture(groundUid, "fix2", new Fixture(vertical, 2, 2, true), body: ground);
-
-        var xs = new[]
-        {
-            0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-        };
-
-        var columnCount = 1;
-        var rowCount = 15;
-        PolygonShape shape;
-
-        for (var j = 0; j < columnCount; j++)
-        {
-            for (var i = 0; i < rowCount; i++)
-            {
-                var x = 0.0f;
-
-                var boxUid = entManager.SpawnEntity(null,
-                    new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 1.1f * i), mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-
-                shape = new PolygonShape();
-                shape.SetAsBox(0.5f, 0.5f);
-                physics.SetFixedRotation(boxUid, false, body: box);
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true), body: box);
-
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-        }
-
-        physics.WakeBody(groundUid, body: ground);
-    }
-}

Robust.Benchmarks/Physics/CircleStackBenchmark.cs

@@ -1,92 +0,0 @@
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsCircleStackBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 30; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void CircleStack()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 10000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(-40, 0), new Vector2(40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-
-        var vertical = new EdgeShape(new Vector2(20, 0), new Vector2(20, 20));
-        fixtures.CreateFixture(groundUid, "fix2", new Fixture(vertical, 2, 2, true), body: ground);
-
-        var xs = new[]
-        {
-            0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-        };
-
-        var columnCount = 1;
-        var rowCount = 15;
-        PhysShapeCircle shape;
-
-        for (var j = 0; j < columnCount; j++)
-        {
-            for (var i = 0; i < rowCount; i++)
-            {
-                var x = 0.0f;
-
-                var boxUid = entManager.SpawnEntity(null,
-                    new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-                shape = new PhysShapeCircle(0.5f);
-                physics.SetFixedRotation(boxUid, false, body: box);
-                // TODO: Need to detect shape and work out if we need to use fixedrotation
-
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 5f));
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-        }
-
-        physics.WakeBody(groundUid, body: ground);
-    }
-}

Robust.Benchmarks/Physics/PyramidBenchmark.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsPyramidBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 300; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void Pyramid()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 5000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        const byte count = 20;
-
-        // Setup ground
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(40, 0), new Vector2(-40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-        physics.WakeBody(groundUid, body: ground);
-
-        // Setup boxes
-        float a = 0.5f;
-        PolygonShape shape = new();
-        shape.SetAsBox(a, a);
-
-        var x = new Vector2(-7.0f, 0.75f);
-        Vector2 y;
-        Vector2 deltaX = new Vector2(0.5625f, 1.25f);
-        Vector2 deltaY = new Vector2(1.125f, 0.0f);
-
-        for (var i = 0; i < count; ++i)
-        {
-            y = x;
-
-            for (var j = i; j < count; ++j)
-            {
-                var boxUid = entManager.SpawnEntity(null, new MapCoordinates(y, mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 5f), body: box);
-                y += deltaY;
-
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-
-            x += deltaX;
-        }
-    }
-}

Robust.Benchmarks/Physics/TumblerBenchmark.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsTumblerBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var mapUid = entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 300; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-            var boxUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 10f, mapId));
-            var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-            physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-            physics.SetFixedRotation(boxUid, false, body: box);
-            var shape = new PolygonShape();
-            shape.SetAsBox(0.125f, 0.125f);
-            fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 0.0625f), body: box);
-            physics.WakeBody(boxUid, body: box);
-            physics.SetSleepingAllowed(boxUid, box, false);
-        }
-
-        if (entManager.TryGetComponent(mapUid, out BroadphaseComponent? mapBroadphase))
-            entManager.System<SharedBroadphaseSystem>().RebuildBottomUp(mapBroadphase);
-    }
-
-    [Benchmark]
-    public void Tumbler()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 1000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var joints = entManager.System<SharedJointSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 0f, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-        // Due to lookup changes fixtureless bodies are invalid, so
-        var cShape = new PhysShapeCircle(1f);
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(cShape, 0, 0, false));
-
-        var bodyUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 10f, mapId));
-        var body = entManager.AddComponent<PhysicsComponent>(bodyUid);
-
-        physics.SetBodyType(bodyUid, BodyType.Dynamic, body: body);
-        physics.SetSleepingAllowed(bodyUid, body, false);
-        physics.SetFixedRotation(bodyUid, false, body: body);
-
-
-        // TODO: Box2D just deref, bleh shape structs someday
-        var shape1 = new PolygonShape();
-        shape1.SetAsBox(0.5f, 10.0f, new Vector2(10.0f, 0.0f), 0.0f);
-        fixtures.CreateFixture(bodyUid, "fix1", new Fixture(shape1, 2, 0, true, 20f));
-
-        var shape2 = new PolygonShape();
-        shape2.SetAsBox(0.5f, 10.0f, new Vector2(-10.0f, 0.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix2", new Fixture(shape2, 2, 0, true, 20f));
-
-        var shape3 = new PolygonShape();
-        shape3.SetAsBox(10.0f, 0.5f, new Vector2(0.0f, 10.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix3", new Fixture(shape3, 2, 0, true, 20f));
-
-        var shape4 = new PolygonShape();
-        shape4.SetAsBox(10.0f, 0.5f, new Vector2(0.0f, -10.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix4", new Fixture(shape4, 2, 0, true, 20f));
-
-        physics.WakeBody(groundUid, body: ground);
-        physics.WakeBody(bodyUid, body: body);
-        var revolute = joints.CreateRevoluteJoint(groundUid, bodyUid);
-        revolute.LocalAnchorA = new Vector2(0f, 10f);
-        revolute.LocalAnchorB = new Vector2(0f, 0f);
-        revolute.ReferenceAngle = 0f;
-        revolute.MotorSpeed = 0.05f * MathF.PI;
-        revolute.MaxMotorTorque = 100000000f;
-        revolute.EnableMotor = true;
-    }
-}

Robust.Benchmarks/Robust.Benchmarks.csproj

@@ -13,16 +13,12 @@
     <ProjectReference Include="..\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
-
-    <!-- Needed to pin transitive dependency versions. -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
-    <PackageReference Include="System.Formats.Asn1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
   </ItemGroup>
 
   <Import Project="..\MSBuild\Robust.Properties.targets" />

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Numerics;
-using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Robust.Server.Containers;
 using Robust.Server.GameStates;
@@ -12,9 +11,7 @@ using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
-using Robust.UnitTesting;
+using Robust.UnitTesting.Server;
 
 namespace Robust.Benchmarks.Transform;
 
@@ -22,176 +19,114 @@ namespace Robust.Benchmarks.Transform;
 /// This benchmark tests various transform/move related functions with an entity that has many children.
 /// </summary>
 [Virtual, MemoryDiagnoser]
-public class RecursiveMoveBenchmark : RobustIntegrationTest
+public class RecursiveMoveBenchmark
 {
+    private ISimulation _simulation = default!;
     private IEntityManager _entMan = default!;
     private SharedTransformSystem _transform = default!;
     private ContainerSystem _container = default!;
     private PvsSystem _pvs = default!;
     private EntityCoordinates _mapCoords;
     private EntityCoordinates _gridCoords;
-    private EntityCoordinates _gridCoords2;
     private EntityUid _ent;
     private EntityUid _child;
     private TransformComponent _childXform = default!;
     private EntityQuery<TransformComponent> _query;
-    private ICommonSession[] _players = default!;
-    private PvsSession _session = default!;
 
     [GlobalSetup]
     public void GlobalSetup()
     {
-        ProgramShared.PathOffset = "../../../../";
-        var server = StartServer();
-        var client = StartClient();
+        _simulation = RobustServerSimulation
+            .NewSimulation()
+            .InitializeInstance();
 
-        Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()).Wait();
-
-        var mapMan = server.ResolveDependency<IMapManager>();
-        _entMan = server.ResolveDependency<IEntityManager>();
-        var confMan = server.ResolveDependency<IConfigurationManager>();
-        var sPlayerMan = server.ResolveDependency<ISharedPlayerManager>();
+        if (!_simulation.Resolve<IConfigurationManager>().GetCVar(CVars.NetPVS))
+            throw new InvalidOperationException("PVS must be enabled");
 
+        _entMan = _simulation.Resolve<IEntityManager>();
         _transform = _entMan.System<SharedTransformSystem>();
         _container = _entMan.System<ContainerSystem>();
         _pvs = _entMan.System<PvsSystem>();
         _query = _entMan.GetEntityQuery<TransformComponent>();
+
+        // Create map & grid
+        var mapMan = _simulation.Resolve<IMapManager>();
         var mapSys = _entMan.System<SharedMapSystem>();
+        var mapId = mapMan.CreateMap();
+        var map = mapMan.GetMapEntityId(mapId);
+        var gridComp = mapMan.CreateGrid(mapId);
+        var grid = gridComp.Owner;
+        _gridCoords = new EntityCoordinates(grid, .5f, .5f);
+        _mapCoords = new EntityCoordinates(map, 100, 100);
+        mapSys.SetTile(grid, gridComp, Vector2i.Zero, new Tile(1));
 
-        var netMan = client.ResolveDependency<IClientNetManager>();
-        client.SetConnectTarget(server);
-        client.Post(() => netMan.ClientConnect(null!, 0, null!));
-        server.Post(() => confMan.SetCVar(CVars.NetPVS, true));
+        // Next, we will spawn our test entity. This entity will have a  complex transform/container hierarchy.
+        // This is intended to be representative of a typical SS14 player entity, with organs. clothing, and a full backpack.
+        _ent = _entMan.Spawn();
 
-        for (int i = 0; i < 10; i++)
+        // Quick check that SetCoordinates actually changes the parent as expected
+        // I.e., ensure that grid-traversal code doesn't just dump the entity on the map.
+        _transform.SetCoordinates(_ent, _gridCoords);
+        if (_query.GetComponent(_ent).ParentUid != _gridCoords.EntityId)
+            throw new Exception("Grid traversal error.");
+
+        _transform.SetCoordinates(_ent, _mapCoords);
+        if (_query.GetComponent(_ent).ParentUid != _mapCoords.EntityId)
+            throw new Exception("Grid traversal error.");
+
+        // Add 5 direct children in slots to represent clothing.
+        for (var i = 0; i < 5; i++)
         {
-            server.WaitRunTicks(1).Wait();
-            client.WaitRunTicks(1).Wait();
+            var id = $"inventory{i}";
+            _container.EnsureContainer<ContainerSlot>(_ent, id);
+            if (!_entMan.TrySpawnInContainer(null, _ent, id, out _))
+                throw new Exception($"Failed to setup entity");
         }
 
-        // Ensure client & server ticks are synced.
-        // Client runs 1 tick ahead
+        // body parts
+        _container.EnsureContainer<Container>(_ent, "body");
+        for (var i = 0; i < 5; i++)
         {
-            var sTick = (int)server.Timing.CurTick.Value;
-            var cTick = (int)client.Timing.CurTick.Value;
-            var delta = cTick - sTick;
-
-            if (delta > 1)
-                server.WaitRunTicks(delta - 1).Wait();
-            else if (delta < 1)
-                client.WaitRunTicks(1 - delta).Wait();
-
-            sTick = (int)server.Timing.CurTick.Value;
-            cTick = (int)client.Timing.CurTick.Value;
-            delta = cTick - sTick;
-            if (delta != 1)
-                throw new Exception("Failed setup");
-        }
-
-        // Set up map and spawn player
-        server.WaitPost(() =>
-        {
-            var map = server.ResolveDependency<SharedMapSystem>().CreateMap(out var mapId);
-            var gridComp = mapMan.CreateGridEntity(mapId);
-            var grid = gridComp.Owner;
-            mapSys.SetTile(grid, gridComp, Vector2i.Zero, new Tile(1));
-            _gridCoords = new EntityCoordinates(grid, .5f, .5f);
-            _gridCoords2 = new EntityCoordinates(grid, .5f, .6f);
-            _mapCoords = new EntityCoordinates(map, 100, 100);
-
-            var playerUid = _entMan.SpawnEntity(null, _mapCoords);
-
-            // Attach player.
-            var session = sPlayerMan.Sessions.First();
-            server.PlayerMan.SetAttachedEntity(session, playerUid);
-            sPlayerMan.JoinGame(session);
-
-            // Next, we will spawn our test entity. This entity will have a  complex transform/container hierarchy.
-            // This is intended to be representative of a typical SS14 player entity, with organs. clothing, and a full backpack.
-            _ent = _entMan.Spawn();
-
-            // Quick check that SetCoordinates actually changes the parent as expected
-            // I.e., ensure that grid-traversal code doesn't just dump the entity on the map.
-            _transform.SetCoordinates(_ent, _gridCoords);
-            if (_query.GetComponent(_ent).ParentUid != _gridCoords.EntityId)
-                throw new Exception("Grid traversal error.");
-
-            _transform.SetCoordinates(_ent, _mapCoords);
-            if (_query.GetComponent(_ent).ParentUid != _mapCoords.EntityId)
-                throw new Exception("Grid traversal error.");
-
-            // Add 5 direct children in slots to represent clothing.
-            for (var i = 0; i < 5; i++)
-            {
-                var id = $"inventory{i}";
-                _container.EnsureContainer<ContainerSlot>(_ent, id);
-                if (!_entMan.TrySpawnInContainer(null, _ent, id, out _))
-                    throw new Exception($"Failed to setup entity");
-            }
-
-            // body parts
-            _container.EnsureContainer<Container>(_ent, "body");
-            for (var i = 0; i < 5; i++)
-            {
-                // Simple organ
-                if (!_entMan.TrySpawnInContainer(null, _ent, "body", out _))
-                    throw new Exception($"Failed to setup entity");
-
-                // body part that has another body part / limb
-                if (!_entMan.TrySpawnInContainer(null, _ent, "body", out var limb))
-                    throw new Exception($"Failed to setup entity");
-
-                _container.EnsureContainer<ContainerSlot>(limb.Value, "limb");
-                if (!_entMan.TrySpawnInContainer(null, limb.Value, "limb", out _))
-                    throw new Exception($"Failed to setup entity");
-            }
-
-            // Backpack
-            _container.EnsureContainer<ContainerSlot>(_ent, "inventory-backpack");
-            if (!_entMan.TrySpawnInContainer(null, _ent, "inventory-backpack", out var backpack))
+            // Simple organ
+            if (!_entMan.TrySpawnInContainer(null, _ent, "body", out _))
                 throw new Exception($"Failed to setup entity");
 
-            // Misc backpack contents.
-            var backpackStorage = _container.EnsureContainer<Container>(backpack.Value, "storage");
-            for (var i = 0; i < 10; i++)
-            {
-                if (!_entMan.TrySpawnInContainer(null, backpack.Value, "storage", out _))
-                    throw new Exception($"Failed to setup entity");
-            }
+            // body part that has another body part / limb
+            if (!_entMan.TrySpawnInContainer(null, _ent, "body", out var limb))
+                throw new Exception($"Failed to setup entity");
 
-            // Emergency box inside of the backpack
-            var box = backpackStorage.ContainedEntities.First();
-            var boxContainer = _container.EnsureContainer<Container>(box, "storage");
-            for (var i = 0; i < 10; i++)
-            {
-                if (!_entMan.TrySpawnInContainer(null, box, "storage", out _))
-                    throw new Exception($"Failed to setup entity");
-            }
-
-            // Deepest child.
-            _child = boxContainer.ContainedEntities.First();
-            _childXform = _query.GetComponent(_child);
-
-            _players = new[] {session};
-            _session = _pvs.PlayerData[session];
-        }).Wait();
-
-        for (int i = 0; i < 10; i++)
-        {
-            server.WaitRunTicks(1).Wait();
-            client.WaitRunTicks(1).Wait();
+            _container.EnsureContainer<ContainerSlot>(limb.Value, "limb");
+            if (!_entMan.TrySpawnInContainer(null, limb.Value, "limb", out _))
+                throw new Exception($"Failed to setup entity");
         }
 
-        PvsTick();
-        PvsTick();
-    }
+        // Backpack
+        _container.EnsureContainer<ContainerSlot>(_ent, "inventory-backpack");
+        if (!_entMan.TrySpawnInContainer(null, _ent, "inventory-backpack", out var backpack))
+            throw new Exception($"Failed to setup entity");
 
-    private void PvsTick()
-    {
-        _session.ClearState();
-        _pvs.CacheSessionData(_players);
-        _pvs.GetVisibleChunks();
-        _pvs.ProcessVisibleChunksSequential();
+        // Misc backpack contents.
+        var backpackStorage = _container.EnsureContainer<Container>(backpack.Value, "storage");
+        for (var i = 0; i < 10; i++)
+        {
+            if (!_entMan.TrySpawnInContainer(null, backpack.Value, "storage", out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // Emergency box inside of the backpack
+        var box = backpackStorage.ContainedEntities.First();
+        var boxContainer = _container.EnsureContainer<Container>(box, "storage");
+        for (var i = 0; i < 10; i++)
+        {
+            if (!_entMan.TrySpawnInContainer(null, box, "storage", out _))
+                throw new Exception($"Failed to setup entity");
+        }
+
+        // Deepest child.
+        _child = boxContainer.ContainedEntities.First();
+        _childXform = _query.GetComponent(_child);
+
+        _pvs.ProcessCollections();
     }
 
     /// <summary>
@@ -205,13 +140,6 @@ public class RecursiveMoveBenchmark : RobustIntegrationTest
         _transform.SetCoordinates(_ent, _mapCoords);
     }
 
-    [Benchmark]
-    public void MoveEntityASmidge()
-    {
-        _transform.SetCoordinates(_ent, _gridCoords);
-        _transform.SetCoordinates(_ent, _gridCoords2);
-    }
-
     /// <summary>
     /// Like <see cref="MoveEntity"/>, but also processes queued PVS chunk updates.
     /// </summary>
@@ -219,18 +147,9 @@ public class RecursiveMoveBenchmark : RobustIntegrationTest
     public void MoveAndUpdateChunks()
     {
         _transform.SetCoordinates(_ent, _gridCoords);
-        PvsTick();
+        _pvs.ProcessCollections();
         _transform.SetCoordinates(_ent, _mapCoords);
-        PvsTick();
-    }
-
-    [Benchmark]
-    public void MoveASmidgeAndUpdateChunk()
-    {
-        _transform.SetCoordinates(_ent, _gridCoords);
-        PvsTick();
-        _transform.SetCoordinates(_ent, _gridCoords2);
-        PvsTick();
+        _pvs.ProcessCollections();
     }
 
     [Benchmark]

Robust.Client.Injectors/CompileRobustXamlTask.cs

@@ -1,8 +1,8 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.Build.Framework;
-using Robust.Xaml;
 
 namespace Robust.Build.Tasks
 {
@@ -37,12 +37,10 @@ namespace Robust.Build.Tasks
             var msg = $"CompileRobustXamlTask -> AssemblyFile:{AssemblyFile}, ProjectDirectory:{ProjectDirectory}, OutputPath:{OutputPath}";
             BuildEngine.LogMessage(msg, MessageImportance.High);
 
-            var res = XamlAotCompiler.Compile(
-                BuildEngine, input,
+            var res = XamlCompiler.Compile(BuildEngine, input,
                 File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
-                 OutputPath,
-                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null
-            );
+                ProjectDirectory, OutputPath,
+                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null);
             if (!res.success)
                 return false;
             if (!res.writtentofile)
@@ -67,24 +65,22 @@ namespace Robust.Build.Tasks
             return true;
         }
 
-        // PYREX NOTE: This project was comically null-unsafe before I touched it. I'm just marking what it did accurately
         [Required]
-        public string ReferencesFilePath { get; set; } = null!;
+        public string ReferencesFilePath { get; set; }
 
         [Required]
-
-        public string ProjectDirectory { get; set; } = null!;
+        public string ProjectDirectory { get; set; }
 
         [Required]
-        public string AssemblyFile { get; set; } = null!;
+        public string AssemblyFile { get; set; }
 
         [Required]
-        public string? OriginalCopyPath { get; set; } = null;
+        public string OriginalCopyPath { get; set; }
 
-        public string? OutputPath { get; set; }
-        public string UpdateBuildIndicator { get; set; } = null!;
+        public string OutputPath { get; set; }
+        public string UpdateBuildIndicator { get; set; }
 
-        public string AssemblyOriginatorKeyFile { get; set; } = null!;
+        public string AssemblyOriginatorKeyFile { get; set; }
         public bool SignAssembly { get; set; }
         public bool DelaySign { get; set; }
 
@@ -99,7 +95,7 @@ namespace Robust.Build.Tasks
             return rv;
         }
 
-        public IBuildEngine BuildEngine { get; set; } = null!;
-        public ITaskHost HostObject { get; set; } = null!;
+        public IBuildEngine BuildEngine { get; set; }
+        public ITaskHost HostObject { get; set; }
     }
 }

Robust.Client.Injectors/Extensions.cs

@@ -1,11 +1,11 @@
 using Microsoft.Build.Framework;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
     /// Taken from https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/Extensions.cs
     /// </summary>
-    internal static class Extensions
+    public static class Extensions
     {
         //shamefully copied from avalonia
         public static void LogMessage(this IBuildEngine engine, string message, MessageImportance imp)

Robust.Client.Injectors/MathParsing.cs

@@ -0,0 +1,37 @@
+using System.Linq;
+using Pidgin;
+using static Pidgin.Parser;
+
+
+namespace Robust.Build.Tasks
+{
+    public static class MathParsing
+    {
+        public static Parser<char, float> Single { get; } = Real.Select(c => (float) c);
+
+        public static Parser<char, float> Single1 { get; }
+            = Single.Between(SkipWhitespaces);
+
+        public static Parser<char, (float, float)> Single2 { get; }
+            = Single.Before(SkipWhitespaces).Repeat(2).Select(e =>
+            {
+                var arr = e.ToArray();
+                return (arr[0], arr[1]);
+            });
+
+        public static Parser<char, (float, float, float, float)> Single4 { get; }
+            = Single.Before(SkipWhitespaces).Repeat(4).Select(e =>
+            {
+                var arr = e.ToArray();
+                return (arr[0], arr[1], arr[2], arr[3]);
+            });
+
+        public static Parser<char, float[]> Thickness { get; }
+            = SkipWhitespaces.Then(
+                OneOf(
+                    Try(Single4.Select(c => new[] {c.Item1, c.Item2, c.Item3, c.Item4})),
+                    Try(Single2.Select(c => new[] {c.Item1, c.Item2})),
+                    Try(Single1.Select(c => new[] {c}))
+                ));
+    }
+}

Robust.Client.Injectors/Program.cs

@@ -55,11 +55,9 @@ namespace Robust.Build.Tasks
         public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties,
             IDictionary targetOutputs) => throw new NotSupportedException();
 
-        // PYREX NOTE: This project was extremely null-unsafe before I touched it. I'm just marking what it did already
-        // Here's the broken interface of IBuildEngine that we started with
-        public bool ContinueOnError => default;
-        public int LineNumberOfTaskNode => default;
-        public int ColumnNumberOfTaskNode => default;
-        public string ProjectFileOfTaskNode => null!;
+        public bool ContinueOnError { get; }
+        public int LineNumberOfTaskNode { get; }
+        public int ColumnNumberOfTaskNode { get; }
+        public string ProjectFileOfTaskNode { get; }
     }
 }

Robust.Client.Injectors/RXamlColorAstNode.cs

@@ -1,9 +1,10 @@
-using XamlX.Ast;
+using System.Reflection.Emit;
+using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     internal class RXamlColorAstNode
         : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode

Robust.Client.Injectors/RXamlVecLikeConstAstNode.cs

@@ -6,9 +6,9 @@ using XamlX.Emit;
 using XamlX.IL;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
-    internal abstract class RXamlVecLikeConstAstNode<T>
+    public abstract class RXamlVecLikeConstAstNode<T>
         : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode
         where T : unmanaged
     {
@@ -47,7 +47,7 @@ namespace Robust.Xaml
         }
     }
 
-    internal sealed class RXamlSingleVecLikeConstAstNode : RXamlVecLikeConstAstNode<float>
+    public sealed class RXamlSingleVecLikeConstAstNode : RXamlVecLikeConstAstNode<float>
     {
         public RXamlSingleVecLikeConstAstNode(
             IXamlLineInfo lineInfo,
@@ -69,7 +69,7 @@ namespace Robust.Xaml
         }
     }
 
-    internal sealed class RXamlInt32VecLikeConstAstNode : RXamlVecLikeConstAstNode<int>
+    public sealed class RXamlInt32VecLikeConstAstNode : RXamlVecLikeConstAstNode<int>
     {
         public RXamlInt32VecLikeConstAstNode(
             IXamlLineInfo lineInfo,

Robust.Client.Injectors/RXamlWellKnownTypes.cs

@@ -2,9 +2,9 @@
 using XamlX.Transform;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
-    internal class RXamlWellKnownTypes
+    class RXamlWellKnownTypes
     {
         public XamlTypeWellKnownTypes XamlIlTypes { get; }
         public IXamlType Single { get; }

Robust.Client.Injectors/Robust.Client.Injectors.csproj

@@ -1,30 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\MSBuild\Robust.Engine.props" />
 
-    <!--
-    PJB3005 (2024-08-24)
-    So the reason that Robust.Client.Injectors is NS2.0 is that Visual Studio 
-    still ships a .NET FX based MSBuild for some godforsaken reason. This means 
-    that when having Robust.Client.Injectors loaded directly by the main MSBuild 
-    process... that would break.
-
-    Except we don't do that anyways right now due to file locking issues, so maybe 
-    it's fine to give up on that. Whatever. 
-    -->
     <PropertyGroup>
-      <TargetFramework>netstandard2.0</TargetFramework>
-      <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-      <LangVersion>8.0</LangVersion>
-      <Nullable>enable</Nullable>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
-      <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+      <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" />
+      <PackageReference Include="Mono.Cecil" Version="0.11.3" />
+      <PackageReference Include="Pidgin" Version="2.5.0" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj" />
-      <ProjectReference Include="..\Robust.Xaml\Robust.Xaml.csproj" />
     </ItemGroup>
 </Project>

Robust.Client.Injectors/RobustXamlILCompiler.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Diagnostics;
+using System.Linq;
 using XamlX;
 using XamlX.Ast;
 using XamlX.Emit;
@@ -6,7 +7,7 @@ using XamlX.IL;
 using XamlX.Transform;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
     /// Emitters & Transformers based on:
@@ -14,7 +15,7 @@ namespace Robust.Xaml
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AddNameScopeRegistration.cs
     /// - https://github.com/AvaloniaUI/Avalonia/blob/afb8ae6f3c517dae912729511483995b16cb31af/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
     /// </summary>
-    internal class RobustXamlILCompiler : XamlILCompiler
+    public class RobustXamlILCompiler : XamlILCompiler
     {
         public RobustXamlILCompiler(TransformerConfiguration configuration, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings, bool fillWithDefaults) : base(configuration, emitMappings, fillWithDefaults)
         {
@@ -40,9 +41,8 @@ namespace Robust.Xaml
                             && mg.Children.OfType<RobustNameScopeRegistrationXamlIlNode>().Any())
                             return node;
 
-                        IXamlAstValueNode? value = null;
+                        IXamlAstValueNode value = null;
                         for (var c = 0; c < pa.Values.Count; c++)
-                        {
                             if (pa.Values[c].Type.GetClrType().Equals(context.Configuration.WellKnownTypes.String))
                             {
                                 value = pa.Values[c];
@@ -57,7 +57,6 @@ namespace Robust.Xaml
 
                                 break;
                             }
-                        }
 
                         if (value != null)
                         {
@@ -85,9 +84,9 @@ namespace Robust.Xaml
             class RobustNameScopeRegistrationXamlIlNode : XamlAstNode, IXamlAstManipulationNode
             {
                 public IXamlAstValueNode Name { get; set; }
-                public IXamlType? TargetType { get; }
+                public IXamlType TargetType { get; }
 
-                public RobustNameScopeRegistrationXamlIlNode(IXamlAstValueNode name, IXamlType? targetType) : base(name)
+                public RobustNameScopeRegistrationXamlIlNode(IXamlAstValueNode name, IXamlType targetType) : base(name)
                 {
                     TargetType = targetType;
                     Name = name;
@@ -105,7 +104,7 @@ namespace Robust.Xaml
                     {
 
                         var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                            f.Name == XamlCustomizations.ContextNameScopeFieldName);
+                            f.Name == XamlCompiler.ContextNameScopeFieldName);
                         var namescopeRegisterFunction = context.Configuration.TypeSystem
                             .FindType("Robust.Client.UserInterface.XAML.NameScope").Methods
                             .First(m => m.Name == "Register");
@@ -129,7 +128,7 @@ namespace Robust.Xaml
 
                         return XamlILNodeEmitResult.Void(1);
                     }
-                    return default!;  // PYREX NOTE: This doesn't seem safe! But it's what we were doing before Nullable
+                    return default;
                 }
             }
         }
@@ -162,7 +161,7 @@ namespace Robust.Xaml
                 {
                     if (!(node is HandleRootObjectScopeNode))
                     {
-                        return null!;  // PYREX NOTE: This doesn't seem safe, but it predates Nullable on this file
+                        return null;
                     }
 
                     var controlType = context.Configuration.TypeSystem.FindType("Robust.Client.UserInterface.Control");
@@ -171,7 +170,7 @@ namespace Robust.Xaml
                     var dontAbsorb = codeGen.DefineLabel();
                     var end = codeGen.DefineLabel();
                     var contextScopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                        f.Name == XamlCustomizations.ContextNameScopeFieldName);
+                        f.Name == XamlCompiler.ContextNameScopeFieldName);
                     var controlNameScopeField = controlType.Fields.First(f => f.Name == "NameScope");
                     var nameScopeType = context.Configuration.TypeSystem
                         .FindType("Robust.Client.UserInterface.XAML.NameScope");

Robust.Client.Injectors/XamlCompiler.Helpers.cs

@@ -1,23 +1,33 @@
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Collections.Generic;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
-    /// Helpers taken from AvaloniaUI on GitHub.
-    /// </summary>
-    /// <remarks>
+    /// Helpers taken from:
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
-    /// </remarks>
-    internal partial class XamlAotCompiler
+    /// </summary>
+    public partial class XamlCompiler
     {
-        private static readonly string[] NameSuffixes = {".xaml", ".paml", ".axaml"};
+        static bool CheckXamlName(IResource r) => r.Name.ToLowerInvariant().EndsWith(".xaml")
+                                                  || r.Name.ToLowerInvariant().EndsWith(".paml")
+                                                  || r.Name.ToLowerInvariant().EndsWith(".axaml");
 
-        static bool CheckXamlName(IResource r) =>
-            NameSuffixes.Any(suffix => r.Name.ToLowerInvariant().EndsWith(suffix));
+        private static bool MatchThisCall(Collection<Instruction> instructions, int idx)
+        {
+            var i = instructions[idx];
+            // A "normal" way of passing `this` to a static method:
+
+            // ldarg.0
+            // call void [Avalonia.Markup.Xaml]Avalonia.Markup.Xaml.AvaloniaXamlLoader::Load(object)
+
+            return i.OpCode == OpCodes.Ldarg_0 || (i.OpCode == OpCodes.Ldarg && i.Operand?.Equals(0) == true);
+        }
 
         interface IResource : IFileSource
         {

Robust.Client.Injectors/XamlCompiler.cs

@@ -0,0 +1,388 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Cecil.Rocks;
+using Pidgin;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Parsers;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Robust.Build.Tasks
+{
+    /// <summary>
+    /// Based on https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+    /// Adjusted for our UI-Framework
+    /// </summary>
+    public partial class XamlCompiler
+    {
+        public static (bool success, bool writtentofile) Compile(IBuildEngine engine, string input, string[] references,
+            string projectDirectory, string output, string strongNameKey)
+        {
+            var typeSystem = new CecilTypeSystem(references
+                .Where(r => !r.ToLowerInvariant().EndsWith("robust.build.tasks.dll"))
+                .Concat(new[] { input }), input);
+
+            var asm = typeSystem.TargetAssemblyDefinition;
+
+            if (asm.MainModule.GetType("CompiledRobustXaml", "XamlIlContext") != null)
+            {
+                // If this type exists, the assembly has already been processed by us.
+                // Do not run again, it would corrupt the file.
+                // This *shouldn't* be possible due to Inputs/Outputs dependencies in the build system,
+                // but better safe than sorry eh?
+                engine.LogWarningEvent(new BuildWarningEventArgs("XAMLIL", "", "", 0, 0, 0, 0, "Ran twice on same assembly file; ignoring.", "", ""));
+                return (true, false);
+            }
+
+            var compileRes = CompileCore(engine, typeSystem);
+            if (compileRes == null)
+                return (true, false);
+            if (compileRes == false)
+                return (false, false);
+
+            var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols };
+            if (!string.IsNullOrWhiteSpace(strongNameKey))
+                writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
+
+            asm.Write(output, writerParameters);
+
+            return (true, true);
+
+        }
+
+        static bool? CompileCore(IBuildEngine engine, CecilTypeSystem typeSystem)
+        {
+            var asm = typeSystem.TargetAssemblyDefinition;
+            var embrsc = new EmbeddedResources(asm);
+
+            if (embrsc.Resources.Count(CheckXamlName) == 0)
+                // Nothing to do
+                return null;
+
+            var xamlLanguage = new XamlLanguageTypeMappings(typeSystem)
+            {
+                XmlnsAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.XmlnsDefinitionAttribute"),
+
+                },
+                ContentAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.ContentAttribute")
+                },
+                UsableDuringInitializationAttributes =
+                {
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.UsableDuringInitializationAttribute")
+                },
+                DeferredContentPropertyAttributes =
+                {
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.DeferredContentAttribute")
+                },
+                RootObjectProvider = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestRootObjectProvider"),
+                UriContextProvider = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestUriContext"),
+                ProvideValueTarget = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestProvideValueTarget"),
+            };
+            var emitConfig = new XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult>
+            {
+                ContextTypeBuilderCallback = (b,c) => EmitNameScopeField(xamlLanguage, typeSystem, b, c)
+            };
+
+            var transformerconfig = new TransformerConfiguration(
+                typeSystem,
+                typeSystem.TargetAssembly,
+                xamlLanguage,
+                XamlXmlnsMappings.Resolve(typeSystem, xamlLanguage), CustomValueConverter);
+
+            var contextDef = new TypeDefinition("CompiledRobustXaml", "XamlIlContext",
+                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
+            asm.MainModule.Types.Add(contextDef);
+            var contextClass = XamlILContextDefinition.GenerateContextClass(typeSystem.CreateTypeBuilder(contextDef), typeSystem,
+                xamlLanguage, emitConfig);
+
+            var compiler =
+                new RobustXamlILCompiler(transformerconfig, emitConfig, true);
+
+            bool CompileGroup(IResourceGroup group)
+            {
+                var typeDef = new TypeDefinition("CompiledRobustXaml", "!" + group.Name, TypeAttributes.Class,
+                    asm.MainModule.TypeSystem.Object);
+
+                //typeDef.CustomAttributes.Add(new CustomAttribute(ed));
+                asm.MainModule.Types.Add(typeDef);
+                var builder = typeSystem.CreateTypeBuilder(typeDef);
+
+                foreach (var res in group.Resources.Where(CheckXamlName))
+                {
+                    try
+                    {
+                        engine.LogMessage($"XAMLIL: {res.Name} -> {res.Uri}", MessageImportance.Low);
+
+                        var xaml = new StreamReader(new MemoryStream(res.FileContents)).ReadToEnd();
+                        var parsed = XDocumentXamlParser.Parse(xaml);
+
+                        var initialRoot = (XamlAstObjectNode) parsed.Root;
+
+                        var classDirective = initialRoot.Children.OfType<XamlAstXmlDirective>()
+                            .FirstOrDefault(d => d.Namespace == XamlNamespaces.Xaml2006 && d.Name == "Class");
+                        string classname;
+                        if (classDirective != null && classDirective.Values[0] is XamlAstTextNode tn)
+                        {
+                            classname = tn.Text;
+                        }
+                        else
+                        {
+                            classname = res.Name.Replace(".xaml","");
+                        }
+
+                        var classType = typeSystem.TargetAssembly.FindType(classname);
+                        if (classType == null)
+                            throw new Exception($"Unable to find type '{classname}'");
+
+                        compiler.Transform(parsed);
+
+                        var populateName = $"Populate:{res.Name}";
+                        var buildName = $"Build:{res.Name}";
+
+                        var classTypeDefinition = typeSystem.GetTypeReference(classType).Resolve();
+
+                        var populateBuilder = typeSystem.CreateTypeBuilder(classTypeDefinition);
+
+                        compiler.Compile(parsed, contextClass,
+                            compiler.DefinePopulateMethod(populateBuilder, parsed, populateName,
+                                classTypeDefinition == null),
+                            compiler.DefineBuildMethod(builder, parsed, buildName, true),
+                            null,
+                            (closureName, closureBaseType) =>
+                                populateBuilder.DefineSubType(closureBaseType, closureName, false),
+                            res.Uri, res
+                        );
+
+                        //add compiled populate method
+                        var compiledPopulateMethod = typeSystem.GetTypeReference(populateBuilder).Resolve().Methods
+                            .First(m => m.Name == populateName);
+
+                        const string TrampolineName = "!XamlIlPopulateTrampoline";
+                        var trampoline = new MethodDefinition(TrampolineName,
+                            MethodAttributes.Static | MethodAttributes.Private, asm.MainModule.TypeSystem.Void);
+                        trampoline.Parameters.Add(new ParameterDefinition(classTypeDefinition));
+                        classTypeDefinition.Methods.Add(trampoline);
+
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ldnull));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_0));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Call, compiledPopulateMethod));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
+
+                        var foundXamlLoader = false;
+                        // Find RobustXamlLoader.Load(this) and replace it with !XamlIlPopulateTrampoline(this)
+                        foreach (var method in classTypeDefinition.Methods
+                            .Where(m => !m.Attributes.HasFlag(MethodAttributes.Static)))
+                        {
+                            var i = method.Body.Instructions;
+                            for (var c = 1; c < i.Count; c++)
+                            {
+                                if (i[c].OpCode == OpCodes.Call)
+                                {
+                                    var op = i[c].Operand as MethodReference;
+
+                                    if (op != null
+                                        && op.Name == TrampolineName)
+                                    {
+                                        foundXamlLoader = true;
+                                        break;
+                                    }
+
+                                    if (op != null
+                                        && op.Name == "Load"
+                                        && op.Parameters.Count == 1
+                                        && op.Parameters[0].ParameterType.FullName == "System.Object"
+                                        && op.DeclaringType.FullName == "Robust.Client.UserInterface.XAML.RobustXamlLoader")
+                                    {
+                                        if (MatchThisCall(i, c - 1))
+                                        {
+                                            i[c].Operand = trampoline;
+                                            foundXamlLoader = true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        if (!foundXamlLoader)
+                        {
+                            var ctors = classTypeDefinition.GetConstructors()
+                                .Where(c => !c.IsStatic).ToList();
+                            // We can inject xaml loader into default constructor
+                            if (ctors.Count == 1 && ctors[0].Body.Instructions.Count(o=>o.OpCode != OpCodes.Nop) == 3)
+                            {
+                                var i = ctors[0].Body.Instructions;
+                                var retIdx = i.IndexOf(i.Last(x => x.OpCode == OpCodes.Ret));
+                                i.Insert(retIdx, Instruction.Create(OpCodes.Call, trampoline));
+                                i.Insert(retIdx, Instruction.Create(OpCodes.Ldarg_0));
+                            }
+                            else
+                            {
+                                throw new InvalidProgramException(
+                                    $"No call to RobustXamlLoader.Load(this) call found anywhere in the type {classType.FullName} and type seems to have custom constructors.");
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        engine.LogErrorEvent(new BuildErrorEventArgs("XAMLIL", "", res.FilePath, 0, 0, 0, 0,
+                            $"{res.FilePath}: {e.Message}", "", "CompileRobustXaml"));
+                    }
+                }
+                return true;
+            }
+
+            if (embrsc.Resources.Count(CheckXamlName) != 0)
+            {
+                if (!CompileGroup(embrsc))
+                    return false;
+            }
+
+            return true;
+        }
+
+        private static bool CustomValueConverter(
+            AstTransformationContext context,
+            IXamlAstValueNode node,
+            IXamlType type,
+            out IXamlAstValueNode result)
+        {
+            if (!(node is XamlAstTextNode textNode))
+            {
+                result = null;
+                return false;
+            }
+
+            var text = textNode.Text;
+            var types = context.GetRobustTypes();
+
+            if (type.Equals(types.Vector2))
+            {
+                var foo = MathParsing.Single2.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Vector2", node);
+
+                var (x, y) = foo.Value;
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Vector2, types.Vector2ConstructorFull,
+                    types.Single, new[] {x, y});
+                return true;
+            }
+
+            if (type.Equals(types.Thickness))
+            {
+                var foo = MathParsing.Thickness.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Thickness", node);
+
+                var val = foo.Value;
+                float[] full;
+                if (val.Length == 1)
+                {
+                    var u = val[0];
+                    full = new[] {u, u, u, u};
+                }
+                else if (val.Length == 2)
+                {
+                    var h = val[0];
+                    var v = val[1];
+                    full = new[] {h, v, h, v};
+                }
+                else // 4
+                {
+                    full = val;
+                }
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Thickness, types.ThicknessConstructorFull,
+                    types.Single, full);
+                return true;
+            }
+
+            if (type.Equals(types.Thickness))
+            {
+                var foo = MathParsing.Thickness.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Thickness", node);
+
+                var val = foo.Value;
+                float[] full;
+                if (val.Length == 1)
+                {
+                    var u = val[0];
+                    full = new[] {u, u, u, u};
+                }
+                else if (val.Length == 2)
+                {
+                    var h = val[0];
+                    var v = val[1];
+                    full = new[] {h, v, h, v};
+                }
+                else // 4
+                {
+                    full = val;
+                }
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Thickness, types.ThicknessConstructorFull,
+                    types.Single, full);
+                return true;
+            }
+
+            if (type.Equals(types.Color))
+            {
+                // TODO: Interpret these colors at XAML compile time instead of at runtime.
+                result = new RXamlColorAstNode(node, types, text);
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        public const string ContextNameScopeFieldName = "RobustNameScope";
+
+        private static void EmitNameScopeField(XamlLanguageTypeMappings xamlLanguage, CecilTypeSystem typeSystem, IXamlTypeBuilder<IXamlILEmitter> typeBuilder, IXamlILEmitter constructor)
+        {
+            var nameScopeType = typeSystem.FindType("Robust.Client.UserInterface.XAML.NameScope");
+            var field = typeBuilder.DefineField(nameScopeType,
+                ContextNameScopeFieldName, true, false);
+            constructor
+                .Ldarg_0()
+                .Newobj(nameScopeType.GetConstructor())
+                .Stfld(field);
+        }
+    }
+
+    interface IResource : IFileSource
+    {
+        string Uri { get; }
+        string Name { get; }
+        void Remove();
+
+    }
+
+    interface IResourceGroup
+    {
+        string Name { get; }
+        IEnumerable<IResource> Resources { get; }
+    }
+}

Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj

@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Link="XamlX\filename" Include="../XamlX/src/XamlX/**/*.cs" />
     <Compile Remove="../XamlX/src/XamlX/**/SreTypeSystem.cs" />
     <Compile Remove="../XamlX/src/XamlX/obj/**" />
     <Compile Include="..\Robust.Client\UserInterface\ControlPropertyAccess.cs" />
   </ItemGroup>
-
-  <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
-
-  <PropertyGroup>
-    <!-- XamlX doesn't do NRTs. -->
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
-
 </Project>

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -15,9 +15,6 @@ using XamlX.Transform;
 using XamlX.Transform.Transformers;
 using XamlX.TypeSystem;
 
-// Yes dude I know this source generator isn't incremental, I'll fix it eventually.
-#pragma warning disable RS1035
-
 namespace Robust.Client.NameGenerator
 {
     /// <summary>

Robust.Client.WebView/Cef/BaseRobustCefClient.cs

@@ -1,87 +0,0 @@
-using Xilium.CefGlue;
-
-namespace Robust.Client.WebView.Cef;
-
-/// <summary>
-/// Shared functionality for all <see cref="CefClient"/> implementations.
-/// </summary>
-/// <remarks>
-/// Locks down a bunch of CEF functionality we absolutely do not need content to do right now.
-/// </remarks>
-internal abstract class BaseRobustCefClient : CefClient
-{
-    private readonly RobustCefPrintHandler _printHandler = new();
-    private readonly RobustCefPermissionHandler _permissionHandler = new();
-    private readonly RobustCefDialogHandler _dialogHandler = new();
-    private readonly RobustCefDragHandler _dragHandler = new();
-
-    protected override CefPrintHandler GetPrintHandler() => _printHandler;
-    protected override CefPermissionHandler GetPermissionHandler() => _permissionHandler;
-    protected override CefDialogHandler GetDialogHandler() => _dialogHandler;
-    protected override CefDragHandler GetDragHandler() => _dragHandler;
-
-    private sealed class RobustCefPrintHandler : CefPrintHandler
-    {
-        protected override void OnPrintSettings(CefBrowser browser, CefPrintSettings settings, bool getDefaults)
-        {
-        }
-
-        protected override bool OnPrintDialog(CefBrowser browser, bool hasSelection, CefPrintDialogCallback callback)
-        {
-            return false;
-        }
-
-        protected override bool OnPrintJob(CefBrowser browser, string documentName, string pdfFilePath, CefPrintJobCallback callback)
-        {
-            return false;
-        }
-
-        protected override void OnPrintReset(CefBrowser browser)
-        {
-        }
-    }
-
-    private sealed class RobustCefPermissionHandler : CefPermissionHandler
-    {
-        protected override bool OnRequestMediaAccessPermission(
-            CefBrowser browser,
-            CefFrame frame,
-            string requestingOrigin,
-            CefMediaAccessPermissionTypes requestedPermissions,
-            CefMediaAccessCallback callback)
-        {
-            callback.Cancel();
-
-            return true;
-        }
-    }
-
-    private sealed class RobustCefDialogHandler : CefDialogHandler
-    {
-        protected override bool OnFileDialog(
-            CefBrowser browser,
-            CefFileDialogMode mode,
-            string title,
-            string defaultFilePath,
-            string[] acceptFilters,
-            string[] acceptExtensions,
-            string[] acceptDescriptions,
-            CefFileDialogCallback callback)
-        {
-            callback.Cancel();
-            return true;
-        }
-    }
-
-    private sealed class RobustCefDragHandler : CefDragHandler
-    {
-        protected override bool OnDragEnter(CefBrowser browser, CefDragData dragData, CefDragOperationsMask mask)
-        {
-            return true;
-        }
-
-        protected override void OnDraggableRegionsChanged(CefBrowser browser, CefFrame frame, CefDraggableRegion[] regions)
-        {
-        }
-    }
-}

Robust.Client.WebView/Cef/Program.cs

@@ -1,12 +1,9 @@
 using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Threading;
 using Xilium.CefGlue;
 
 namespace Robust.Client.WebView.Cef
 {
-    internal static class Program
+    public static class Program
     {
         // This was supposed to be the main entry for the subprocess program... It doesn't work.
         public static int Main(string[] args)
@@ -22,8 +19,6 @@ namespace Robust.Client.WebView.Cef
 
             var mainArgs = new CefMainArgs(argv);
 
-            StartWatchThread();
-
             // This will block executing until the subprocess is shut down.
             var code = CefRuntime.ExecuteProcess(mainArgs, new RobustCefApp(null), IntPtr.Zero);
 
@@ -34,44 +29,5 @@ namespace Robust.Client.WebView.Cef
 
             return code;
         }
-
-        private static void StartWatchThread()
-        {
-            //
-            // CEF has this nasty habit of not shutting down all its processes if the parent crashes.
-            // Great!
-            //
-            // We use a separate thread in each CEF child process to watch the main PID.
-            // If it exits, we kill ourselves after a couple seconds.
-            //
-
-            if (Environment.GetEnvironmentVariable("ROBUST_CEF_BROWSER_PROCESS_ID") is not { } parentIdString)
-                return;
-
-            if (Environment.GetEnvironmentVariable("ROBUST_CEF_BROWSER_PROCESS_MODULE") is not { } parentModuleString)
-                return;
-
-            if (!int.TryParse(parentIdString, CultureInfo.InvariantCulture, out var parentId))
-                return;
-
-            var process = Process.GetProcessById(parentId);
-            if ((process.MainModule?.FileName ?? "") != parentModuleString)
-            {
-                process.Dispose();
-                return;
-            }
-
-            new Thread(() => WatchThread(process)) { Name = "CEF Watch Thread", IsBackground = true }
-                .Start();
-        }
-
-        private static void WatchThread(Process p)
-        {
-            p.WaitForExit();
-
-            Thread.Sleep(3000);
-
-            Environment.Exit(1);
-        }
     }
 }

Robust.Client.WebView/Cef/RequestResults.cs

@@ -76,9 +76,12 @@ namespace Robust.Client.WebView.Cef
                 return true;
             }
 
-            protected override bool Read(Span<byte> response, out int bytesRead, CefResourceReadCallback callback)
+            protected override unsafe bool Read(IntPtr dataOut, int bytesToRead, out int bytesRead, CefResourceReadCallback callback)
             {
-                bytesRead = _stream.Read(response);
+                var byteSpan = new Span<byte>((void*) dataOut, bytesToRead);
+
+                bytesRead = _stream.Read(byteSpan);
+
                 return bytesRead != 0;
             }
 

Robust.Client.WebView/Cef/RobustCefApp.cs

@@ -31,12 +31,10 @@ namespace Robust.Client.WebView.Cef
             // Disable zygote on Linux.
             commandLine.AppendSwitch("--no-zygote");
 
-            // Work around https://github.com/chromiumembedded/cef/issues/3213
+            // Work around https://bitbucket.org/chromiumembedded/cef/issues/3213/ozone-egl-initialization-does-not-have
             // Desktop GL force makes Chromium not try to load its own ANGLE/Swiftshader so load paths aren't problematic.
-            // UPDATE: That bug got fixed and now this workaround breaks CEF.
-            // Keeping all this comment history in case I ever wanan remember what the `--use-gl` flag is.
-            //if (OperatingSystem.IsLinux())
-            //    commandLine.AppendSwitch("--use-gl", "desktop");
+            if (OperatingSystem.IsLinux())
+                commandLine.AppendSwitch("--use-gl", "desktop");
 
             // commandLine.AppendSwitch("--single-process");
 
@@ -44,8 +42,6 @@ namespace Robust.Client.WebView.Cef
             //commandLine.AppendSwitch("--disable-gpu-compositing");
             //commandLine.AppendSwitch("--in-process-gpu");
 
-            commandLine.AppendSwitch("--off-screen-rendering-enabled");
-
             commandLine.AppendSwitch("disable-threaded-scrolling", "1");
             commandLine.AppendSwitch("disable-features", "TouchpadAndWheelScrollLatching,AsyncWheelEvents");