Make DOOM work

I think I lost this work originally

.appveyor.yml

@@ -0,0 +1,52 @@
+environment:
+  sonarqubekey:
+    secure: h3llq6OeVa94hJ71UOEQSQDq75vFt+doso7iFry0gvt/fFcyeonY9wY+ETOIVITK
+  global:
+    PYTHONUNBUFFERED: True
+    HEADLESS: 1  # For the unit tests.
+
+version: 0.1.0.{build}
+pull_requests:
+  do_not_increment_build_number: true
+
+image: Visual Studio 2019
+install:
+- ps: >
+    if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -Eq "master")
+    {
+      cinst msbuild-sonarqube-runner;
+    }
+
+before_build:
+- cmd: py -3.5 -m pip install --user requests
+- cmd: git submodule update --init --recursive
+- ps: >
+    if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -Eq "master")
+    {
+      SonarScanner.MSBuild.exe begin /k:"ss14" /d:"sonar.host.url=https://sonarcloud.io" /d:"sonar.login=$env:sonarqubekey" /o:"space-wizards" /d:sonar.cs.nunit.reportsPaths="$(Get-Location)\nunitTestResult.xml";
+    }
+
+platform: x64
+configuration: Debug
+
+cache:
+- packages -> **\*.csproj
+- Dependencies
+
+build:
+  project: RobustToolbox.sln
+  parallel: false
+  verbosity: minimal
+
+build_script:
+- ps: dotnet build RobustToolbox.sln /p:AppVeyor=yes
+
+test_script:
+- ps: dotnet test Robust.UnitTesting/Robust.UnitTesting.csproj
+
+after_test:
+- ps: >
+    if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -Eq "master")
+    {
+      SonarScanner.MSBuild.exe end /d:"sonar.login=$env:sonarqubekey";
+    }

.github/CODEOWNERS

@@ -1,20 +1,7 @@
 # Last match in file takes precedence.
 
-# Ping for all PRs
-* @Acruid @PJB3005 @Silvertorch5
-
-/Robust.*/Audio/Midi/ @Zumorica
-
-/Robust.Client.NameGenerator @PaulRitter
-/Robust.Client.Injectors @PaulRitter
-/Robust.Generators @PaulRitter
-/Robust.Analyzers @PaulRitter
-/Robust.*/GameStates @PaulRitter
-/Robust.Shared/Analyzers @PaulRitter
-/Robust.*/Serialization @PaulRitter @DrSmugleaf
-/Robust.*/Prototypes @PaulRitter
-/Robust.Shared/GameObjects/ComponentDependencies @PaulRitter
-/Robust.*/Containers @PaulRitter
-
 # Be they Fluent translations or Freemarker templates, I know them both!
 *.ftl @RemieRichards
+
+# Ping for all PRs
+* @Acruid @PJB3005 @Silvertorch5

.github/workflows/benchmarks.yml

@@ -1,35 +0,0 @@
-name: Benchmarks
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 5 * * *'
-  push:
-    tags:
-      - 'v*'
-
-concurrency: benchmarks
-
-env:
-  ROBUST_BENCHMARKS_ENABLE_SQL: 1
-  ROBUST_BENCHMARKS_SQL_ADDRESS: ${{ secrets.BENCHMARKS_WRITE_ADDRESS }}
-  ROBUST_BENCHMARKS_SQL_PORT: ${{ secrets.BENCHMARKS_WRITE_PORT }}
-  ROBUST_BENCHMARKS_SQL_USER: ${{ secrets.BENCHMARKS_WRITE_USER }}
-  ROBUST_BENCHMARKS_SQL_PASSWORD: ${{ secrets.BENCHMARKS_WRITE_PASSWORD }}
-  ROBUST_BENCHMARKS_SQL_DATABASE: benchmarks
-
-jobs:
-  benchmark:
-    name: Run Benchmarks
-    runs-on: ubuntu-latest
-    steps:
-    - name: Run script on centcomm
-      uses: appleboy/ssh-action@master
-      with:
-        host: centcomm.spacestation14.io
-        username: robust-benchmark-runner
-        key: ${{ secrets.CENTCOMM_ROBUST_BENCHMARK_RUNNER_KEY }}
-        command_timeout: 100000m 
-        script: |
-          wget https://raw.githubusercontent.com/space-wizards/RobustToolbox/${{ github.sha }}/Tools/run_benchmarks.py
-          python3 run_benchmarks.py "${{ secrets.BENCHMARKS_WRITE_ADDRESS }}" "${{ secrets.BENCHMARKS_WRITE_PORT }}" "${{ secrets.BENCHMARKS_WRITE_USER }}" "${{ secrets.BENCHMARKS_WRITE_PASSWORD }}" "${{ github.sha }}"
-          rm run_benchmarks.py

.github/workflows/build-docfx.yml

@@ -1,34 +0,0 @@
-name: Build & Publish DocFX
-
-on:
-  schedule:
-    - cron: "0 0 * * 0"
-jobs:
-  docfx:
-   runs-on: ubuntu-latest
-   steps: 
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
-        
-    - name: Install dependencies
-      run: dotnet restore
-      
-    - 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: 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

@@ -22,12 +22,10 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 5.0.100
     - 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
- 
-
+      run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -v n

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 5.0.100
 
     - name: Build
       run: dotnet build

.github/workflows/publish-client.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 5.0.100
 
     - name: Package client
       run: Tools/package_client_build.py -p windows mac linux

.github/workflows/test-content.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 5.0.100
     - name: Disable submodule autoupdate
       run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 
@@ -38,4 +38,4 @@ jobs:
     - 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
+      run: dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n

.gitignore

@@ -41,6 +41,18 @@ _ReSharper*/
 
 # Resources
 *.resources
+/Resources/textures/Animations/*.*
+/Resources/ResourcePack.zip
+/Resources/textures/*_Animations.png
+/Resources/textures/*_Decals.png
+/Resources/textures/*_Effects.png
+/Resources/textures/*_Items.png
+/Resources/textures/*_Objects.png
+/Resources/textures/*_Tiles.png
+/Resources/textures/*_UserInterface.png
+/Resources/textures/*.TAI
+/Resources/SpriteRenderer/Ogre.log
+/Resources/Spriterenderer/output
 /Media
 /setenv.bat
 
@@ -66,6 +78,16 @@ project.lock.json
 # Created by NUnit.
 TestResult.xml
 
+NetSerializerDebug.dll
+
+# We're not gonna ship Mac extlibs with the repo due to size. (11 MB)
+Third-Party/extlibs/Mac/
+# Or the automatically-fetched Windows natives, for that matter.
+Third-Party/extlibs/Windows/
+
+# Actually I'll make this folder because SS14.Shared.Bsdiff isn't third-party is it?
+Dependencies/
+
 # Python stuff
 __pycache__
 .mypy_cache
@@ -76,5 +98,3 @@ MSBuild/Robust.Custom.targets
 
 
 release/
-Robust.Docfx/*-site
-Robust.Docfx/api

.gitmodules

@@ -10,6 +10,6 @@
 [submodule "Robust.LoaderApi"]
 	path = Robust.LoaderApi
 	url = https://github.com/space-wizards/Robust.LoaderApi.git
-[submodule "cefglue"]
-	path = cefglue
-	url = https://github.com/space-wizards/cefglue.git
+[submodule "ManagedHttpListener"]
+	path = ManagedHttpListener
+	url = https://github.com/space-wizards/ManagedHttpListener.git

Lidgren.Network/Lidgren.Network.csproj

@@ -3,10 +3,10 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1'">$(DefineConstants);HAS_FULL_SPAN</DefineConstants>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <DefaultItemExcludes>Lidgren.Network/**/*</DefaultItemExcludes>
     <DefineConstants>$(DefineConstants);USE_RELEASE_STATISTICS</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>

MSBuild/Robust.Engine.Version.props

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

MSBuild/Robust.Engine.props

@@ -1,10 +1,9 @@
 <Project>
     <!-- Engine-specific properties. Content should not use this file. -->
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>10</LangVersion>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>
-    <Import Project="Robust.Engine.Version.props" />
 </Project>

MSBuild/Robust.Properties.targets

@@ -26,7 +26,7 @@
     <TargetOS Condition="'$(TargetOS)' == ''">$(ActualOS)</TargetOS>
     <Python>python3</Python>
     <Python Condition="'$(ActualOS)' == 'Windows'">py -3</Python>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <EnableClientScripting>True</EnableClientScripting>
     <!-- Client scripting is disabled on full release builds for security and size reasons. -->
     <EnableClientScripting Condition="'$(FullRelease)' == 'True'">False</EnableClientScripting>

MSBuild/Robust.Trimming.targets

@@ -1,122 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <!--
-  Stuff for using ILLink trimming without self-contained deployments.
-  This is not something officially supported by the .NET SDK currently, but we can simply run ILLink ourselves.
-  -->
-
-  <!--
-  A lot of stuff taken from Microsoft.NET.ILLink.targets in the SDK files.
-  -->
-
-  <ItemDefinitionGroup>
-    <RobustLinkRoots>
-      <Visible>false</Visible>
-    </RobustLinkRoots>
-    <RobustLinkAssemblies>
-      <Visible>false</Visible>
-    </RobustLinkAssemblies>
-  </ItemDefinitionGroup>
-
-  <Target Name="RobustILLink"
-          BeforeTargets="ILLink"
-          Condition="'$(PublishTrimmed)' != 'true' And
-                       '$(RobustILLink)' == 'true'"
-          DependsOnTargets="_ComputeAssembliesToPostprocessOnPublish">
-
-    <ComputeManagedAssemblies Assemblies="@(ResolvedFileToPublish)">
-      <Output TaskParameter="ManagedAssemblies" ItemName="_ResolvedFileToPublishFiltered" />
-    </ComputeManagedAssemblies>
-
-    <JoinItems Left="@(_ResolvedFileToPublishFiltered)" LeftKey="FileName" LeftMetadata="*"
-               Right="@(RobustLinkRoots)"
-               ItemSpecToUse="Left">
-      <Output TaskParameter="JoinResult" ItemName="_RobustLinkRootsJoined" />
-    </JoinItems>
-
-    <JoinItems Left="@(_ResolvedFileToPublishFiltered)" LeftKey="FileName" LeftMetadata="*"
-               Right="@(RobustLinkAssemblies)"
-               ItemSpecToUse="Left">
-      <Output TaskParameter="JoinResult" ItemName="_RobustLinkAssembliesJoined" />
-    </JoinItems>
-
-    <PropertyGroup>
-      <TrimMode Condition=" '$(TrimMode)' == '' ">link</TrimMode>
-      <TrimmerDefaultAction Condition=" '$(TrimmerDefaultAction)' == '' ">copy</TrimmerDefaultAction>
-      <_ExtraTrimmerArgs>--skip-unresolved true $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
-      <ILLinkTreatWarningsAsErrors Condition=" '$(ILLinkTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</ILLinkTreatWarningsAsErrors>
-      <TrimmerSingleWarn Condition=" '$(TrimmerSingleWarn)' == '' ">true</TrimmerSingleWarn>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <RobustAssemblyToLink Include="@(_RobustLinkRootsJoined)">
-        <TrimMode>Copy</TrimMode>
-      </RobustAssemblyToLink>
-      <RobustAssemblyToLink Include="@(_RobustLinkAssembliesJoined)">
-        <TrimMode>Link</TrimMode>
-      </RobustAssemblyToLink>
-    </ItemGroup>
-
-    <ItemGroup>
-      <!-- The linker implicitly picks up PDBs next to input assemblies. We will filter these out of the publish set. -->
-      <__PDBToLink Include="@(ResolvedFileToPublish)" Exclude="@(RobustAssemblyToLink->'%(RelativeDir)%(Filename).pdb')" />
-      <_PDBToLink Include="@(ResolvedFileToPublish)" Exclude="@(__PDBToLink)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <_LinkedResolvedFileToPublishCandidate Include="@(RobustAssemblyToLink->'$(IntermediateLinkDir)%(Filename)%(Extension)')" />
-      <_LinkedResolvedFileToPublishCandidate Include="@(_PDBToLink->'$(IntermediateLinkDir)%(Filename)%(Extension)')" />
-    </ItemGroup>
-
-    <!--<Message Text="@(ResolvedFileToPublish)" Importance="high" />-->
-
-    <ItemGroup>
-      <_TrimmerFeatureSettings Include="@(RuntimeHostConfigurationOption)"
-                               Condition="'%(RuntimeHostConfigurationOption.Trim)' == 'true'" />
-    </ItemGroup>
-
-    <Delete Files="@(_LinkedResolvedFileToPublishCandidate)" />
-    <ILLink AssemblyPaths="@(RobustAssemblyToLink)"
-            ReferenceAssemblyPaths="@(ReferencePath)"
-            RootAssemblyNames="@(RobustLinkRoots)"
-            TrimMode="Skip"
-            DefaultAction="$(TrimmerDefaultAction)"
-            RemoveSymbols="false"
-            FeatureSettings="@(_TrimmerFeatureSettings)"
-            CustomData="@(_TrimmerCustomData)"
-
-            BeforeFieldInit="$(_TrimmerBeforeFieldInit)"
-            OverrideRemoval="$(_TrimmerOverrideRemoval)"
-            UnreachableBodies="$(_TrimmerUnreachableBodies)"
-            UnusedInterfaces="$(_TrimmerUnusedInterfaces)"
-            IPConstProp="$(_TrimmerIPConstProp)"
-            Sealer="$(_TrimmerSealer)"
-
-            Warn="$(ILLinkWarningLevel)"
-            NoWarn="$(NoWarn)"
-            TreatWarningsAsErrors="$(ILLinkTreatWarningsAsErrors)"
-            WarningsAsErrors="$(WarningsAsErrors)"
-            WarningsNotAsErrors="$(WarningsNotAsErrors)"
-            SingleWarn="$(TrimmerSingleWarn)"
-
-            CustomSteps="@(_TrimmerCustomSteps)"
-            RootDescriptorFiles="@(TrimmerRootDescriptor)"
-            OutputDirectory="$(IntermediateLinkDir)"
-            DumpDependencies="$(_TrimmerDumpDependencies)"
-            ExtraArgs="$(_ExtraTrimmerArgs)"
-            ToolExe="$(_DotNetHostFileName)"
-            ToolPath="$(_DotNetHostDirectory)"
-            ContinueOnError="ErrorAndContinue">
-      <Output TaskParameter="ExitCode" PropertyName="_ILLinkExitCode" />
-    </ILLink>
-
-    <Touch Files="$(_LinkSemaphore)" AlwaysCreate="true" Condition=" '$(_ILLinkExitCode)' == '0' " />
-
-    <ItemGroup>
-      <_LinkedResolvedFileToPublish Include="@(_LinkedResolvedFileToPublishCandidate)" Condition="Exists('%(Identity)')" />
-      <ResolvedFileToPublish Remove="@(RobustAssemblyToLink)" />
-      <ResolvedFileToPublish Remove="@(_PDBToLink)" />
-      <ResolvedFileToPublish Include="@(_LinkedResolvedFileToPublish)" />
-    </ItemGroup>
-  </Target>
-
-</Project>

MSBuild/XamlIL.targets

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Avoid MSBuild adding a None entry for XAML files because they'd show up TWICE in the project view. -->
     <DefaultItemExcludes>**/*.xaml</DefaultItemExcludes>
-    <RobustUseExternalMSBuild>false</RobustUseExternalMSBuild>
+    <RobustUseExternalMSBuild>true</RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild>$(RobustUseExternalMSBuild)</_RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild Condition="'$(_RobustForceInternalMSBuild)' == 'true'">false</_RobustUseExternalMSBuild>
   </PropertyGroup>

OpenToolkit.GraphicsLibraryFramework/Enums/WindowHintBool.cs

@@ -129,7 +129,5 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// for controlling sRGB rendering and a created OpenGL ES context will always have sRGB rendering enabled.
         /// </summary>
         SrgbCapable = 0x0002100E,
-
-        ScaleToMonitor = 0x0002200C,
     }
 }

OpenToolkit.GraphicsLibraryFramework/GLFW.cs

@@ -10,6 +10,7 @@
 using System;
 using System.Runtime.InteropServices;
 using static OpenToolkit.GraphicsLibraryFramework.GLFWNative;
+using static Robust.Shared.Utility.MarshalHelper;
 
 namespace OpenToolkit.GraphicsLibraryFramework
 {
@@ -210,7 +211,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// <seealso cref="GetVersion"/>
         public static unsafe string GetVersionString()
         {
-            return Marshal.PtrToStringUTF8((IntPtr) glfwGetVersionString());
+            return PtrToStringUTF8(glfwGetVersionString());
         }
 
         /// <summary>
@@ -271,7 +272,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         {
             byte* desc;
             var code = glfwGetError(&desc);
-            description = Marshal.PtrToStringUTF8((IntPtr) desc);
+            description = PtrToStringUTF8(desc);
             return code;
         }
 
@@ -589,7 +590,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe string GetMonitorName(Monitor* monitor)
         {
-            return Marshal.PtrToStringUTF8((IntPtr) glfwGetMonitorName(monitor));
+            return PtrToStringUTF8(glfwGetMonitorName(monitor));
         }
 
         /// <summary>
@@ -901,7 +902,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe void WindowHint(WindowHintString hint, string value)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(value);
+            var ptr = StringToCoTaskMemUTF8(value);
 
             try
             {
@@ -1363,7 +1364,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe string GetKeyName(Keys key, int scanCode)
         {
-            return Marshal.PtrToStringUTF8((IntPtr) glfwGetKeyName(key, scanCode));
+            return PtrToStringUTF8(glfwGetKeyName(key, scanCode));
         }
 
         /// <summary>
@@ -2277,7 +2278,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe string GetJoystickName(int jid)
         {
-            return Marshal.PtrToStringUTF8((IntPtr) glfwGetJoystickName(jid));
+            return PtrToStringUTF8(glfwGetJoystickName(jid));
         }
 
         /// <summary>
@@ -2350,7 +2351,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe string GetJoystickGUID(int jid)
         {
-            return Marshal.PtrToStringUTF8((IntPtr) glfwGetJoystickGUID(jid));
+            return PtrToStringUTF8(glfwGetJoystickGUID(jid));
         }
 
         /// <summary>
@@ -2508,7 +2509,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe bool UpdateGamepadMappings(string newMapping)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(newMapping);
+            var ptr = StringToCoTaskMemUTF8(newMapping);
             try
             {
                 return glfwUpdateGamepadMappings((byte*)ptr) == GLFW_TRUE;
@@ -2584,7 +2585,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe string GetGamepadName(int jid)
         {
-            return Marshal.PtrToStringUTF8((IntPtr) glfwGetGamepadName(jid));
+            return PtrToStringUTF8(glfwGetGamepadName(jid));
         }
 
         /// <summary>
@@ -2853,7 +2854,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe bool ExtensionSupported(string extensionName)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(extensionName);
+            var ptr = StringToCoTaskMemUTF8(extensionName);
 
             try
             {
@@ -2892,7 +2893,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// <seealso cref="ExtensionSupported" />
         public static unsafe IntPtr GetProcAddress(string procName)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(procName);
+            var ptr = StringToCoTaskMemUTF8(procName);
 
             try
             {
@@ -3084,7 +3085,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe Window* CreateWindow(int width, int height, string title, Monitor* monitor, Window* share)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(title);
+            var ptr = StringToCoTaskMemUTF8(title);
 
             try
             {
@@ -3305,7 +3306,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// <seealso cref="SetClipboardString"/>
         public static unsafe string GetClipboardString(Window* window)
         {
-            return Marshal.PtrToStringUTF8((IntPtr) glfwGetClipboardString(window));
+            return PtrToStringUTF8(glfwGetClipboardString(window));
         }
 
         /// <summary>
@@ -3916,7 +3917,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// <seealso cref="GetClipboardString"/>
         public static unsafe void SetClipboardString(Window* window, string data)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(data);
+            var ptr = StringToCoTaskMemUTF8(data);
 
             try
             {
@@ -4750,7 +4751,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// </remarks>
         public static unsafe void SetWindowTitle(Window* window, string title)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(title);
+            var ptr = StringToCoTaskMemUTF8(title);
 
             try
             {
@@ -5339,7 +5340,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
             var array = new string[count];
             for (var i = 0; i < count; i++)
             {
-                array[i] = Marshal.PtrToStringUTF8((IntPtr) ptr[i]);
+                array[i] = PtrToStringUTF8(ptr[i]);
             }
 
             return array;
@@ -5385,7 +5386,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
         /// <returns>The address of the function, or <c>null</c> if an error occurred.</returns>
         public static unsafe IntPtr GetInstanceProcAddress(VkHandle instance, string procName)
         {
-            var ptr = Marshal.StringToCoTaskMemUTF8(procName);
+            var ptr = StringToCoTaskMemUTF8(procName);
 
             try
             {
@@ -5550,15 +5551,5 @@ namespace OpenToolkit.GraphicsLibraryFramework
         {
             return glfwGetX11Window(window);
         }
-
-        public static unsafe IntPtr GetX11Display(Window* window)
-        {
-            return glfwGetX11Display(window);
-        }
-
-        public static unsafe IntPtr GetWin32Window(Window* window)
-        {
-            return glfwGetWin32Window(window);
-        }
     }
 }

OpenToolkit.GraphicsLibraryFramework/GLFWNative.cs

@@ -18,18 +18,20 @@ namespace OpenToolkit.GraphicsLibraryFramework
             NativeLibrary.SetDllImportResolver(typeof(GLFWNative).Assembly, (name, assembly, path) =>
             {
                 // Please keep in sync with what Robust.Shared/DllMapHelper.cs does.
-
                 if (name != "glfw3.dll")
                 {
                     return IntPtr.Zero;
                 }
 
-                string rName = null;
-                if (OperatingSystem.IsLinux()) rName = "libglfw.so.3";
-                else if (OperatingSystem.IsMacOS()) rName = "libglfw.3.dylib";
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    return NativeLibrary.Load("libglfw.so.3", assembly, path);
+                }
 
-                if ((rName != null) && NativeLibrary.TryLoad(rName, assembly, path, out var handle))
-                    return handle;
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    return NativeLibrary.Load("libglfw.3.dylib", assembly, path);
+                }
 
                 return IntPtr.Zero;
             });
@@ -404,11 +406,5 @@ namespace OpenToolkit.GraphicsLibraryFramework
 
         [DllImport(LibraryName)]
         public static extern uint glfwGetX11Window(Window* window);
-
-        [DllImport(LibraryName)]
-        public static extern IntPtr glfwGetX11Display(Window* window);
-
-        [DllImport(LibraryName)]
-        public static extern IntPtr glfwGetWin32Window(Window* window);
     }
 }

OpenToolkit.GraphicsLibraryFramework/OpenToolkit.GraphicsLibraryFramework.csproj

@@ -14,4 +14,7 @@
     <PackageReference Condition="'$(TargetFramework)' == 'net472'" Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
+  </ItemGroup>
 </Project>

README.md

@@ -10,7 +10,7 @@ Use the [content repo](https://github.com/space-wizards/space-station-14) for ac
 
 ## Documentation/Wiki
 
-The [wiki](https://docs.spacestation14.io/) has documentation on SS14s content, engine, game design and more. We also have lots of resources for new contributors to the project.
+The [HackMD Wiki](https://hackmd.io/@ss14/docs/wiki) has documentation on SS14s content, engine, game design and more. We also have lots of resources for new contributors to the project.
 
 ## Contributing
 

Resources/.gitignore

@@ -0,0 +1,8 @@
+# .import files are made by Godot because the assets are exposed if using symlinks.
+# IF you need to persist a .import file because of something used Godot-side (GUI-side),
+# you can do a negation with !.
+*.import
+# Negation would be like this:
+#!/Textures/UserInterface/1pxwhite.png.import
+!/Scenes/SS14Window/closewindow.png.import
+/I_MADE_THE_SYMLINK

Resources/EngineCredits/Libraries.yml

@@ -23,48 +23,6 @@
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-- name: Box2D
-  license: |
-    MIT License
-
-    Copyright (c) 2019 Erin Catto
-
-    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.
-
-- name: Bullet Physics SDK
-  license: |
-    The files in this repository are licensed under the zlib license, except for the files under 'Extras' and examples/ThirdPartyLibs.
-
-    Bullet Continuous Collision Detection and Physics Library
-    http://bulletphysics.org
-
-    This software is provided 'as-is', without any express or implied warranty.
-    In no event will the authors be held liable for any damages arising from the use of this software.
-    Permission is granted to anyone to use this software for any purpose,
-    including commercial applications, and to alter it and redistribute it freely,
-    subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software.
-    If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-    3. This notice may not be removed or altered from any source distribution.
-
 - name: Castle Core
   license: |
     Copyright 2004-2016 Castle Project - http://www.castleproject.org/
@@ -359,43 +317,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-- name: Farseer Physics Engine
-  license: |
-    Microsoft Permissive License (Ms-PL)
-
-    This license governs use of the accompanying software.
-    If you use the software, you accept this license.
-    If you do not accept the license, do not use the software.
-
-    1. Definitions
-    The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
-    A "contribution" is the original software, or any additions or changes to the software.
-    A "contributor" is any person that distributes its contribution under this license.
-    "Licensed patents" are a contributor's patent claims that read directly on its contribution.
-
-    2. Grant of Rights
-    (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3,
-    each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution,
-    prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
-    (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3,
-    each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to
-    make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or
-    derivative works of the contribution in the software.
-
-    3. Conditions and Limitations
-    (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
-    (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software,
-    your patent license from such contributor to the software ends automatically.
-    (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark,
-    and attribution notices that are present in the software.
-    (D) If you distribute any portion of the software in source code form, you may do so only under this license by
-    including a complete copy of this license with your distribution. If you distribute any portion of the software in
-    compiled or object code form, you may only do so under a license that complies with this license.
-    (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties,
-    guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change.
-    To the extent permitted under your local laws, the contributors exclude the implied warranties of
-    merchantability, fitness for a particular purpose and non-infringement.
-
 - name: Mono.Cecil
   license: |
     Copyright (c) 2008 - 2015 Jb Evain

Resources/EnginePrototypes/UserInterface/uiThemes.yml

@@ -1,3 +0,0 @@
-- type: uiTheme
-  id: Default
-  path: /textures/interface/Default

Resources/Locale/en-US/client-state-commands.ftl

@@ -1,16 +0,0 @@
-# Loc strings for various entity state & client-side PVS related commands
-
-cmd-reset-ent-help = Usage: resetent <Entity UID>
-cmd-reset-ent-desc = Reset an entity to the most recently received server state. This will also reset entities that have been detached to null-space. 
-
-cmd-reset-all-ents-help = Usage: resetallents
-cmd-reset-all-ents-desc = Resets all entities to the most recently received server state. This only impacts entities that have not been detached to null-space. 
-
-cmd-detach-ent-help = Usage: detachent <Entity UID>
-cmd-detach-ent-desc = Detach an entity to null-space, as if it had left PVS range.
-
-cmd-local-delete-help = Usage: localdelete <Entity UID>
-cmd-local-delete-desc = Deletes an entity. Unlike the normal delete command, this is CLIENT-SIDE. Unless the entity is a client-side entity, this will likely cause errors.
-
-cmd-full-state-reset-help = Usage: fullstatereset
-cmd-full-state-reset-desc = Discards any entity state information and requests a full-state from the server.

Resources/Locale/en-US/commands.ftl

@@ -1,161 +0,0 @@
-### Localization for engine console commands
-
-## generic command errors
-
-cmd-invalid-arg-number-error = Invalid number of arguments.
-
-cmd-parse-failure-integer = {$arg} is not a valid integer.
-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-entity-exist = UID {$arg} does not correspond to an existing entity.
-
-
-## 'help' command
-cmd-help-desc = Display general help or help text for a specific command
-cmd-help-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]
-
-## 'cvar' command
-cmd-cvar-desc = Gets or sets a CVar.
-cmd-cvar-help = Usage: cvar <name | ?> [value]
-    If a value is passed, the value is parsed and stored as the new value of the CVar.
-    If not, the current value of the CVar is displayed.
-    Use 'cvar ?' to get a list of all registered CVars.
-
-cmd-cvar-invalid-args = Must provide exactly one or two arguments.
-cmd-cvar-not-registered = CVar '{ $cvar }' is not registered. Use 'cvar ?' to get a list of all registered CVars.
-cmd-cvar-parse-error = Input value is in incorrect format for type { $type }
-cmd-cvar-compl-list = List available CVars
-cmd-cvar-arg-name = <name | ?>
-cmd-cvar-value-hidden = <value hidden>
-
-## 'list' command
-cmd-list-desc = Lists available commands, with optional search filter
-cmd-list-help = Usage: list [filter]
-    Lists all available commands. If an argument is provided, it will be used to filter commands by name.
-
-cmd-list-heading = SIDE NAME            DESC{"\u000A"}-------------------------{"\u000A"}
-
-cmd-list-arg-filter = [filter]
-
-## '>' command, aka remote exec
-cmd-remoteexec-desc = Executes server-side commands
-cmd-remoteexec-help = Usage: > <command> [arg] [arg] [arg...]
-    Executes a command on the server. This is necessary if a command with the same name exists on the client, as simply running the command would run the client command first.
-
-## 'gc' command
-cmd-gc-desc = Run the GC (Garbage Collector)
-cmd-gc-help = Usage: gc [generation]
-    Uses GC.Collect() to execute the Garbage Collector.
-    If an argument is provided, it is parsed as a GC generation number and GC.Collect(int) is used.
-    Use the 'gfc' command to do an LOH-compacting full GC.
-cmd-gc-failed-parse = Failed to parse argument.
-cmd-gc-arg-generation = [generation]
-
-## 'gcf' command
-cmd-gcf-desc = Run the GC, fully, compacting LOH and everything.
-cmd-gcf-help = Usage: gcf
-    Does a full GC.Collect(2, GCCollectionMode.Forced, true, true) while also compacting LOH.
-    This will probably lock up for hundreds of milliseconds, be warned.
-
-## 'gc_mode' command
-cmd-gc_mode-desc = Change/Read the GC Latency mode
-cmd-gc_mode-help = Usage: gc_mode [type]
-    If no argument is provided, returns the current GC latency mode.
-    If an argument is passed, it is parsed as GCLatencyMode and set as the GC latency mode.
-
-cmd-gc_mode-current = current gc latency mode: { $prevMode }
-cmd-gc_mode-possible = possible modes:
-cmd-gc_mode-option = - { $mode }
-cmd-gc_mode-unknown = unknown gc latency mode: { $arg }
-cmd-gc_mode-attempt = attempting gc latency mode change: { $prevMode } -> { $mode }
-cmd-gc_mode-result = resulting gc latency mode: { $mode }
-cmd-gc_mode-arg-type = [type]
-
-## 'mem' command
-cmd-mem-desc = Prints managed memory info
-cmd-mem-help = Usage: mem
-
-cmd-mem-report = Heap Size: { TOSTRING($heapSize, "N0") }
-    Total Allocated: { TOSTRING($totalAllocated, "N0") }
-
-## 'physics' command
-cmd-physics-overlay = {$overlay} is not a recognised overlay
-
-## 'lsasm' command
-cmd-lsasm-desc = Lists loaded assemblies by load context
-cmd-lsasm-help = Usage: lsasm
-
-## 'exec' command
-cmd-exec-desc = Executes a script file from the game's writeable user data
-cmd-exec-help = Usage: exec <fileName>
-    Each line in the file is executed as a single command, unless it starts with a #
-
-cmd-exec-arg-filename = <fileName>
-
-## 'dump_net_comps' command
-cmd-dump_net_comps-desc = Prints the table of networked components.
-cmd-dump_net_comps-help = Usage: dump_net-comps
-
-cmd-dump_net_comps-error-writeable = Registration still writeable, network ids have not been generated.
-cmd-dump_net_comps-header = Networked Component Registrations:
-
-## 'dump_event_tables' command
-cmd-dump_event_tables-desc = Prints directed event tables for an entity.
-cmd-dump_event_tables-help = Usage: dump_event_tables <entityUid>
-
-cmd-dump_event_tables-missing-arg-entity = Missing entity argument
-cmd-dump_event_tables-error-entity = Invalid entity
-cmd-dump_event_tables-arg-entity = <entityUid>
-
-## 'monitor' command
-cmd-monitor-desc = Toggles a debug monitor in the F3 menu.
-cmd-monitor-help = Usage: monitor <name>
-    Possible monitors are: { $monitors }
-    You can also use the special values "-all" and "+all" to hide or show all monitors, respectively.
-
-cmd-monitor-arg-monitor = <monitor>
-cmd-monitor-invalid-name = Invalid monitor name
-cmd-monitor-arg-count = Missing monitor argument
-cmd-monitor-minus-all-hint = Hides all monitors
-cmd-monitor-plus-all-hint = Shows all monitors
-
-
-## Mapping commands
-
-cmd-savemap-desc = Serializes a map to disk. Will not save a post-init map unless forced.
-cmd-savemap-help = savemap <MapID> <Path> [force]
-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-hint-savemap-id = <MapID>
-cmd-hint-savemap-path = <Path>
-cmd-hint-savemap-force = [bool]
-
-cmd-loadmap-desc = Loads a map from disk into the game.
-cmd-loadmap-help = loadmap <MapID> <Path> [x] [y] [rotation] [consistentUids]
-cmd-loadmap-nullspace = You cannot load into map 0.
-cmd-loadmap-exists = Map {$mapId} already exists.
-cmd-loadmap-success = Map {$mapId} has been loaded from {$path}.
-cmd-loadmap-error = An error occurred while loading map from {$path}.
-cmd-hint-loadmap-x-position = [x-position]
-cmd-hint-loadmap-y-position = [y-position]
-cmd-hint-loadmap-rotation = [rotation]
-cmd-hint-loadmap-uids = [float]
-
-cmd-hint-savebp-id = <Grid EntityID>
-
-## '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.

Resources/Locale/en-US/console.ftl

@@ -0,0 +1 @@
+console-line-edit-placeholder = Command Here

Resources/Locale/en-US/controls.ftl

@@ -1,10 +0,0 @@
-color-selector-sliders-red = R
-color-selector-sliders-green = G
-color-selector-sliders-blue = B
-color-selector-sliders-hue = H
-color-selector-sliders-saturation = S
-color-selector-sliders-value = V
-color-selector-sliders-alpha = A
-
-color-selector-sliders-rgb = RGB
-color-selector-sliders-hsv = HSV

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

@@ -1,11 +0,0 @@
-## EntitySpawnWindow
-
-entity-spawn-window-title = Entity Spawn Panel
-entity-spawn-window-search-bar-placeholder = search
-entity-spawn-window-clear-button = Clear
-entity-spawn-window-erase-button-text = Erase Mode
-entity-spawn-window-override-menu-tooltip = Override placement
-
-## Console
-
-console-line-edit-placeholder = Command Here

Resources/Locale/en-US/defaultwindow.ftl

@@ -1 +0,0 @@
-defaultwindow-placeholder-title = Exemplary Window Title Here

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

@@ -1 +0,0 @@
-midi-panic-command-description = Turns off every note for every active MIDI renderer.

Resources/Locale/en-US/ss14window.ftl

@@ -0,0 +1 @@
+ss14window-placeholder-title = Exemplary Window Title Here

Resources/Locale/en-US/tab-container.ftl

@@ -1 +0,0 @@
-tab-container-not-tab-title-provided = No title

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

@@ -1,11 +0,0 @@
-## ViewVariablesInstanceEntity
-
-view-variable-instance-entity-server-components-add-component-button-placeholder = Add Component
-view-variable-instance-entity-client-variables-tab-title = Client Variables
-view-variable-instance-entity-client-components-tab-title = Client Components
-view-variable-instance-entity-server-variables-tab-title = Server Variables
-view-variable-instance-entity-server-components-tab-title = Server Components
-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]

Resources/Prototypes/Shaders/stockshaders.yml

@@ -7,8 +7,3 @@
 - type: shader
   id: shaded
   kind: canvas
-
-- type: shader
-  id: bgra
-  kind: source
-  path: "/Shaders/Internal/bgra.swsl"

Resources/Shaders/Internal/bgra.swsl

@@ -1,6 +0,0 @@
-// Swaps B and R channel so you can render BGRA stuff without swizzling at upload time.
-// Currently used by CEF.
-
-void fragment() {
-    COLOR = zTexture(UV).bgra;
-}

Resources/Shaders/Internal/fov-lighting.swsl

@@ -2,15 +2,29 @@ preset raw;
 
 #include "/Shaders/Internal/shadow_cast_shared.swsl"
 
-#include "/Shaders/Internal/fov_shared.swsl"
-
 const highp float g_MinVariance = 0.0;
 
+varying highp vec2 worldPosition;
+
+// Center of the FOV, in world coordinates.
+uniform highp vec2 center;
+
+void vertex()
+{
+    highp vec3 transformed = modelMatrix * vec3(VERTEX, 1.0);
+    worldPosition = transformed.xy;
+    transformed = projectionMatrix * viewMatrix * transformed;
+
+    VERTEX = transformed.xy;
+}
+
 void fragment()
 {
-    highp float ourDist = length(worldSpaceDiff);
+    highp vec2 diff = worldPosition - center;
 
-    highp vec2 occlDist = occludeDepth(worldSpaceDiff, TEXTURE, 0.25);
+    highp float ourDist = length(diff);
+
+    highp vec2 occlDist = occludeDepth(diff, TEXTURE, 0.25);
 
     highp float occlusion = ChebyshevUpperBound(occlDist, ourDist);
 

Resources/Shaders/Internal/fov.swsl

@@ -2,18 +2,32 @@ preset raw;
 
 #include "/Shaders/Internal/shadow_cast_shared.swsl"
 
-#include "/Shaders/Internal/fov_shared.swsl"
-
 const highp float g_MinVariance = 0.0;
 
+varying highp vec2 worldPosition;
+
+// Center of the FOV, in world coordinates.
+uniform highp vec2 center;
+
+void vertex()
+{
+    highp vec3 transformed = modelMatrix * vec3(VERTEX, 1.0);
+    worldPosition = transformed.xy;
+    transformed = projectionMatrix * viewMatrix * transformed;
+
+    VERTEX = transformed.xy;
+}
+
 void fragment()
 {
-    highp float ourDist = length(worldSpaceDiff);
+    highp vec2 diff = worldPosition - center;
 
-    highp float occlDist = occludeDepth(worldSpaceDiff, TEXTURE, 0.75).r;
+    highp float ourDist = length(diff);
+
+    highp float occlDist = occludeDepth(diff, TEXTURE, 0.75).r;
 
     // *Very* simple biased shadow check for FOV.
-    if (!doesOcclude(worldSpaceDiff, TEXTURE, 0.75, -0.75/32.0))
+    if (!doesOcclude(diff, TEXTURE, 0.75, -0.75/32.0))
     {
         discard;
     }

Resources/Shaders/Internal/fov_shared.swsl

@@ -1,16 +0,0 @@
-// Shared between fov-lighting.swsl and fov.swsl, which both use the Clyde quad,
-//  manually transformed into clip-space to cover the entire viewport
-
-// World-space position offset from centre to pixel.
-varying highp vec2 worldSpaceDiff;
-
-// Inverted transformation matrix from clip coordinates to difference coordinates.
-uniform highp mat3 clipToDiff;
-
-void vertex()
-{
-    // Convert quad-space (0.0 to 1.0) to clip-space (-1.0 to 1.0)
-    VERTEX = (VERTEX.xy - 0.5) * 2.0;
-    worldSpaceDiff = (clipToDiff * vec3(VERTEX, 1.0)).xy;
-}
-

Resources/Shaders/Internal/light-blur.swsl

@@ -1,41 +0,0 @@
-preset raw;
-
-uniform highp vec2 direction;
-uniform highp vec2 size;
-uniform highp float radius;
-
-varying highp vec2 pos;
-varying highp vec4 blurPos1;
-varying highp vec4 blurPos2;
-
-
-void vertex()
-{
-    highp float aspect = size.y / size.x;
-    highp float horRadius = aspect * radius;
-
-    highp vec2 offset = vec2(horRadius, radius) * direction;
-
-    VERTEX = apply_mvp(VERTEX);
-
-    pos = (VERTEX + vec2(1.0)) / 2.0;
-
-    blurPos1.xy = pos + offset;
-    blurPos1.zw = pos - offset;
-    blurPos2.xy = pos + offset * 2.0;
-    blurPos2.zw = pos - offset * 2.0;
-}
-
-
-void fragment()
-{
-    // Very simple gaussian blur.
-    highp vec4 sum = zTexture(pos) * 0.375;
-
-    sum += zTexture(blurPos1.xy) * 0.25;
-    sum += zTexture(blurPos1.zw) * 0.25;
-    sum += zTexture(blurPos2.xy) * 0.0625;
-    sum += zTexture(blurPos2.zw) * 0.0625;
-
-    COLOR = sum;
-}

Resources/Shaders/Internal/light_shared.swsl

@@ -40,7 +40,7 @@ void fragment()
     highp vec2 diff = worldPosition - lightCenter;
 
     // Totally not hacky PCF on top of VSM.
-    highp float occlusion = lightIndex < 0.0 ? 1.0 : createOcclusion(diff);
+    highp float occlusion = createOcclusion(diff);
 
     if (occlusion == 0.0)
     {

Resources/Textures/Logo/logo.png.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/Logo/logo.svg

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="113.67364mm"
+   height="56.37999mm"
+   viewBox="0 0 113.67364 56.37999"
+   version="1.1"
+   id="svg3223"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/pj/Projects/space-station-14/RobustToolbox/Resources/Textures/Logo/logo.png"
+   inkscape:export-xdpi="67.034012"
+   inkscape:export-ydpi="67.034012">
+  <defs
+     id="defs3217" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="159.25688"
+     inkscape:cy="149.8376"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3220">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-56.556041,-109.30405)">
+    <g
+       transform="translate(-3.7799155,-23.482217)"
+       id="g2559">
+      <path
+         inkscape:connector-curvature="0"
+         id="path148"
+         style="fill:#e23229;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 143.44393,145.03077 0.1484,-0.70241 5.14257,-0.35974 -6.23062,29.75753 -0.69199,0.0483 6.08255,-29.05476 z m 1.18682,31.16724 7.31835,-35.07438 -10.43302,0.72923 -1.28514,6.12249 4.45021,-0.31125 -6.03235,28.95253 z" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path152"
+         style="fill:#e23229;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 169.25392,142.53363 -3.53672,16.8925 4.79124,-0.32874 -0.15681,0.75402 -4.79234,0.32881 -2.53549,12.11072 -0.75405,0.052 2.53724,-12.11108 -11.37332,0.78724 z m -18.98495,21.327 11.37324,-0.78724 -2.5247,12.11146 5.98312,-0.41839 2.52513,-12.10406 4.82658,-0.33116 1.26721,-6.07903 -4.82564,0.33109 3.52398,-16.89101 -4.56014,0.33565 -16.70168,19.60839 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path156"
+         style="fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 88.591903,151.83158 -2.595368,0.18103 0.741705,-3.62685 2.595079,-0.182 z m -4.581719,-6.72375 -3.99857,19.05572 3.468889,-0.24195 1.774487,-8.38766 6.064403,-0.42299 2.224789,-10.66981 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path160"
+         style="fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 100.85029,147.82177 2.83371,-0.19837 -0.74166,3.60045 -2.83371,0.19836 z m -6.726869,15.77696 3.469312,-0.24198 1.774487,-8.38695 2.8337,-0.19837 -1.77453,8.38695 3.46938,-0.24296 3.99895,-19.05608 -9.771974,0.68329 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path164"
+         style="fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 108.80467,162.68768 9.74554,-0.68118 1.377,-6.50502 -3.4693,0.24296 -0.63527,2.9832 -2.80718,0.19654 2.51548,-12.01379 2.80731,-0.19754 -0.50239,2.4195 3.46902,-0.24294 1.24513,-5.93998 -9.74589,0.68119 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path168"
+         style="fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 135.66767,145.61788 0.7409,-3.5211 -8.95132,0.6259 -3.99824,19.0564 8.95097,-0.62626 0.74082,-3.52077 -5.4816,0.383 1.03272,-4.89224 3.78675,-0.26474 0.74189,-3.52113 -3.78675,0.26474 0.74081,-3.6011 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path172"
+         style="fill:#d5d5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 71.070134,172.95255 -4.734664,0.33077 0.57447,-2.73456 2.139294,-0.14973 -0.376241,1.80924 2.595442,-0.18103 0.930868,-4.44332 -7.330114,0.5118 -1.66358,8.00131 4.734672,-0.33077 -0.773014,3.62025 -2.119829,0.1484 0.475696,-2.23174 -2.614982,0.18237 -1.030327,4.86616 7.330104,-0.5118 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path176"
+         style="fill:#d5d5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 74.794828,169.99754 2.496095,-0.17422 -2.436556,11.62085 2.595151,-0.182 2.436903,-11.62086 2.496023,-0.17421 0.554678,-2.63441 -7.587516,0.53064 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path180"
+         style="fill:#d5d5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 87.573322,171.75893 0.554606,-2.69318 2.119754,-0.1484 -0.554978,2.69354 z m 2.832629,8.59803 2.991888,-14.25529 -7.310379,0.51154 -2.99153,14.25493 2.595227,-0.18201 1.327293,-6.27378 2.11968,-0.14839 -1.327288,6.27414 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path184"
+         style="fill:#d5d5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 98.977684,179.78056 2.436926,-11.62086 2.49608,-0.1752 0.55493,-2.63374 -7.587518,0.53065 -0.554634,2.63373 2.495947,-0.17421 -2.436599,11.6212 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path188"
+         style="fill:#d5d5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 104.62426,179.38562 2.5951,-0.18101 2.9915,-14.25528 -2.59522,0.182 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path192"
+         style="fill:#d5d5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 115.73198,167.18138 2.11975,-0.14839 -1.88236,8.98749 -2.11949,0.14838 z m -5.03203,11.80203 7.31001,-0.51042 2.99153,-14.25494 -7.31028,0.51044 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path196"
+         style="fill:#d5d5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 124.08538,178.07141 1.36653,-6.47511 1.18856,6.29603 2.25853,-0.15792 2.99192,-14.25493 -2.59522,0.18201 -1.36734,6.57353 -1.18854,-6.39514 -2.25854,0.15791 -2.99084,14.25493 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path200"
+         style="fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 66.677649,158.65784 -1.377018,6.50538 9.798398,-0.68471 2.489415,-11.87958 -6.329111,0.44214 0.767747,-3.65465 2.860076,-0.20018 -0.503204,2.41917 3.469299,-0.24297 1.244526,-5.93996 -4.328229,0.30289 -8.728772,0.56991 2.909827,1.489 -1.87565,9.01912 6.329037,-0.44213 -1.032406,4.83973 -2.833645,0.19738 0.635302,-2.98354 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path204"
+         style="fill:#e23229;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 70.519326,139.92277 -0.277457,1.36553 103.473271,-7.11317 0.29445,-1.38886 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path208"
+         style="fill:#e23229;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34773216"
+         d="m 60.335956,189.16626 103.473274,-7.11356 0.29444,-1.38885 -103.489968,7.13649 z" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path1772"
+         d="m 167.92741,145.26275 -12.87687,14.89523 9.91366,-0.68019 z m -3.743,7.27758 -1.02896,4.93612 -3.51544,0.2412 z"
+         style="fill:#e23229;fill-opacity:1;stroke:none;stroke-width:0.2626844px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

Robust.Analyzers.Tests/AccessAnalyzer_Test.cs

@@ -1,822 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using Robust.Analyzers;
-
-using VerifyCS = Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.AccessAnalyzer>;
-using static Microsoft.CodeAnalysis.Testing.DiagnosticResult;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class AccessAnalyzer_Test
-{
-    public Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<AccessAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                AdditionalReferences = { typeof(AccessAnalyzer).Assembly },
-                Sources = { code }
-            },
-        };
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    /*
-     *
-     */
-
-    [Test]
-    public async Task ReadTest()
-    {
-        const string code = @"
-using System;
-using Robust.Shared.Analyzers;
-// ReSharper disable RedundantAssignment
-// ReSharper disable UnusedVariable
-// ReSharper disable ArrangeThisQualifier
-// ReSharper disable UnusedMember.Global
-// ReSharper disable UnusedType.Global
-
-public struct MyData
-{
-    public int MyField;
-
-    public static bool operator ==(MyData lhs, MyData rhs) => lhs.MyField == rhs.MyField;
-    public static bool operator !=(MyData lhs, MyData rhs) => lhs.MyField != rhs.MyField;
-}
-
-[Access(typeof(FriendlyClass),
-    Self = AccessPermissions.None,
-    Friend = AccessPermissions.None,
-    Other = AccessPermissions.None)]
-public sealed class TypeNobodyCanRead
-{
-    public MyData Data = default;
-
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.Read,
-        Friend = AccessPermissions.Read,
-        Other = AccessPermissions.Read)]
-    public MyData Data2 = default;
-
-    public void TestTypeNobodyCanRead(TypeNobodyCanRead obj)
-    {
-        // None of these accesses should be allowed.
-        var copy = Data;
-        var copy2 = this.Data;
-        var copy3 = obj.Data;
-
-        copy = Data;
-        copy = this.Data;
-        copy = obj.Data;
-
-        var copy4 = Data.MyField;
-        var copy5 = this.Data.MyField;
-        var copy6 = obj.Data.MyField;
-
-        if (Data == copy) {}
-        if (this.Data == copy) {}
-        if (obj.Data == copy) {}
-
-        if(Data.MyField == 0) {}
-        if(this.Data.MyField == 0) {}
-        if(obj.Data.MyField == 0) {}
-
-        // All of these accesses should be fine.
-        var copy7 = Data2;
-        var copy8 = this.Data2;
-        var copy9 = obj.Data2;
-
-        copy = Data2;
-        copy = this.Data2;
-        copy = obj.Data2;
-
-        var copy10 = Data2.MyField;
-        var copy11 = this.Data2.MyField;
-        var copy12 = obj.Data2.MyField;
-
-        if (Data2 == copy) {}
-        if (this.Data2 == copy) {}
-        if (obj.Data2 == copy) {}
-
-        if(Data2.MyField == 0) {}
-        if(this.Data2.MyField == 0) {}
-        if(obj.Data2.MyField == 0) {}
-    }
-}
-
-[Access(typeof(FriendlyClass),
-    Self = AccessPermissions.Read,
-    Friend = AccessPermissions.Read,
-    Other = AccessPermissions.Read)]
-public sealed class MemberNobodyCanRead
-{
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.None,
-        Friend = AccessPermissions.None,
-        Other = AccessPermissions.None)]
-    public MyData Data = default;
-
-    public MyData Data2 = default;
-
-    public void TestMemberNobodyCanRead(TypeNobodyCanRead obj)
-    {
-        // None of these accesses should be allowed.
-        var copy = Data;
-        var copy2 = this.Data;
-        var copy3 = obj.Data;
-
-        copy = Data;
-        copy = this.Data;
-        copy = obj.Data;
-
-        var copy4 = Data.MyField;
-        var copy5 = this.Data.MyField;
-        var copy6 = obj.Data.MyField;
-
-        if (Data == copy) {}
-        if (this.Data == copy) {}
-        if (obj.Data == copy) {}
-
-        if(Data.MyField == 0) {}
-        if(this.Data.MyField == 0) {}
-        if(obj.Data.MyField == 0) {}
-
-        // All of these accesses should be fine.
-        var copy7 = Data2;
-        var copy8 = this.Data2;
-        var copy9 = obj.Data2;
-
-        copy = Data2;
-        copy = this.Data2;
-        copy = obj.Data2;
-
-        var copy10 = Data2.MyField;
-        var copy11 = this.Data2.MyField;
-        var copy12 = obj.Data2.MyField;
-
-        if (Data2 == copy) {}
-        if (this.Data2 == copy) {}
-        if (obj.Data2 == copy) {}
-
-        if(Data2.MyField == 0) {}
-        if(this.Data2.MyField == 0) {}
-        if(obj.Data2.MyField == 0) {}
-    }
-}
-
-public sealed class FriendlyClass
-{
-    public void TestTypeNobodyCanRead(TypeNobodyCanRead obj)
-    {
-        // We shouldn't be able to access any of these, even if we're a friend..
-        var copy = obj.Data;
-        copy = obj.Data;
-
-        var copy2 = obj.Data.MyField;
-        copy2 = obj.Data.MyField;
-
-        if (obj.Data == copy) {}
-        if(obj.Data.MyField == 0) {}
-
-        // We should be allowed to access all of these, we're friends!
-        var copy3 = obj.Data2;
-        copy = obj.Data2;
-
-        var copy4 = obj.Data2.MyField;
-        copy4 = obj.Data2.MyField;
-
-        if(obj.Data2 == copy) {}
-        if(obj.Data2.MyField == 0) {}
-    }
-
-    public void TestMemberNobodyCanRead(MemberNobodyCanRead obj)
-    {
-        // We shouldn't be able to access any of these, even if we're a friend..
-        var copy = obj.Data;
-        copy = obj.Data;
-
-        var copy2 = obj.Data.MyField;
-        copy2 = obj.Data.MyField;
-
-        if (obj.Data == copy) {}
-        if(obj.Data.MyField == 0) {}
-
-        // We should be allowed to access all of these, we're friends!
-        var copy3 = obj.Data2;
-        copy = obj.Data2;
-
-        var copy4 = obj.Data2.MyField;
-        copy4 = obj.Data2.MyField;
-
-        if(obj.Data2 == copy) {}
-        if(obj.Data2.MyField == 0) {}
-    }
-}
-
-public sealed class OtherClass
-{
-    public void TestTypeNobodyCanRead(TypeNobodyCanRead obj)
-    {
-        // We shouldn't be able to access any of these, as 'other types' can't..
-        var copy = obj.Data;
-        copy = obj.Data;
-
-        var copy2 = obj.Data.MyField;
-        copy2 = obj.Data.MyField;
-
-        if (obj.Data == copy) {}
-        if(obj.Data.MyField == 0) {}
-
-        // We should be allowed to access all of these, they let others read it!
-        var copy3 = obj.Data2;
-        copy = obj.Data2;
-
-        var copy4 = obj.Data2.MyField;
-        copy4 = obj.Data2.MyField;
-
-        if(obj.Data2 == copy) {}
-        if(obj.Data2.MyField == 0) {}
-    }
-
-    public void TestMemberNobodyCanRead(MemberNobodyCanRead obj)
-    {
-        // We shouldn't be able to access any of these, as 'other types' can't..
-        var copy = obj.Data;
-        copy = obj.Data;
-
-        var copy2 = obj.Data.MyField;
-        copy2 = obj.Data.MyField;
-
-        if (obj.Data == copy) {}
-        if(obj.Data.MyField == 0) {}
-
-        // We should be allowed to access all of these, they let others read it!
-        var copy3 = obj.Data2;
-        copy = obj.Data2;
-
-        var copy4 = obj.Data2.MyField;
-        copy4 = obj.Data2.MyField;
-
-        if(obj.Data2 == copy) {}
-        if(obj.Data2.MyField == 0) {}
-    }
-}";
-
-        await Verifier(code,
-            // AUTO-GENERATED DIAGNOSTICS BELOW //
-// /0/Test0.cs(35,20): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(35, 20, 35, 24).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(36,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(36, 21, 36, 30).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(37,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(37, 21, 37, 29).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(39,16): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(39, 16, 39, 20).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(40,16): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(40, 16, 40, 25).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(41,16): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(41, 16, 41, 24).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(43,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(43, 21, 43, 25).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(44,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(44, 21, 44, 30).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(45,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(45, 21, 45, 29).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(47,13): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(47, 13, 47, 17).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(48,13): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(48, 13, 48, 22).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(49,13): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(49, 13, 49, 21).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(51,12): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(51, 12, 51, 16).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(52,12): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(52, 12, 52, 21).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(53,12): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(53, 12, 53, 20).WithArguments("a 'Read' same-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(95,20): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(95, 20, 95, 24).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(96,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(96, 21, 96, 30).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(97,21): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(97, 21, 97, 29).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(99,16): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(99, 16, 99, 20).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(100,16): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(100, 16, 100, 25).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(101,16): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(101, 16, 101, 24).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(103,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(103, 21, 103, 25).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(104,21): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(104, 21, 104, 30).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(105,21): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(105, 21, 105, 29).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(107,13): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(107, 13, 107, 17).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(108,13): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(108, 13, 108, 22).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(109,13): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(109, 13, 109, 21).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(111,12): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(111, 12, 111, 16).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(112,12): error RA0002: Tried to perform a 'Read' same-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(112, 12, 112, 21).WithArguments("a 'Read' same-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(113,12): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(113, 12, 113, 20).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(143,20): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(143, 20, 143, 28).WithArguments("a 'Read' friend-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(144,16): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(144, 16, 144, 24).WithArguments("a 'Read' friend-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(146,21): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(146, 21, 146, 29).WithArguments("a 'Read' friend-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(147,17): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(147, 17, 147, 25).WithArguments("a 'Read' friend-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(149,13): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(149, 13, 149, 21).WithArguments("a 'Read' friend-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(150,12): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(150, 12, 150, 20).WithArguments("a 'Read' friend-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(166,20): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(166, 20, 166, 28).WithArguments("a 'Read' friend-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(167,16): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(167, 16, 167, 24).WithArguments("a 'Read' friend-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(169,21): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(169, 21, 169, 29).WithArguments("a 'Read' friend-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(170,17): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(170, 17, 170, 25).WithArguments("a 'Read' friend-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(172,13): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(172, 13, 172, 21).WithArguments("a 'Read' friend-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(173,12): error RA0002: Tried to perform a 'Read' friend-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(173, 12, 173, 20).WithArguments("a 'Read' friend-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(192,20): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(192, 20, 192, 28).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(193,16): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(193, 16, 193, 24).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(195,21): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(195, 21, 195, 29).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(196,17): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(196, 17, 196, 25).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(198,13): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(198, 13, 198, 21).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(199,12): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'TypeNobodyCanRead', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(199, 12, 199, 20).WithArguments("a 'Read' other-type", "Data", "TypeNobodyCanRead", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(215,20): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(215, 20, 215, 28).WithArguments("a 'Read' other-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(216,16): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(216, 16, 216, 24).WithArguments("a 'Read' other-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(218,21): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(218, 21, 218, 29).WithArguments("a 'Read' other-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(219,17): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(219, 17, 219, 25).WithArguments("a 'Read' other-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(221,13): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(221, 13, 221, 21).WithArguments("a 'Read' other-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(222,12): error RA0002: Tried to perform a 'Read' other-type access to member 'Data' in type 'MemberNobodyCanRead', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(222, 12, 222, 20).WithArguments("a 'Read' other-type", "Data", "MemberNobodyCanRead", "having no", "Member Permissions: ---------")
-            );
-    }
-
-    [Test]
-    public async Task WriteTest()
-    {
-        const string code = @"
-using System;
-using Robust.Shared.Analyzers;
-// ReSharper disable RedundantAssignment
-// ReSharper disable UnusedVariable
-// ReSharper disable ArrangeThisQualifier
-// ReSharper disable UnusedMember.Global
-// ReSharper disable UnusedType.Global
-// ReSharper disable NotAccessedField.Global
-// ReSharper disable RedundantDefaultMemberInitializer
-
-public struct MyData
-{
-    public int MyField;
-}
-
-[Access(typeof(FriendlyClass),
-    Self = AccessPermissions.None,
-    Friend = AccessPermissions.None,
-    Other = AccessPermissions.None)]
-public sealed class TypeNobodyCanWrite
-{
-    public MyData Data = default;
-
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.Write,
-        Friend = AccessPermissions.Write,
-        Other = AccessPermissions.Write)]
-    public MyData Data2 = default;
-
-    public void TestTypeNobodyCanWrite(TypeNobodyCanWrite obj)
-    {
-        // None of these accesses should be allowed.
-        Data = default;
-        this.Data = default;
-        obj.Data = default;
-
-        Data.MyField = 0;
-        this.Data.MyField = 0;
-        obj.Data.MyField = 0;
-
-        // All of these accesses should be fine.
-        Data2 = default;
-        this.Data2 = default;
-        obj.Data2 = default;
-
-        Data2.MyField = 0;
-        this.Data2.MyField = 0;
-        obj.Data2.MyField = 0;
-    }
-}
-
-[Access(typeof(FriendlyClass),
-    Self = AccessPermissions.Write,
-    Friend = AccessPermissions.Write,
-    Other = AccessPermissions.Write)]
-public sealed class MemberNobodyCanWrite
-{
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.None,
-        Friend = AccessPermissions.None,
-        Other = AccessPermissions.None)]
-    public MyData Data = default;
-
-    public MyData Data2 = default;
-
-    public void TestMemberNobodyCanWrite(TypeNobodyCanWrite obj)
-    {
-        // None of these accesses should be allowed.
-        Data = default;
-        this.Data = default;
-        obj.Data = default;
-
-        Data.MyField = 0;
-        this.Data.MyField = 0;
-        obj.Data.MyField = 0;
-
-        // All of these accesses should be fine.
-        Data2 = default;
-        this.Data2 = default;
-        obj.Data2 = default;
-
-        Data2.MyField = 0;
-        this.Data2.MyField = 0;
-        obj.Data2.MyField = 0;
-    }
-}
-
-public sealed class FriendlyClass
-{
-    public void TestTypeNobodyCanWrite(TypeNobodyCanWrite obj)
-    {
-        // We shouldn't be able to access any of these, even if we're a friend..
-        obj.Data = default;
-        obj.Data.MyField = 0;
-
-        // We should be allowed to access all of these, we're friends!
-        obj.Data2 = default;
-        obj.Data2.MyField = 0;
-    }
-
-    public void TestMemberNobodyCanWrite(MemberNobodyCanWrite obj)
-    {
-        // We shouldn't be able to access any of these, even if we're a friend..
-        obj.Data = default;
-        obj.Data.MyField = 0;
-
-        // We should be allowed to access all of these, we're friends!
-        obj.Data2 = default;
-        obj.Data2.MyField = 0;
-    }
-}
-
-public sealed class OtherClass
-{
-    public void TestTypeNobodyCanWrite(TypeNobodyCanWrite obj)
-    {
-        // We shouldn't be able to access any of these, as 'other types' can't..
-        obj.Data = default;
-        obj.Data.MyField = 0;
-
-        // We should be allowed to access all of these, they let others write!
-        obj.Data2 = default;
-        obj.Data2.MyField = 0;
-    }
-
-    public void TestMemberNobodyCanWrite(MemberNobodyCanWrite obj)
-    {
-        // We shouldn't be able to access any of these, as 'other types' can't..
-        obj.Data = default;
-        obj.Data.MyField = 0;
-
-        // We should be allowed to access all of these, they let others write!
-        obj.Data2 = default;
-        obj.Data2.MyField = 0;
-    }
-}";
-
-        await Verifier(code,
-            // AUTO-GENERATED DIAGNOSTICS BELOW //
-// /0/Test0.cs(34,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(34, 9, 34, 13).WithArguments("a 'Write' same-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(35,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(35, 9, 35, 18).WithArguments("a 'Write' same-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(36,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(36, 9, 36, 17).WithArguments("a 'Write' same-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(38,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(38, 9, 38, 13).WithArguments("a 'Write' same-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(39,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(39, 9, 39, 18).WithArguments("a 'Write' same-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(40,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(40, 9, 40, 17).WithArguments("a 'Write' same-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(70,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(70, 9, 70, 13).WithArguments("a 'Write' same-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(71,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(71, 9, 71, 18).WithArguments("a 'Write' same-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(72,9): error RA0002: Tried to perform a 'Write' other-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(72, 9, 72, 17).WithArguments("a 'Write' other-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(74,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(74, 9, 74, 13).WithArguments("a 'Write' same-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(75,9): error RA0002: Tried to perform a 'Write' same-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(75, 9, 75, 18).WithArguments("a 'Write' same-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(76,9): error RA0002: Tried to perform a 'Write' other-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(76, 9, 76, 17).WithArguments("a 'Write' other-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(94,9): error RA0002: Tried to perform a 'Write' friend-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(94, 9, 94, 17).WithArguments("a 'Write' friend-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(95,9): error RA0002: Tried to perform a 'Write' friend-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(95, 9, 95, 17).WithArguments("a 'Write' friend-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(105,9): error RA0002: Tried to perform a 'Write' friend-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(105, 9, 105, 17).WithArguments("a 'Write' friend-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(106,9): error RA0002: Tried to perform a 'Write' friend-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(106, 9, 106, 17).WithArguments("a 'Write' friend-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(119,9): error RA0002: Tried to perform a 'Write' other-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(119, 9, 119, 17).WithArguments("a 'Write' other-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(120,9): error RA0002: Tried to perform a 'Write' other-type access to member 'Data' in type 'TypeNobodyCanWrite', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(120, 9, 120, 17).WithArguments("a 'Write' other-type", "Data", "TypeNobodyCanWrite", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(130,9): error RA0002: Tried to perform a 'Write' other-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(130, 9, 130, 17).WithArguments("a 'Write' other-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(131,9): error RA0002: Tried to perform a 'Write' other-type access to member 'Data' in type 'MemberNobodyCanWrite', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(131, 9, 131, 17).WithArguments("a 'Write' other-type", "Data", "MemberNobodyCanWrite", "having no", "Member Permissions: ---------")
-            );
-    }
-
-    [Test]
-    public async Task ExecuteTest()
-    {
-        const string code = @"
-using System;
-using Robust.Shared.Analyzers;
-// ReSharper disable RedundantAssignment
-// ReSharper disable UnusedVariable
-// ReSharper disable ArrangeThisQualifier
-// ReSharper disable UnusedMember.Global
-// ReSharper disable UnusedType.Global
-// ReSharper disable NotAccessedField.Global
-// ReSharper disable RedundantDefaultMemberInitializer
-// ReSharper disable ReturnValueOfPureMethodIsNotUsed
-
-public struct MyData
-{
-    public int MyField;
-    public void MyMethod() {}
-}
-
-[Access(typeof(FriendlyClass),
-    Self = AccessPermissions.None,
-    Friend = AccessPermissions.None,
-    Other = AccessPermissions.None)]
-public sealed class TypeNobodyCanExecute
-{
-    public MyData Data = default;
-
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.Execute,
-        Friend = AccessPermissions.Execute,
-        Other = AccessPermissions.Execute)]
-    public MyData Data2 = default;
-
-    public void MyMethod() {}
-
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.Execute,
-        Friend = AccessPermissions.Execute,
-        Other = AccessPermissions.Execute)]
-    public void MyMethod2() {}
-
-    public void TestTypeNobodyCanExecute(TypeNobodyCanExecute obj)
-    {
-        // None of these accesses should be allowed.
-        MyMethod();
-        this.MyMethod();
-        obj.MyMethod();
-
-        Data.MyMethod();
-        this.Data.MyMethod();
-        obj.Data.MyMethod();
-
-        Data.MyField.ToString();
-        this.Data.MyField.ToString();
-        obj.Data.MyField.ToString();
-
-        // All of these accesses should be fine.
-        MyMethod2();
-        this.MyMethod2();
-        obj.MyMethod2();
-
-        Data2.MyMethod();
-        this.Data2.MyMethod();
-        obj.Data2.MyMethod();
-
-        Data2.MyField.ToString();
-        this.Data2.ToString();
-        obj.Data2.ToString();
-    }
-}
-
-[Access(typeof(FriendlyClass),
-    Self = AccessPermissions.Execute,
-    Friend = AccessPermissions.Execute,
-    Other = AccessPermissions.Execute)]
-public sealed class MemberNobodyCanExecute
-{
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.None,
-        Friend = AccessPermissions.None,
-        Other = AccessPermissions.None)]
-    public MyData Data = default;
-
-    public MyData Data2 = default;
-
-    [Access(typeof(FriendlyClass),
-        Self = AccessPermissions.None,
-        Friend = AccessPermissions.None,
-        Other = AccessPermissions.None)]
-    public void MyMethod() {}
-
-    public void MyMethod2() {}
-
-    public void TestMemberNobodyCanExecute(TypeNobodyCanExecute obj)
-    {
-        // None of these accesses should be allowed.
-        MyMethod();
-        this.MyMethod();
-        obj.MyMethod();
-
-        Data.MyMethod();
-        this.Data.MyMethod();
-        obj.Data.MyMethod();
-
-        Data.MyField.ToString();
-        this.Data.MyField.ToString();
-        obj.Data.MyField.ToString();
-
-        // All of these accesses should be fine.
-        MyMethod2();
-        this.MyMethod2();
-        obj.MyMethod2();
-
-        Data2.MyMethod();
-        this.Data2.MyMethod();
-        obj.Data2.MyMethod();
-
-        Data2.MyField.ToString();
-        this.Data2.ToString();
-        obj.Data2.ToString();
-    }
-}
-
-public sealed class FriendlyClass
-{
-    public void TestTypeNobodyCanExecute(TypeNobodyCanExecute obj)
-    {
-        // We shouldn't be able to access any of these, even if we're a friend..
-        obj.MyMethod();
-        obj.Data.MyMethod();
-        obj.Data.MyField.ToString();
-
-        // We should be allowed to access all of these, we're friends!
-        obj.MyMethod2();
-        obj.Data2.MyMethod();
-        obj.Data2.MyField.ToString();
-    }
-
-    public void TestMemberNobodyCanExecute(MemberNobodyCanExecute obj)
-    {
-        // We shouldn't be able to access any of these, even if we're a friend..
-        obj.MyMethod();
-        obj.Data.MyMethod();
-        obj.Data.MyField.ToString();
-
-        // We should be allowed to access all of these, we're friends!
-        obj.MyMethod2();
-        obj.Data2.MyMethod();
-        obj.Data2.MyField.ToString();
-    }
-}
-
-public sealed class OtherClass
-{
-    public void TestTypeNobodyCanExecute(TypeNobodyCanExecute obj)
-    {
-        // We shouldn't be able to access any of these, as 'other types' can't..
-        obj.MyMethod();
-        obj.Data.MyMethod();
-        obj.Data.MyField.ToString();
-
-        // We should be allowed to access all of these, they let others Execute!
-        obj.MyMethod2();
-        obj.Data2.MyMethod();
-        obj.Data2.MyField.ToString();
-    }
-
-    public void TestMemberNobodyCanExecute(MemberNobodyCanExecute obj)
-    {
-        // We shouldn't be able to access any of these, as 'other types' can't..
-        obj.MyMethod();
-        obj.Data.MyMethod();
-        obj.Data.MyField.ToString();
-
-        // We should be allowed to access all of these, they let others Execute!
-        obj.MyMethod2();
-        obj.Data2.MyMethod();
-        obj.Data2.MyField.ToString();
-    }
-}";
-
-        await Verifier(code,
-            // AUTO-GENERATED DIAGNOSTICS BELOW //
-// /0/Test0.cs(44,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'MyMethod' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(44, 9, 44, 19).WithArguments("an 'Execute' same-type", "MyMethod", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(45,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'MyMethod' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(45, 9, 45, 24).WithArguments("an 'Execute' same-type", "MyMethod", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(46,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'MyMethod' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(46, 9, 46, 23).WithArguments("an 'Execute' same-type", "MyMethod", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(48,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(48, 9, 48, 13).WithArguments("an 'Execute' same-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(49,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(49, 9, 49, 18).WithArguments("an 'Execute' same-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(50,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(50, 9, 50, 17).WithArguments("an 'Execute' same-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(52,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(52, 9, 52, 13).WithArguments("an 'Execute' same-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(53,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(53, 9, 53, 18).WithArguments("an 'Execute' same-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(54,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(54, 9, 54, 17).WithArguments("an 'Execute' same-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(96,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'MyMethod' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(96, 9, 96, 19).WithArguments("an 'Execute' same-type", "MyMethod", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(97,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'MyMethod' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(97, 9, 97, 24).WithArguments("an 'Execute' same-type", "MyMethod", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(98,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'MyMethod' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(98, 9, 98, 23).WithArguments("an 'Execute' other-type", "MyMethod", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(100,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(100, 9, 100, 13).WithArguments("an 'Execute' same-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(101,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(101, 9, 101, 18).WithArguments("an 'Execute' same-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(102,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(102, 9, 102, 17).WithArguments("an 'Execute' other-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(104,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(104, 9, 104, 13).WithArguments("an 'Execute' same-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(105,9): error RA0002: Tried to perform an 'Execute' same-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(105, 9, 105, 18).WithArguments("an 'Execute' same-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(106,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(106, 9, 106, 17).WithArguments("an 'Execute' other-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(128,9): error RA0002: Tried to perform an 'Execute' friend-type access to member 'MyMethod' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(128, 9, 128, 23).WithArguments("an 'Execute' friend-type", "MyMethod", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(129,9): error RA0002: Tried to perform an 'Execute' friend-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(129, 9, 129, 17).WithArguments("an 'Execute' friend-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(130,9): error RA0002: Tried to perform an 'Execute' friend-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(130, 9, 130, 17).WithArguments("an 'Execute' friend-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(141,9): error RA0002: Tried to perform an 'Execute' friend-type access to member 'MyMethod' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(141, 9, 141, 23).WithArguments("an 'Execute' friend-type", "MyMethod", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(142,9): error RA0002: Tried to perform an 'Execute' friend-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(142, 9, 142, 17).WithArguments("an 'Execute' friend-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(143,9): error RA0002: Tried to perform an 'Execute' friend-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(143, 9, 143, 17).WithArguments("an 'Execute' friend-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(157,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'MyMethod' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(157, 9, 157, 23).WithArguments("an 'Execute' other-type", "MyMethod", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(158,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(158, 9, 158, 17).WithArguments("an 'Execute' other-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(159,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'Data' in type 'TypeNobodyCanExecute', despite having no access. Type Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(159, 9, 159, 17).WithArguments("an 'Execute' other-type", "Data", "TypeNobodyCanExecute", "having no", "Type Permissions: ---------"),
-// /0/Test0.cs(170,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'MyMethod' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(170, 9, 170, 23).WithArguments("an 'Execute' other-type", "MyMethod", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(171,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(171, 9, 171, 17).WithArguments("an 'Execute' other-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------"),
-// /0/Test0.cs(172,9): error RA0002: Tried to perform an 'Execute' other-type access to member 'Data' in type 'MemberNobodyCanExecute', despite having no access. Member Permissions: ---------
-VerifyCS.Diagnostic().WithSpan(172, 9, 172, 17).WithArguments("an 'Execute' other-type", "Data", "MemberNobodyCanExecute", "having no", "Member Permissions: ---------")
-            );
-    }
-}

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

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MSBuild\Robust.Properties.targets" />
-  <Import Project="..\MSBuild\Robust.Engine.props" />
-  
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <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>
-    <ProjectReference Include="..\Robust.Analyzers\Robust.Analyzers.csproj"/>
-  </ItemGroup>
-</Project>

Robust.Analyzers/AccessAnalyzer.cs

@@ -1,253 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Shared.Analyzers.Implementation;
-
-namespace Robust.Analyzers
-{
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class AccessAnalyzer : DiagnosticAnalyzer
-    {
-        private const string AccessAttributeType = "Robust.Shared.Analyzers.AccessAttribute";
-        private const string PureAttributeType = "System.Diagnostics.Contracts.PureAttribute";
-
-        [SuppressMessage("ReSharper", "RS2008")]
-        private static readonly DiagnosticDescriptor AccessRule = new (
-            Diagnostics.IdAccess,
-            "Invalid access",
-            "Tried to perform {0} access to member '{1}' in type '{2}', despite {3} access. {4}.",
-            "Usage",
-            DiagnosticSeverity.Error,
-            true,
-            "Make sure to give the accessing type the correct access permissions.");
-
-        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics =>
-            ImmutableArray.Create(AccessRule);
-
-        public override void Initialize(AnalysisContext context)
-        {
-            context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
-            context.EnableConcurrentExecution();
-            context.RegisterOperationAction(CheckFriendship,
-                OperationKind.FieldReference,
-                OperationKind.PropertyReference,
-                OperationKind.MethodReference,
-                OperationKind.Invocation);
-        }
-
-        private void CheckFriendship(OperationAnalysisContext context)
-        {
-            var operation = context.Operation;
-
-            // The symbol representing the member being accessed.
-            ISymbol member;
-
-            // The operation to target when determining access type.
-            IOperation targetAccess;
-
-            switch (operation)
-            {
-                case IMemberReferenceOperation memberRef:
-                {
-                    member = memberRef.Member;
-                    targetAccess = memberRef.Parent;
-                    break;
-                }
-
-                case IInvocationOperation invocation:
-                {
-                    member = invocation.TargetMethod;
-                    targetAccess = invocation;
-                    break;
-                }
-
-                default:
-                    return;
-            }
-
-            // Get the info of the type defining the member, so we can check the attributes later...
-            var accessedType = member.ContainingType;
-
-            // Get the attributes
-            var friendAttribute = context.Compilation.GetTypeByMetadataName(AccessAttributeType);
-
-            // Get the type that is containing this expression, or, the type where this is happening.
-            if (context.ContainingSymbol?.ContainingType is not {} accessingType)
-                return;
-
-            // Determine which type of access is happening here... Read, write or execute?
-            var accessAttempt = DetermineAccess(context, targetAccess, operation);
-
-            // Check whether this is a "self" access, including inheritors.
-            var selfAccess = InheritsFromOrEquals(accessingType, accessedType);
-
-            // Helper function to deduplicate attribute-checking code.
-            bool CheckAttributeFriendship(AttributeData attribute, bool isMemberAttribute)
-            {
-                // If the attribute isn't the friend attribute, we don't care about it.
-                if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, friendAttribute))
-                    return false;
-
-                var self    = AccessAttribute.SelfDefaultPermissions;
-                var friends = AccessAttribute.FriendDefaultPermissions;
-                var others  = AccessAttribute.OtherDefaultPermissions;
-
-                foreach (var kv in attribute.NamedArguments)
-                {
-                    if (kv.Value.Value is not byte value)
-                        continue;
-
-                    var permissions = (AccessPermissions) value;
-
-                    switch (kv.Key)
-                    {
-                        case nameof(AccessAttribute.Self):
-                        {
-                            self = permissions;
-                            break;
-                        }
-
-                        case nameof(AccessAttribute.Friend):
-                        {
-                            friends = permissions;
-                            break;
-                        }
-
-                        case nameof(AccessAttribute.Other):
-                        {
-                            others = permissions;
-                            break;
-                        }
-
-                        default:
-                            continue;
-                    }
-                }
-
-                // By default, we will check the "other" permissions unless we find we're dealing with a friend or self.
-                var permissionCheck = others;
-
-                // Human-readable relation between accessing and accessed types.
-                var accessingRelation = "other-type";
-
-                if (!selfAccess)
-                {
-                    // This is not a self-access, so we need to determine whether the accessing type is a friend.
-                    // Check all types allowed in the friend attribute. (We assume there's only one constructor arg.)
-                    var types = attribute.ConstructorArguments[0].Values;
-
-                    foreach (var constant in types)
-                    {
-                        // Check if the value is a type...
-                        if (constant.Value is not INamedTypeSymbol friendType)
-                            continue;
-
-                        // Check if the accessing type is specified in the attribute...
-                        if (!InheritsFromOrEquals(accessingType, friendType))
-                            continue;
-
-                        // Set the permissions check to the friend permissions!
-                        permissionCheck = friends;
-                        accessingRelation = "friend-type";
-                        break;
-                    }
-                }
-                else
-                {
-                    // Self-access, so simply set the permissions check to self.
-                    permissionCheck = self;
-                    accessingRelation = "same-type";
-                }
-
-                // If we allow this access, return! All is good.
-                if ((accessAttempt & permissionCheck) != 0)
-                    return true;
-
-                // Access denied! Report an error.
-                context.ReportDiagnostic(
-                    Diagnostic.Create(AccessRule, operation.Syntax.GetLocation(),
-                        $"a{(accessAttempt == AccessPermissions.Execute ? "n" : "")} '{accessAttempt}' {accessingRelation}",
-                        $"{member.Name}",
-                        $"{accessedType.Name}",
-                        $"{(permissionCheck == AccessPermissions.None ? "having no" : $"only having '{permissionCheck}'")}",
-                        $"{(isMemberAttribute ? "Member" : "Type")} Permissions: {self.ToUnixPermissions()}{friends.ToUnixPermissions()}{others.ToUnixPermissions()}"));
-
-                // Only return ONE error.
-                return true;
-            }
-
-            // Check attributes in the member first, since they take priority and can override type restrictions.
-            foreach (var attribute in member.GetAttributes())
-            {
-                if(CheckAttributeFriendship(attribute, true))
-                    return;
-            }
-
-            // Check attributes in the type containing the member last.
-            foreach (var attribute in accessedType.GetAttributes())
-            {
-                if(CheckAttributeFriendship(attribute, false))
-                    return;
-            }
-        }
-
-        private static AccessPermissions DetermineAccess(OperationAnalysisContext context, IOperation operation, IOperation original)
-        {
-            switch (operation)
-            {
-                case IAssignmentOperation assign:
-                {
-                    return assign.Target.Equals(original) ? AccessPermissions.Write : AccessPermissions.Read;
-                }
-
-                case IInvocationOperation invoke:
-                {
-                    var pureAttribute = context.Compilation.GetTypeByMetadataName(PureAttributeType);
-
-                    foreach (var attribute in invoke.TargetMethod.GetAttributes())
-                    {
-                        // Pure methods are treated as read accesses.
-                        if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, pureAttribute))
-                            return AccessPermissions.Read;
-                    }
-
-                    return AccessPermissions.Execute;
-                }
-
-                case IMemberReferenceOperation member:
-                {
-                    return DetermineAccess(context, member.Parent, operation);
-                }
-
-                default:
-                {
-                    return AccessPermissions.Read;
-                }
-            }
-        }
-
-        private bool InheritsFromOrEquals(INamedTypeSymbol type, INamedTypeSymbol baseType)
-        {
-            foreach (var otherType in GetBaseTypesAndThis(type))
-            {
-                if (SymbolEqualityComparer.Default.Equals(otherType, baseType))
-                    return true;
-            }
-
-            return false;
-        }
-
-        private IEnumerable<INamedTypeSymbol> GetBaseTypesAndThis(INamedTypeSymbol namedType)
-        {
-            var current = namedType;
-            while (current != null)
-            {
-                yield return current;
-                current = current.BaseType;
-            }
-        }
-    }
-}

Robust.Analyzers/Diagnostics.cs

@@ -1,15 +1,10 @@
 using Microsoft.CodeAnalysis;
 
-namespace Robust.Analyzers;
-
-public static class Diagnostics
+namespace Robust.Generators
 {
-    public const string IdExplicitInterface = "RA0000";
-    public const string IdSerializable = "RA0001";
-    public const string IdAccess = "RA0002";
-    public const string IdExplicitVirtual = "RA0003";
-    public const string IdTaskResult = "RA0004";
-
-    public static SuppressionDescriptor MeansImplicitAssignment =>
-        new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");
+    public static class Diagnostics
+    {
+        public static SuppressionDescriptor MeansImplicitAssignment =>
+            new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");
+    }
 }

Robust.Analyzers/ExplicitInterfaceAnalyzer.cs

@@ -24,14 +24,14 @@ namespace Robust.Analyzers
             SyntaxKind.OverrideKeyword
         };
 
-        [SuppressMessage("ReSharper", "RS2008")] private static readonly DiagnosticDescriptor Rule = new(
-            Diagnostics.IdExplicitInterface,
-            "No explicit interface specified",
-            "No explicit interface specified",
-            "Usage",
-            DiagnosticSeverity.Warning,
-            isEnabledByDefault: true,
-            description: "Make sure to specify the interface in your method-declaration.");
+        public const string DiagnosticId = "RA0000";
+
+        private const string Title = "No explicit interface specified";
+        private const string MessageFormat = "No explicit interface specified";
+        private const string Description = "Make sure to specify the interface in your method-declaration.";
+        private const string Category = "Usage";
+
+        [SuppressMessage("ReSharper", "RS2008")] private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
 
         private const string RequiresExplicitImplementationAttributeMetadataName =
             "Robust.Shared.Analyzers.RequiresExplicitImplementationAttribute";

Robust.Analyzers/ExplicitVirtualAnalyzer.cs

@@ -1,176 +0,0 @@
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class ExplicitVirtualAnalyzer : DiagnosticAnalyzer
-{
-    internal const string Attribute = "Robust.Shared.Analyzers.VirtualAttribute";
-
-    [SuppressMessage("ReSharper", "RS2008")]
-    private static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdExplicitVirtual,
-        "Class must be explicitly marked as [Virtual], abstract, static or sealed",
-        "Class must be explicitly marked as [Virtual], abstract, static or sealed",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        description: "Class must be explicitly marked as [Virtual], abstract, static or sealed.");
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterSyntaxNodeAction(AnalyzeNode, SyntaxKind.ClassDeclaration);
-    }
-
-    private static bool HasAttribute(INamedTypeSymbol namedTypeSymbol, INamedTypeSymbol attrSymbol)
-    {
-        return namedTypeSymbol.GetAttributes()
-            .Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attrSymbol));
-    }
-
-    private static void AnalyzeNode(SyntaxNodeAnalysisContext context)
-    {
-        var attrSymbol = context.Compilation.GetTypeByMetadataName(Attribute);
-        var classDecl = (ClassDeclarationSyntax)context.Node;
-        var classSymbol = context.SemanticModel.GetDeclaredSymbol(classDecl);
-        if (classSymbol == null)
-            return;
-
-        if (classSymbol.IsSealed || classSymbol.IsAbstract || classSymbol.IsStatic)
-            return;
-
-        if (HasAttribute(classSymbol, attrSymbol))
-            return;
-
-        var diag = Diagnostic.Create(Rule, classDecl.Keyword.GetLocation());
-        context.ReportDiagnostic(diag);
-    }
-}
-
-// Doesn't work as I'd hoped: Roslyn doesn't provide an API for global usings and I can't get batch changes to work.
-/*
-[ExportCodeFixProvider(LanguageNames.CSharp)]
-public sealed class ExplicitVirtualCodeFixProvider : CodeFixProvider
-{
-    private const string TitleSealed = "Annotate class as sealed.";
-    private const string TitleVirtual = "Annotate class as [Virtual].";
-    private const string TitleAbstract = "Annotate class as abstract.";
-    private const string TitleStatic = "Annotate class as static.";
-
-    public override async Task RegisterCodeFixesAsync(CodeFixContext context)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-
-        foreach (var diagnostic in context.Diagnostics)
-        {
-            var span = diagnostic.Location.SourceSpan;
-            var classDecl = root.FindToken(span.Start).Parent.AncestorsAndSelf().OfType<ClassDeclarationSyntax>()
-                .First();
-
-            context.RegisterCodeFix(
-                CodeAction.Create(
-                    TitleVirtual,
-                    c => FixVirtualAsync(context.Document, classDecl, c),
-                    TitleVirtual),
-                diagnostic);
-
-            context.RegisterCodeFix(
-                CodeAction.Create(
-                    TitleStatic,
-                    c => FixStaticAsync(context.Document, classDecl, c),
-                    TitleStatic),
-                diagnostic);
-
-            context.RegisterCodeFix(
-                CodeAction.Create(
-                    TitleSealed,
-                    c => FixSealedAsync(context.Document, classDecl, c),
-                    TitleSealed),
-                diagnostic);
-
-            context.RegisterCodeFix(
-                CodeAction.Create(
-                    TitleAbstract,
-                    c => FixAbstractAsync(context.Document, classDecl, c),
-                    TitleAbstract),
-                diagnostic);
-        }
-    }
-
-    private async Task<Document> FixVirtualAsync(
-        Document document,
-        ClassDeclarationSyntax classDecl,
-        CancellationToken cancellationToken)
-    {
-        var ns = "Robust.Shared.Analyzers";
-        var attrib = SyntaxFactory.Attribute(SyntaxFactory.ParseName("Virtual"));
-
-        var newClassDecl = classDecl.AddAttributeLists(
-            SyntaxFactory.AttributeList(SyntaxFactory.SeparatedList(new[] { attrib })));
-
-        var root = (CompilationUnitSyntax)await document.GetSyntaxRootAsync(cancellationToken);
-        root = root.ReplaceNode(classDecl, newClassDecl);
-
-        var options = await document.GetOptionsAsync(cancellationToken);
-
-        if (root.Usings.All(u => u.Name.ToString() != ns))
-        {
-            root = root.AddUsings(SyntaxFactory.UsingDirective(SyntaxFactory.ParseName(ns)));
-        }
-
-        return document.WithSyntaxRoot(root);
-    }
-
-    private async Task<Document> FixStaticAsync(
-        Document document,
-        ClassDeclarationSyntax classDecl,
-        CancellationToken cancellationToken)
-    {
-        var newClassDecl = classDecl.AddModifiers(SyntaxFactory.Token(SyntaxKind.StaticKeyword));
-
-        var root = (CompilationUnitSyntax)await document.GetSyntaxRootAsync(cancellationToken);
-        root = root.ReplaceNode(classDecl, newClassDecl);
-
-        return document.WithSyntaxRoot(root);
-    }
-
-    private async Task<Document> FixAbstractAsync(
-        Document document,
-        ClassDeclarationSyntax classDecl,
-        CancellationToken cancellationToken)
-    {
-        var newClassDecl = classDecl.AddModifiers(SyntaxFactory.Token(SyntaxKind.AbstractKeyword));
-
-        var root = (CompilationUnitSyntax)await document.GetSyntaxRootAsync(cancellationToken);
-        root = root.ReplaceNode(classDecl, newClassDecl);
-
-        return document.WithSyntaxRoot(root);
-    }
-
-    private async Task<Document> FixSealedAsync(
-        Document document,
-        ClassDeclarationSyntax classDecl,
-        CancellationToken cancellationToken)
-    {
-        var newClassDecl = classDecl.AddModifiers(SyntaxFactory.Token(SyntaxKind.SealedKeyword));
-
-        var root = (CompilationUnitSyntax)await document.GetSyntaxRootAsync(cancellationToken);
-        root = root.ReplaceNode(classDecl, newClassDecl);
-
-        return document.WithSyntaxRoot(root);
-    }
-
-    public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
-    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(Diagnostics.IdExplicitVirtual);
-}
-*/

Robust.Analyzers/MeansImplicitAssigmentSuppressor.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Robust.Generators;
 
 namespace Robust.Analyzers
 {

Robust.Analyzers/Robust.Analyzers.csproj

@@ -2,19 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>10</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <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 FriendAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" />
-    <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.8.0" />
   </ItemGroup>
 
 </Project>

Robust.Analyzers/SerializableAnalyzer.cs

@@ -17,21 +17,19 @@ namespace Robust.Analyzers
     public class SerializableAnalyzer : DiagnosticAnalyzer
     {
         // Metadata of the analyzer
+        public const string DiagnosticId = "RA0001";
 
         // You could use LocalizedString but it's a little more complicated for this sample
+        private const string Title = "Class not marked as (Net)Serializable";
+        private const string MessageFormat = "Class not marked as (Net)Serializable";
+        private const string Description = "The class should be marked as (Net)Serializable.";
+        private const string Category = "Usage";
 
         private const string RequiresSerializableAttributeMetadataName = "Robust.Shared.Analyzers.RequiresSerializableAttribute";
         private const string SerializableAttributeMetadataName = "System.SerializableAttribute";
         private const string NetSerializableAttributeMetadataName = "Robust.Shared.Serialization.NetSerializableAttribute";
 
-        [SuppressMessage("ReSharper", "RS2008")] private static readonly DiagnosticDescriptor Rule = new(
-            Diagnostics.IdSerializable,
-            "Class not marked as (Net)Serializable",
-            "Class not marked as (Net)Serializable",
-            "Usage",
-            DiagnosticSeverity.Warning,
-            isEnabledByDefault: true,
-            description: "The class should be marked as (Net)Serializable.");
+        [SuppressMessage("ReSharper", "RS2008")] private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
 
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 
@@ -141,8 +139,7 @@ namespace Robust.Analyzers
             return document.WithSyntaxRoot(root);
         }
 
-        public sealed override ImmutableArray<string> FixableDiagnosticIds
-            => ImmutableArray.Create(Diagnostics.IdSerializable);
+        public sealed override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(SerializableAnalyzer.DiagnosticId);
 
         public override FixAllProvider GetFixAllProvider()
         {

Robust.Analyzers/TaskResultAnalyzer.cs

@@ -1,44 +0,0 @@
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class TaskResultAnalyzer : DiagnosticAnalyzer
-{
-    [SuppressMessage("ReSharper", "RS2008")]
-    private static readonly DiagnosticDescriptor ResultRule = new DiagnosticDescriptor(
-        Diagnostics.IdTaskResult,
-        "Risk of deadlock from accessing Task<T>.Result",
-        "Accessing Task<T>.Result is dangerous and can cause deadlocks in some contexts. If you understand how this works and are certain that you aren't causing a deadlock here, mute this error with #pragma.",
-        "Usage",
-        DiagnosticSeverity.Error,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics =>
-        ImmutableArray.Create(ResultRule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterOperationAction(Check, OperationKind.PropertyReference);
-    }
-
-    private static void Check(OperationAnalysisContext context)
-    {
-        var taskType = context.Compilation.GetTypeByMetadataName("System.Threading.Tasks.Task`1");
-
-        var operation = (IPropertyReferenceOperation) context.Operation;
-        var member = operation.Member;
-
-        if (member.Name == "Result" && taskType.Equals(member.ContainingType.ConstructedFrom, SymbolEqualityComparer.Default))
-        {
-            var diag = Diagnostic.Create(ResultRule, operation.Syntax.GetLocation());
-            context.ReportDiagnostic(diag);
-        }
-    }
-}

Robust.Benchmarks/Configs/DefaultSQLConfig.cs

@@ -1,53 +0,0 @@
-using System.Collections.Generic;
-using System.Globalization;
-using BenchmarkDotNet.Analysers;
-using BenchmarkDotNet.Columns;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnosers;
-using BenchmarkDotNet.Exporters;
-using BenchmarkDotNet.Filters;
-using BenchmarkDotNet.Jobs;
-using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Order;
-using BenchmarkDotNet.Reports;
-using BenchmarkDotNet.Validators;
-using Robust.Benchmarks.Exporters;
-
-namespace Robust.Benchmarks.Configs;
-
-public sealed class DefaultSQLConfig : IConfig
-{
-    public static readonly IConfig Instance = new DefaultSQLConfig();
-
-    private DefaultSQLConfig(){}
-
-    public IEnumerable<IExporter> GetExporters()
-    {
-        yield return SQLExporter.Default;
-    }
-
-    public IEnumerable<IColumnProvider> GetColumnProviders() => DefaultConfig.Instance.GetColumnProviders();
-
-    public IEnumerable<ILogger> GetLoggers() => DefaultConfig.Instance.GetLoggers();
-
-    public IEnumerable<IDiagnoser> GetDiagnosers() => DefaultConfig.Instance.GetDiagnosers();
-
-    public IEnumerable<IAnalyser> GetAnalysers() => DefaultConfig.Instance.GetAnalysers();
-
-    public IEnumerable<Job> GetJobs() => DefaultConfig.Instance.GetJobs();
-
-    public IEnumerable<IValidator> GetValidators() => DefaultConfig.Instance.GetValidators();
-
-    public IEnumerable<HardwareCounter> GetHardwareCounters() => DefaultConfig.Instance.GetHardwareCounters();
-
-    public IEnumerable<IFilter> GetFilters() => DefaultConfig.Instance.GetFilters();
-
-    public IEnumerable<BenchmarkLogicalGroupRule> GetLogicalGroupRules() => DefaultConfig.Instance.GetLogicalGroupRules();
-
-    public IOrderer Orderer => DefaultConfig.Instance.Orderer!;
-    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;
-}

Robust.Benchmarks/EntityManager/AddRemoveComponentBenchmark.cs

@@ -1,54 +0,0 @@
-using BenchmarkDotNet.Attributes;
-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 class AddRemoveComponentBenchmark
-{
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    [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 coords = new MapCoordinates(0, 0, new MapId(1));
-        _simulation.AddMap(coords.MapId);
-
-        for (var i = 0; i < N; i++)
-        {
-            _entityManager.SpawnEntity(null, coords);
-        }
-    }
-
-    [Benchmark]
-    public void AddRemoveComponent()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            _entityManager.AddComponent<A>(uid);
-            _entityManager.RemoveComponent<A>(uid);
-        }
-    }
-
-    [ComponentProtoName("A")]
-    public sealed class A : Component
-    {
-    }
-}

Robust.Benchmarks/EntityManager/ComponentIndexBenchmark.cs

@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Benchmarks.EntityManager;
-
-public class ComponentIndexBenchmark
-{
-    // Just a bunch of types to bloat the test lists.
-
-    private readonly CompIndexFetcher _compIndexFetcherDirect;
-    private readonly IFetcher _compIndexFetcher;
-    private readonly DictFetcher _dictFetcherDirect;
-    private readonly IFetcher _dictFetcher;
-
-
-    public ComponentIndexBenchmark()
-    {
-        _compIndexFetcherDirect = new CompIndexFetcher();
-        _compIndexFetcher = _compIndexFetcherDirect;
-        _dictFetcherDirect = new DictFetcher();
-        _dictFetcher = _dictFetcherDirect;
-    }
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        var types = typeof(ComponentIndexBenchmark)
-            .GetNestedTypes(BindingFlags.NonPublic)
-            .Where(t => t.Name.StartsWith("TestType"))
-            .ToArray();
-
-        _compIndexFetcher.Init(types);
-        _dictFetcher.Init(types);
-    }
-
-    [Benchmark]
-    public int BenchCompIndex() => _compIndexFetcher.Get<TestType50>();
-
-    [Benchmark]
-    public int BenchDict() => _dictFetcher.Get<TestType50>();
-
-    [Benchmark]
-    public int BenchCompIndexDirect() => _compIndexFetcherDirect.Get<TestType50>();
-
-    [Benchmark]
-    public int BenchDictDirect() => _dictFetcherDirect.Get<TestType50>();
-
-    private static CompIdx ArrayIndexFor<T>() => CompArrayIndex<T>.Idx;
-
-    private static int _compIndexMaster = -1;
-
-    private static class CompArrayIndex<T>
-    {
-        // ReSharper disable once StaticMemberInGenericType
-        public static readonly CompIdx Idx = new(Interlocked.Increment(ref _compIndexMaster));
-    }
-
-    private static CompIdx GetCompIdIndex(Type type)
-    {
-        return (CompIdx)typeof(CompArrayIndex<>)
-            .MakeGenericType(type)
-            .GetField(nameof(CompArrayIndex<int>.Idx), BindingFlags.Static | BindingFlags.Public)!
-            .GetValue(null)!;
-    }
-
-    private interface IFetcher
-    {
-        void Init(Type[] types);
-
-        int Get<T>();
-    }
-
-    private sealed class CompIndexFetcher : IFetcher
-    {
-        private int[] _values = Array.Empty<int>();
-
-        public void Init(Type[] types)
-        {
-            var max = types.Max(t => GetCompIdIndex(t).Value);
-
-            _values = new int[max + 1];
-
-            var i = 0;
-            foreach (var type in types)
-            {
-                _values[GetCompIdIndex(type).Value] = i++;
-            }
-        }
-
-        public int Get<T>()
-        {
-            return _values[CompArrayIndex<T>.Idx.Value];
-        }
-    }
-
-    private sealed class DictFetcher : IFetcher
-    {
-        private readonly Dictionary<Type, int> _values = new();
-
-        public void Init(Type[] types)
-        {
-            var i = 0;
-            foreach (var type in types)
-            {
-                _values[type] = i++;
-            }
-        }
-
-        public int Get<T>()
-        {
-            return _values[typeof(T)];
-        }
-    }
-
-    // Just a bunch of types to pad the size of the arrays and such.
-
-    // @formatter:off
-    // ReSharper disable UnusedType.Local
-    private sealed class TestType1{}
-    private sealed class TestType2{}
-    private sealed class TestType3{}
-    private sealed class TestType4{}
-    private sealed class TestType5{}
-    private sealed class TestType6{}
-    private sealed class TestType7{}
-    private sealed class TestType8{}
-    private sealed class TestType9{}
-    private sealed class TestType10{}
-    private sealed class TestType11{}
-    private sealed class TestType12{}
-    private sealed class TestType13{}
-    private sealed class TestType14{}
-    private sealed class TestType15{}
-    private sealed class TestType16{}
-    private sealed class TestType17{}
-    private sealed class TestType18{}
-    private sealed class TestType19{}
-    private sealed class TestType20{}
-    private sealed class TestType21{}
-    private sealed class TestType22{}
-    private sealed class TestType23{}
-    private sealed class TestType24{}
-    private sealed class TestType25{}
-    private sealed class TestType26{}
-    private sealed class TestType27{}
-    private sealed class TestType28{}
-    private sealed class TestType29{}
-    private sealed class TestType30{}
-    private sealed class TestType31{}
-    private sealed class TestType32{}
-    private sealed class TestType33{}
-    private sealed class TestType34{}
-    private sealed class TestType35{}
-    private sealed class TestType36{}
-    private sealed class TestType37{}
-    private sealed class TestType38{}
-    private sealed class TestType39{}
-    private sealed class TestType40{}
-    private sealed class TestType41{}
-    private sealed class TestType42{}
-    private sealed class TestType43{}
-    private sealed class TestType44{}
-    private sealed class TestType45{}
-    private sealed class TestType46{}
-    private sealed class TestType47{}
-    private sealed class TestType48{}
-    private sealed class TestType49{}
-    private sealed class TestType50{}
-    private sealed class TestType51{}
-    private sealed class TestType52{}
-    private sealed class TestType53{}
-    private sealed class TestType54{}
-    private sealed class TestType55{}
-    private sealed class TestType56{}
-    private sealed class TestType57{}
-    private sealed class TestType58{}
-    private sealed class TestType59{}
-    private sealed class TestType60{}
-    private sealed class TestType61{}
-    private sealed class TestType62{}
-    private sealed class TestType63{}
-    private sealed class TestType64{}
-    private sealed class TestType65{}
-    private sealed class TestType66{}
-    private sealed class TestType67{}
-    private sealed class TestType68{}
-    private sealed class TestType69{}
-    private sealed class TestType70{}
-    private sealed class TestType71{}
-    private sealed class TestType72{}
-    private sealed class TestType73{}
-    private sealed class TestType74{}
-    private sealed class TestType75{}
-    private sealed class TestType76{}
-    private sealed class TestType77{}
-    private sealed class TestType78{}
-    private sealed class TestType79{}
-    private sealed class TestType80{}
-    private sealed class TestType81{}
-    private sealed class TestType82{}
-    private sealed class TestType83{}
-    private sealed class TestType84{}
-    private sealed class TestType85{}
-    private sealed class TestType86{}
-    private sealed class TestType87{}
-    private sealed class TestType88{}
-    private sealed class TestType89{}
-    private sealed class TestType90{}
-    private sealed class TestType91{}
-    private sealed class TestType92{}
-    private sealed class TestType93{}
-    private sealed class TestType94{}
-    private sealed class TestType95{}
-    private sealed class TestType96{}
-    private sealed class TestType97{}
-    private sealed class TestType98{}
-    private sealed class TestType99{}
-    // ReSharper restore UnusedType.Local
-    // @formatter:on
-}

Robust.Benchmarks/EntityManager/GetComponentBenchmark.cs

@@ -1,61 +0,0 @@
-using System;
-using BenchmarkDotNet.Attributes;
-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 class GetComponentBenchmark
-{
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    [UsedImplicitly]
-    [Params(1, 10, 100, 1000)]
-    public int N;
-
-    public A[] Comps = default!;
-
-    [GlobalSetup]
-    public void GlobalSetup()
-    {
-        _simulation = RobustServerSimulation
-            .NewSimulation()
-            .RegisterComponents(f => f.RegisterClass<A>())
-            .InitializeInstance();
-
-        _entityManager = _simulation.Resolve<IEntityManager>();
-
-        Comps = new A[N+2];
-
-        var coords = new MapCoordinates(0, 0, new MapId(1));
-        _simulation.AddMap(coords.MapId);
-
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, coords);
-            _entityManager.AddComponent<A>(uid);
-        }
-    }
-
-    [Benchmark]
-    public A[] GetComponent()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            Comps[i] = _entityManager.GetComponent<A>(new EntityUid(i));
-        }
-
-        // Return something so the JIT doesn't optimize out all the GetComponent calls.
-        return Comps;
-    }
-
-    [ComponentProtoName("A")]
-    public sealed class A : Component
-    {
-    }
-}

Robust.Benchmarks/EntityManager/SpawnDeleteEntityBenchmark.cs

@@ -1,62 +0,0 @@
-using BenchmarkDotNet.Attributes;
-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 class SpawnDeleteEntityBenchmark
-{
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    private MapCoordinates _mapCoords = MapCoordinates.Nullspace;
-    private EntityCoordinates _entCoords = EntityCoordinates.Invalid;
-
-    [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>();
-
-        _mapCoords = new MapCoordinates(0, 0, new MapId(1));
-        var uid = _simulation.AddMap(_mapCoords.MapId);
-        _entCoords = new EntityCoordinates(uid, 0, 0);
-    }
-
-    [Benchmark(Baseline = true)]
-    public void SpawnDeleteEntityMapCoords()
-    {
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, _mapCoords);
-            _entityManager.DeleteEntity(uid);
-        }
-    }
-
-    [Benchmark]
-    public void SpawnDeleteEntityEntCoords()
-    {
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, _entCoords);
-            _entityManager.DeleteEntity(uid);
-        }
-    }
-
-    [ComponentProtoName("A")]
-    public sealed class A : Component
-    {
-    }
-}

Robust.Benchmarks/Exporters/SQLExporter.cs

@@ -1,195 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using BenchmarkDotNet.Exporters;
-using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Mathematics;
-using BenchmarkDotNet.Reports;
-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
-{
-    public static readonly IExporter Default = new SQLExporter();
-
-    private SQLExporter(){}
-
-    public void ExportToLog(Summary summary, ILogger logger)
-    {
-        Export(summary, logger);
-    }
-
-    public IEnumerable<string> ExportToFiles(Summary summary, ILogger consoleLogger)
-    {
-        Export(summary, consoleLogger);
-        return Array.Empty<string>();
-    }
-
-    private bool TryGetEnvironmentVariable(string name, ILogger logger, [NotNullWhen(true)] out string? value)
-    {
-        value = Environment.GetEnvironmentVariable(name);
-        if (value == null)
-            logger.WriteError($"ROBUST_BENCHMARKS_ENABLE_SQL is set, but {name} is missing.");
-        return value != null;
-    }
-
-    private void Export(Summary summary, ILogger logger)
-    {
-        if (!TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_ADDRESS", logger, out var address) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_PORT", logger, out var rawPort) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_USER", logger, out var user) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_PASSWORD", logger, out var password) ||
-            !TryGetEnvironmentVariable("ROBUST_BENCHMARKS_SQL_DATABASE", logger, out var db) ||
-            !TryGetEnvironmentVariable("GITHUB_SHA", logger, out var gitHash))
-            return;
-
-        if (!int.TryParse(rawPort, out var port))
-        {
-            logger.WriteError("Failed parsing ROBUST_BENCHMARKS_SQL_PORT to int.");
-            return;
-        }
-
-        var builder = new DbContextOptionsBuilder<BenchmarkContext>();
-        var connectionString = new NpgsqlConnectionStringBuilder
-        {
-            Host = address,
-            Port = port,
-            Database = db,
-            Username = user,
-            Password = password
-        }.ConnectionString;
-        builder.UseNpgsql(connectionString);
-        using var ctx = new BenchmarkContext(builder.Options);
-        try
-        {
-            ctx.Database.OpenConnection();
-            var con = (NpgsqlConnection) ctx.Database.GetDbConnection();
-            con.TypeMapper.AddTypeResolverFactory(new JsonOverrideTypeHandlerResolverFactory(new JsonSerializerOptions
-            {
-                NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
-            }));
-
-            ctx.Database.Migrate();
-            ctx.BenchmarkRuns.Add(BenchmarkRun.FromSummary(summary, gitHash));
-            ctx.SaveChanges();
-        }
-        finally
-        {
-            ctx.Dispose();
-        }
-    }
-
-    public string Name => "sql";
-}
-
-// https://github.com/npgsql/efcore.pg/issues/1107#issuecomment-945126627
-class JsonOverrideTypeHandlerResolverFactory : TypeHandlerResolverFactory
-{
-    private readonly JsonSerializerOptions _options;
-
-    public JsonOverrideTypeHandlerResolverFactory(JsonSerializerOptions options)
-        => _options = options;
-
-    public override TypeHandlerResolver Create(NpgsqlConnector connector)
-        => new JsonOverrideTypeHandlerResolver(connector, _options);
-
-    public override string? GetDataTypeNameByClrType(Type clrType)
-        => null;
-
-    public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
-        => null;
-
-    class JsonOverrideTypeHandlerResolver : TypeHandlerResolver
-    {
-        readonly JsonHandler _jsonbHandler;
-
-        internal JsonOverrideTypeHandlerResolver(NpgsqlConnector connector, JsonSerializerOptions options)
-            => _jsonbHandler ??= new JsonHandler(
-                connector.DatabaseInfo.GetPostgresTypeByName("jsonb"),
-                connector.TextEncoding,
-                isJsonb: true,
-                options);
-
-        public override NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
-            => typeName == "jsonb" ? _jsonbHandler : null;
-
-        public override NpgsqlTypeHandler? ResolveByClrType(Type type)
-            // You can add any user-defined CLR types which you want mapped to jsonb
-            => type == typeof(JsonDocument) ? _jsonbHandler : null;
-
-        public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
-            => null; // Let the built-in resolver do this
-    }
-}
-public sealed class DesignTimeContextFactoryPostgres : IDesignTimeDbContextFactory<BenchmarkContext>
-{
-    public BenchmarkContext CreateDbContext(string[] args)
-    {
-        var optionsBuilder = new DbContextOptionsBuilder<BenchmarkContext>();
-        optionsBuilder.UseNpgsql("Server=localhost");
-        return new BenchmarkContext(optionsBuilder.Options);
-    }
-}
-
-public class BenchmarkContext : DbContext
-{
-    public DbSet<BenchmarkRun> BenchmarkRuns { get; set; } = default!;
-
-    public BenchmarkContext() { }
-    public BenchmarkContext(DbContextOptions<BenchmarkContext> options) : base(options) { }
-}
-
-public class BenchmarkRun
-{
-    public int Id { get; set; }
-    public string GitHash { get; set; } = string.Empty;
-
-    [Column(TypeName = "timestamptz")]
-    public DateTime RunDate { get; set; }
-
-    public string Name { get; set; } = string.Empty;
-
-    [Column(TypeName = "jsonb")]
-    public BenchmarkRunReport[] Reports { get; set; } = Array.Empty<BenchmarkRunReport>();
-
-    public static BenchmarkRun FromSummary(Summary summary, string gitHash)
-    {
-        return new BenchmarkRun
-        {
-            Reports = summary.Reports.Select(r => new BenchmarkRunReport
-            {
-                Parameters = r.BenchmarkCase.Parameters.Items.Select(p => new BenchmarkRunParameter
-                {
-                    Name = p.Name,
-                    Value = p.Value
-                }).ToArray(),
-                Statistics = r.ResultStatistics
-            }).ToArray(),
-            Name = summary.BenchmarksCases.First().FolderInfo,
-            RunDate = DateTime.UtcNow,
-            GitHash = gitHash
-        };
-    }
-}
-
-public class BenchmarkRunReport
-{
-    public BenchmarkRunParameter[] Parameters { get; set; } = Array.Empty<BenchmarkRunParameter>();
-    public Statistics Statistics { get; set; } = default!;
-}
-
-public class BenchmarkRunParameter
-{
-    public string Name { get; set; } = string.Empty;
-    public object Value { get; set; } = default!;
-}

Robust.Benchmarks/Migrations/20220328231938_InitialCreate.Designer.cs

@@ -1,55 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    [DbContext(typeof(BenchmarkContext))]
-    [Migration("20220328231938_InitialCreate")]
-    partial class InitialCreate
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Robust.Benchmarks.Exporters.BenchmarkRun", b =>
-                {
-                    b.Property<decimal>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("numeric(20,0)");
-
-                    b.Property<string>("GitHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<BenchmarkRunReport[]>("Reports")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("RunDate")
-                        .HasColumnType("Date");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BenchmarkRuns");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Robust.Benchmarks/Migrations/20220328231938_InitialCreate.cs

@@ -1,35 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    public partial class InitialCreate : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "BenchmarkRuns",
-                columns: table => new
-                {
-                    Id = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
-                    GitHash = table.Column<string>(type: "text", nullable: false),
-                    RunDate = table.Column<DateTime>(type: "Date", nullable: false),
-                    Name = table.Column<string>(type: "text", nullable: false),
-                    Reports = table.Column<BenchmarkRunReport[]>(type: "jsonb", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BenchmarkRuns", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "BenchmarkRuns");
-        }
-    }
-}

Robust.Benchmarks/Migrations/20220510131430_fix-pk.Designer.cs

@@ -1,57 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    [DbContext(typeof(BenchmarkContext))]
-    [Migration("20220510131430_fix-pk")]
-    partial class fixpk
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Robust.Benchmarks.Exporters.BenchmarkRun", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("GitHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<BenchmarkRunReport[]>("Reports")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("RunDate")
-                        .HasColumnType("timestamptz");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BenchmarkRuns");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Robust.Benchmarks/Migrations/20220510131430_fix-pk.cs

@@ -1,51 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    public partial class fixpk : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RunDate",
-                table: "BenchmarkRuns",
-                type: "timestamptz",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldType: "Date");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "Id",
-                table: "BenchmarkRuns",
-                type: "integer",
-                nullable: false,
-                oldClrType: typeof(decimal),
-                oldType: "numeric(20,0)")
-                .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RunDate",
-                table: "BenchmarkRuns",
-                type: "Date",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldType: "timestamptz");
-
-            migrationBuilder.AlterColumn<decimal>(
-                name: "Id",
-                table: "BenchmarkRuns",
-                type: "numeric(20,0)",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldType: "integer")
-                .OldAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-        }
-    }
-}

Robust.Benchmarks/Migrations/BenchmarkContextModelSnapshot.cs

@@ -1,55 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Robust.Benchmarks.Exporters;
-
-#nullable disable
-
-namespace Robust.Benchmarks.Migrations
-{
-    [DbContext(typeof(BenchmarkContext))]
-    partial class BenchmarkContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Robust.Benchmarks.Exporters.BenchmarkRun", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("GitHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<BenchmarkRunReport[]>("Reports")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("RunDate")
-                        .HasColumnType("timestamptz");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BenchmarkRuns");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Robust.Benchmarks/NumericsHelpers/AddBenchmark.cs

@@ -1,33 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-
-namespace Robust.Benchmarks.NumericsHelpers
-{
-    [Virtual]
-    public class AddBenchmark
-    {
-        [Params(32, 128)]
-        public int N { get; set; }
-
-        [Params(1,2)]
-        public int T { get; set; }
-
-        private float[] _inputA = default!;
-        private float[] _inputB = default!;
-        private float[] _output = default!;
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            _inputA = new float[N];
-            _inputB = new float[N];
-            _output = new float[N];
-        }
-
-        [Benchmark]
-        public void Bench()
-        {
-            Shared.Maths.NumericsHelpers.Add(_inputA, _inputB, _output);
-        }
-    }
-}

Robust.Benchmarks/Program.cs

@@ -1,26 +1,12 @@
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Running;
-using System;
-using Robust.Benchmarks.Configs;
-using Robust.Benchmarks.Exporters;
+using BenchmarkDotNet.Running;
 
 namespace Robust.Benchmarks
 {
-    internal static class Program
+    internal class Program
     {
-        // --allCategories=ctg1,ctg2
-        // --anyCategories=ctg1,ctg2
         public static void Main(string[] args)
         {
-#if DEBUG
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.WriteLine("\nWARNING: YOU ARE RUNNING A DEBUG BUILD, USE A RELEASE BUILD FOR AN ACCURATE BENCHMARK");
-            Console.WriteLine("THE DEBUG BUILD IS ONLY GOOD FOR FIXING A CRASHING BENCHMARK\n");
-            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig());
-#else
-            var config = Environment.GetEnvironmentVariable("ROBUST_BENCHMARKS_ENABLE_SQL") != null ? DefaultSQLConfig.Instance : null;
-            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, config);
-#endif
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run();
         }
     }
 }

Robust.Benchmarks/Robust.Benchmarks.csproj

@@ -6,20 +6,13 @@
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <OutputPath>../bin/Benchmarks</OutputPath>
         <OutputType>Exe</OutputType>
-        <NoWarn>RA0003</NoWarn>
     </PropertyGroup>
     <ItemGroup>
       <ProjectReference Include="..\Robust.Server\Robust.Server.csproj" />
       <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
-      <ProjectReference Include="..\Robust.UnitTesting\Robust.UnitTesting.csproj" />
     </ItemGroup>
     <ItemGroup>
       <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" Version="6.0.4" />
     </ItemGroup>
     <Import Project="..\MSBuild\Robust.Engine.targets" />
 </Project>

Robust.Benchmarks/Serialization/BenchmarkIntSerializer.cs

@@ -1,39 +0,0 @@
-using System.Globalization;
-using Robust.Shared.IoC;
-using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Serialization.Markdown;
-using Robust.Shared.Serialization.Markdown.Validation;
-using Robust.Shared.Serialization.Markdown.Value;
-using Robust.Shared.Serialization.TypeSerializers.Interfaces;
-
-namespace Robust.Benchmarks.Serialization
-{
-    public sealed class BenchmarkIntSerializer : ITypeSerializer<int, ValueDataNode>
-    {
-        public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node,
-            IDependencyCollection dependencies, ISerializationContext? context = null)
-        {
-            return int.TryParse(node.Value, out _)
-                ? new ValidatedValueNode(node)
-                : new ErrorNode(node, $"Failed parsing int value: {node.Value}");
-        }
-
-        public int Read(ISerializationManager serializationManager, ValueDataNode node,
-            IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null, int _ = default)
-        {
-            return int.Parse(node.Value, CultureInfo.InvariantCulture);
-        }
-
-        public DataNode Write(ISerializationManager serializationManager, int value, bool alwaysWrite = false,
-            ISerializationContext? context = null)
-        {
-            return new ValueDataNode(value.ToString(CultureInfo.InvariantCulture));
-        }
-
-        public int Copy(ISerializationManager serializationManager, int source, int target, bool skipHook,
-            ISerializationContext? context = null)
-        {
-            return source;
-        }
-    }
-}

Robust.Benchmarks/Serialization/Copy/SerializationCopyBenchmark.cs

@@ -2,19 +2,15 @@
 using System.Linq;
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
-using Robust.Shared.Analyzers;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
 namespace Robust.Benchmarks.Serialization.Copy
 {
-    [MemoryDiagnoser]
-    [Virtual]
     public class SerializationCopyBenchmark : SerializationBenchmark
     {
         public SerializationCopyBenchmark()
@@ -28,7 +24,7 @@ namespace Robust.Benchmarks.Serialization.Copy
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.ReadValueOrThrow<SeedDataDefinition>(seedMapping);
         }
 
         private const string String = "ABC";
@@ -39,32 +35,28 @@ namespace Robust.Benchmarks.Serialization.Copy
 
         private SeedDataDefinition Seed { get; }
 
-        private BenchmarkFlagsEnum FlagZero = BenchmarkFlagsEnum.Zero;
-
-        private BenchmarkFlagsEnum FlagThirtyOne = BenchmarkFlagsEnum.ThirtyOne;
-
         [Benchmark]
         public string? CreateCopyString()
         {
-            return SerializationManager.Copy(String);
+            return SerializationManager.CreateCopy(String);
         }
 
         [Benchmark]
         public int? CreateCopyInteger()
         {
-            return SerializationManager.Copy(Integer);
+            return SerializationManager.CreateCopy(Integer);
         }
 
         [Benchmark]
         public DataDefinitionWithString? CreateCopyDataDefinitionWithString()
         {
-            return SerializationManager.Copy(DataDefinitionWithString);
+            return SerializationManager.CreateCopy(DataDefinitionWithString);
         }
 
         [Benchmark]
         public SeedDataDefinition? CreateCopySeedDataDefinition()
         {
-            return SerializationManager.Copy(Seed);
+            return SerializationManager.CreateCopy(Seed);
         }
 
         [Benchmark]
@@ -119,35 +111,5 @@ namespace Robust.Benchmarks.Serialization.Copy
 
             return copy;
         }
-
-        [Benchmark]
-        [BenchmarkCategory("flag")]
-        public object? CopyFlagZero()
-        {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(FlagSerializer<BenchmarkFlags>),
-                (int) FlagZero,
-                (int) FlagZero);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("flag")]
-        public object? CopyFlagThirtyOne()
-        {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(FlagSerializer<BenchmarkFlags>),
-                (int) FlagThirtyOne,
-                (int) FlagThirtyOne);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("customTypeSerializer")]
-        public object? CopyIntegerCustomSerializer()
-        {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(BenchmarkIntSerializer),
-                Integer,
-                Integer);
-        }
     }
 }

Robust.Benchmarks/Serialization/Definitions/BenchmarkFlags.cs

@@ -1,19 +0,0 @@
-using System;
-using Robust.Shared.Serialization;
-
-namespace Robust.Benchmarks.Serialization.Definitions
-{
-    public sealed class BenchmarkFlags
-    {
-        public const int Zero = 1 << 0;
-        public const int ThirtyOne = 1 << 31;
-    }
-
-    [Flags]
-    [FlagsFor(typeof(BenchmarkFlags))]
-    public enum BenchmarkFlagsEnum
-    {
-        Zero = BenchmarkFlags.Zero,
-        ThirtyOne = BenchmarkFlags.ThirtyOne
-    }
-}

Robust.Benchmarks/Serialization/Definitions/DataDefinitionWithString.cs

@@ -1,13 +1,11 @@
-using Robust.Shared.Analyzers;
-using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Robust.Benchmarks.Serialization.Definitions
 {
     [DataDefinition]
-    [Virtual]
     public class DataDefinitionWithString
     {
-        [DataField("string")]
+        [field: DataField("string")]
         public string StringField { get; init; } = default!;
     }
 }

Robust.Benchmarks/Serialization/Definitions/SealedDataDefinitionWithString.cs

@@ -1,11 +0,0 @@
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Robust.Benchmarks.Serialization.Definitions
-{
-    [DataDefinition]
-    public sealed class SealedDataDefinitionWithString
-    {
-        [DataField("string")]
-        public string StringField { get; init; } = default!;
-    }
-}

Robust.Benchmarks/Serialization/Definitions/SeedDataDefinition.cs

@@ -11,7 +11,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
     ///     Taken from content.
     /// </summary>
     [Prototype("seed")]
-    public sealed class SeedDataDefinition : IPrototype
+    public class SeedDataDefinition : IPrototype
     {
         public const string Prototype = @"
 - type: seed
@@ -19,7 +19,6 @@ namespace Robust.Benchmarks.Serialization.Definitions
   name: tobacco
   seedName: tobacco
   displayName: tobacco plant
-  plantRsi: Objects/Specific/Hydroponics/tobacco.rsi
   productPrototypes:
     - LeavesTobacco
   harvestRepeat: Repeat
@@ -37,7 +36,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
       Max: 10
       PotencyDivisor: 10";
 
-        [IdDataFieldAttribute] public string ID { get; set; } = default!;
+        [DataField("id", required: true)] public string ID { get; set; } = default!;
 
         #region Tracking
         [DataField("name")] public string Name { get; set; } = string.Empty;

Robust.Benchmarks/Serialization/Initialize/SerializationInitializeBenchmark.cs

@@ -1,11 +1,8 @@
 using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
 using Robust.Shared.Serialization.Manager;
 
 namespace Robust.Benchmarks.Serialization.Initialize
 {
-    [MemoryDiagnoser]
-    [Virtual]
     public class SerializationInitializeBenchmark : SerializationBenchmark
     {
         [IterationCleanup]

Robust.Benchmarks/Serialization/Read/SerializationReadBenchmark.cs

@@ -1,18 +1,14 @@
 using System.IO;
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
-using Robust.Shared.Analyzers;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
 using Robust.Shared.Serialization.Markdown.Value;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using YamlDotNet.RepresentationModel;
 
 namespace Robust.Benchmarks.Serialization.Read
 {
-    [MemoryDiagnoser]
-    [Virtual]
     public class SerializationReadBenchmark : SerializationBenchmark
     {
         public SerializationReadBenchmark()
@@ -36,62 +32,28 @@ namespace Robust.Benchmarks.Serialization.Read
 
         private MappingDataNode SeedNode { get; }
 
-        private ValueDataNode FlagZero { get; } = new("Zero");
-
-        private ValueDataNode FlagThirtyOne { get; } = new("ThirtyOne");
-
         [Benchmark]
-        public string ReadString()
+        public string? ReadString()
         {
-            return SerializationManager.Read<string>(StringNode);
+            return SerializationManager.ReadValue<string>(StringNode);
         }
 
         [Benchmark]
-        public int ReadInteger()
+        public int? ReadInteger()
         {
-            return SerializationManager.Read<int>(IntNode);
+            return SerializationManager.ReadValue<int>(IntNode);
         }
 
         [Benchmark]
-        public DataDefinitionWithString ReadDataDefinitionWithString()
+        public DataDefinitionWithString? ReadDataDefinitionWithString()
         {
-            return SerializationManager.Read<DataDefinitionWithString>(StringDataDefNode);
+            return SerializationManager.ReadValue<DataDefinitionWithString>(StringDataDefNode);
         }
 
         [Benchmark]
-        public SeedDataDefinition ReadSeedDataDefinition()
+        public SeedDataDefinition? ReadSeedDataDefinition()
         {
-            return SerializationManager.Read<SeedDataDefinition>(SeedNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("flag")]
-        public object? ReadFlagZero()
-        {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagZero);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("flag")]
-        public object? ReadThirtyOne()
-        {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagThirtyOne);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("customTypeSerializer")]
-        public object? ReadIntegerCustomSerializer()
-        {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(BenchmarkIntSerializer),
-                IntNode);
+            return SerializationManager.ReadValue<SeedDataDefinition>(SeedNode);
         }
     }
 }

Robust.Benchmarks/Serialization/SerializationArrayBenchmark.cs

@@ -1,129 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using Robust.Benchmarks.Serialization.Definitions;
-using Robust.Shared.Analyzers;
-using Robust.Shared.Serialization.Markdown.Mapping;
-using Robust.Shared.Serialization.Markdown.Sequence;
-using Robust.Shared.Serialization.Markdown.Value;
-
-namespace Robust.Benchmarks.Serialization
-{
-    [MemoryDiagnoser]
-    [Virtual]
-    public class SerializationArrayBenchmark : SerializationBenchmark
-    {
-        public SerializationArrayBenchmark()
-        {
-            InitializeSerialization();
-
-            OneStringDefNode = new SequenceDataNode();
-            OneStringDefNode.Add(new MappingDataNode
-            {
-                ["string"] = new ValueDataNode("ABC")
-            });
-
-            TenStringDefsNode = new SequenceDataNode();
-
-            for (var i = 0; i < 10; i++)
-            {
-                TenStringDefsNode.Add(new MappingDataNode
-                {
-                    ["string"] = new ValueDataNode("ABC")
-                });
-            }
-        }
-
-        private SequenceDataNode EmptyNode { get; } = new();
-
-        private SequenceDataNode OneIntNode { get; } = new("1");
-
-        private SequenceDataNode TenIntsNode { get; } = new("1", "2", "3", "4", "5", "6", "7", "8", "9", "10");
-
-        private SequenceDataNode OneStringDefNode { get; }
-
-        private SequenceDataNode TenStringDefsNode { get; }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public string[]? ReadEmptyString()
-        {
-            return SerializationManager.Read<string[]>(EmptyNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public string[]? ReadOneString()
-        {
-            return SerializationManager.Read<string[]>(OneIntNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public string[]? ReadTenStrings()
-        {
-            return SerializationManager.Read<string[]>(TenIntsNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public int[]? ReadEmptyInt()
-        {
-            return SerializationManager.Read<int[]>(EmptyNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public int[]? ReadOneInt()
-        {
-            return SerializationManager.Read<int[]>(OneIntNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public int[]? ReadTenInts()
-        {
-            return SerializationManager.Read<int[]>(TenIntsNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public DataDefinitionWithString[]? ReadEmptyStringDataDef()
-        {
-            return SerializationManager.Read<DataDefinitionWithString[]>(EmptyNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public DataDefinitionWithString[]? ReadOneStringDataDef()
-        {
-            return SerializationManager.Read<DataDefinitionWithString[]>(OneStringDefNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public DataDefinitionWithString[]? ReadTenStringDataDefs()
-        {
-            return SerializationManager.Read<DataDefinitionWithString[]>(TenStringDefsNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public SealedDataDefinitionWithString[]? ReadEmptySealedStringDataDef()
-        {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(EmptyNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public SealedDataDefinitionWithString[]? ReadOneSealedStringDataDef()
-        {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(OneStringDefNode);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("read")]
-        public SealedDataDefinitionWithString[]? ReadTenSealedStringDataDefs()
-        {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(TenStringDefsNode);
-        }
-    }
-}

Robust.Benchmarks/Serialization/Write/SerializationWriteBenchmark.cs

@@ -2,19 +2,15 @@
 using System.IO;
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
-using Robust.Shared.Analyzers;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
 using Robust.Shared.Serialization.Markdown.Value;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using YamlDotNet.RepresentationModel;
 
 namespace Robust.Benchmarks.Serialization.Write
 {
-    [MemoryDiagnoser]
-    [Virtual]
     public class SerializationWriteBenchmark : SerializationBenchmark
     {
         public SerializationWriteBenchmark()
@@ -28,7 +24,7 @@ namespace Robust.Benchmarks.Serialization.Write
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.ReadValueOrThrow<SeedDataDefinition>(seedMapping);
         }
 
         private const string String = "ABC";
@@ -39,10 +35,6 @@ namespace Robust.Benchmarks.Serialization.Write
 
         private SeedDataDefinition Seed { get; }
 
-        private BenchmarkFlagsEnum FlagZero = BenchmarkFlagsEnum.Zero;
-
-        private BenchmarkFlagsEnum FlagThirtyOne = BenchmarkFlagsEnum.ThirtyOne;
-
         [Benchmark]
         public DataNode WriteString()
         {
@@ -102,35 +94,5 @@ namespace Robust.Benchmarks.Serialization.Write
 
             return mapping;
         }
-
-        [Benchmark]
-        [BenchmarkCategory("flag")]
-        public DataNode WriteFlagZero()
-        {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagZero);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("flag")]
-        public DataNode WriteThirtyOne()
-        {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagThirtyOne);
-        }
-
-        [Benchmark]
-        [BenchmarkCategory("customTypeSerializer")]
-        public DataNode WriteIntegerCustomSerializer()
-        {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(BenchmarkIntSerializer),
-                Integer);
-        }
     }
 }

Robust.Benchmarks/add-migration.ps1

@@ -1,11 +0,0 @@
-#!/usr/bin/env pwsh
-
-param([String]$name)
-
-if ($name -eq "")
-{
-    Write-Error "must specify migration name"
-    exit
-}
-
-dotnet ef migrations add --context BenchmarkContext -o Migrations $name

Robust.Benchmarks/add-migration.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ] ; then
-    echo "Must specify migration name"
-    exit 1
-fi
-
-dotnet ef migrations add --context BenchmarkContext -o Migrations "$1"

Robust.Client.Injectors/Program.cs

@@ -29,27 +29,26 @@ namespace Robust.Build.Tasks
         }
     }
 
-    //formatted according to https://github.com/dotnet/msbuild/blob/main/src/Shared/CanonicalError.cs#L57
     class ConsoleBuildEngine : IBuildEngine
     {
         public void LogErrorEvent(BuildErrorEventArgs e)
         {
-            Console.WriteLine($"{e.File} ({e.LineNumber},{e.ColumnNumber},{e.EndLineNumber},{e.EndColumnNumber}): XAMLIL ERROR {e.Code}: {e.Message}");
+            Console.WriteLine($"ERROR: {e.Code} {e.Message} in {e.File} {e.LineNumber}:{e.ColumnNumber}-{e.EndLineNumber}:{e.EndColumnNumber}");
         }
 
         public void LogWarningEvent(BuildWarningEventArgs e)
         {
-            Console.WriteLine($"{e.File} ({e.LineNumber},{e.ColumnNumber},{e.EndLineNumber},{e.EndColumnNumber}): XAMLIL WARNING {e.Code}: {e.Message}");
+            Console.WriteLine($"WARNING: {e.Code} {e.Message} in {e.File} {e.LineNumber}:{e.ColumnNumber}-{e.EndLineNumber}:{e.EndColumnNumber}");
         }
 
         public void LogMessageEvent(BuildMessageEventArgs e)
         {
-            Console.WriteLine($"{e.File} ({e.LineNumber},{e.ColumnNumber},{e.EndLineNumber},{e.EndColumnNumber}): XAMLIL MESSAGE {e.Code}: {e.Message}");
+            Console.WriteLine($"MESSAGE: {e.Code} {e.Message} in {e.File} {e.LineNumber}:{e.ColumnNumber}-{e.EndLineNumber}:{e.EndColumnNumber}");
         }
 
         public void LogCustomEvent(CustomBuildEventArgs e)
         {
-            Console.WriteLine(e.Message);
+            Console.WriteLine($"CUSTOM: {e.Message}");
         }
 
         public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties,

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

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" />
+      <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" />
       <PackageReference Include="Mono.Cecil" Version="0.11.3" />
       <PackageReference Include="Pidgin" Version="2.5.0" />
     </ItemGroup>

Robust.Client.Injectors/RobustXamlILCompiler.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics;
-using System.Linq;
-using XamlX;
+using System.Linq;
 using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
@@ -13,14 +11,11 @@ namespace Robust.Build.Tasks
     /// Emitters & Transformers based on:
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlRootObjectScopeTransformer.cs
     /// - 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>
     public class RobustXamlILCompiler : XamlILCompiler
     {
         public RobustXamlILCompiler(TransformerConfiguration configuration, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings, bool fillWithDefaults) : base(configuration, emitMappings, fillWithDefaults)
         {
-            Transformers.Insert(0, new IgnoredDirectivesTransformer());
-
             Transformers.Add(new AddNameScopeRegistration());
             Transformers.Add(new RobustMarkRootObjectScopeNode());
 
@@ -202,24 +197,5 @@ namespace Robust.Build.Tasks
                 }
             }
         }
-
-        class IgnoredDirectivesTransformer : IXamlAstTransformer
-        {
-            public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
-            {
-                if (node is XamlAstObjectNode astNode)
-                {
-                    astNode.Children.RemoveAll(n =>
-                        n is XamlAstXmlDirective dir &&
-                        dir.Namespace == XamlNamespaces.Xaml2006 &&
-                        (dir.Name == "Class" ||
-                         dir.Name == "Precompile" ||
-                         dir.Name == "FieldModifier" ||
-                         dir.Name == "ClassModifier"));
-                }
-
-                return node;
-            }
-        }
     }
 }

Robust.Client.Injectors/XamlCompiler.cs

@@ -76,7 +76,7 @@ namespace Robust.Build.Tasks
                 },
                 ContentAttributes =
                 {
-                    typeSystem.GetType("Avalonia.Metadata.ContentAttribute")
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.ContentAttribute")
                 },
                 UsableDuringInitializationAttributes =
                 {
@@ -280,8 +280,8 @@ namespace Robust.Build.Tasks
                     }
                     catch (Exception e)
                     {
-                        engine.LogErrorEvent(new BuildErrorEventArgs("XAMLIL", "", res.FilePath, 0, 0, 0, 0,
-                            $"{res.FilePath}: {e.Message}", "", "CompileRobustXaml"));
+                        engine.LogWarningEvent(new BuildWarningEventArgs("XAMLIL", "", res.Uri, 0, 0, 0, 0,
+                            e.ToString(), "", "CompileRobustXaml"));
                     }
                 }
                 return true;

Robust.Client.NameGenerator/InvalidXamlRootTypeException.cs

@@ -1,19 +0,0 @@
-using System;
-using Microsoft.CodeAnalysis;
-
-namespace Robust.Client.NameGenerator
-{
-    public class InvalidXamlRootTypeException : Exception
-    {
-        public readonly INamedTypeSymbol ExpectedType;
-        public readonly INamedTypeSymbol ExpectedBaseType;
-        public readonly INamedTypeSymbol Actual;
-
-        public InvalidXamlRootTypeException(INamedTypeSymbol actual, INamedTypeSymbol expectedType, INamedTypeSymbol expectedBaseType)
-        {
-            Actual = actual;
-            ExpectedType = expectedType;
-            ExpectedBaseType = expectedBaseType;
-        }
-    }
-}

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

@@ -5,14 +5,13 @@
     </PropertyGroup>
 
   <ItemGroup>
-    <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.CSharp" Version="3.8.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" 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>
 </Project>

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
-using Robust.Client.UserInterface;
 using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
@@ -38,10 +36,9 @@ namespace Robust.Client.AutoGenerated
 
         class NameVisitor : IXamlAstVisitor
         {
-            private readonly List<(string name, string type, AccessLevel access)> _names =
-                new List<(string name, string type, AccessLevel access)>();
+            private List<(string name, string type)> _names = new List<(string name, string type)>();
 
-            public static List<(string name, string type, AccessLevel access)> GetNames(IXamlAstNode node)
+            public static List<(string name, string type)> GetNames(IXamlAstNode node)
             {
                 var visitor = new NameVisitor();
                 node.Visit(visitor);
@@ -58,42 +55,27 @@ namespace Robust.Client.AutoGenerated
                 {
                     var clrtype = objectNode.Type.GetClrType();
                     var isControl = IsControl(clrtype);
+                    //clrtype.Interfaces.Any(i =>
+                    //i.IsInterface && i.FullName == "Robust.Client.UserInterface.IControl");
 
                     if (!isControl)
                         return node;
 
-                    // Find Name and Access properties
-                    XamlAstTextNode nameText = null;
-                    XamlAstTextNode accessText = null;
                     foreach (var child in objectNode.Children)
                     {
                         if (child is XamlAstXamlPropertyValueNode propertyValueNode &&
                             propertyValueNode.Property is XamlAstNamePropertyReference namedProperty &&
+                            namedProperty.Name == "Name" &&
                             propertyValueNode.Values.Count > 0 &&
                             propertyValueNode.Values[0] is XamlAstTextNode text)
                         {
-                            switch (namedProperty.Name)
+                            var reg = (text.Text, $@"{clrtype.Namespace}.{clrtype.Name}");
+                            if (!_names.Contains(reg))
                             {
-                                case "Name":
-                                    nameText = text;
-                                    break;
-                                case "Access":
-                                    accessText = text;
-                                    break;
+                                _names.Add(reg);
                             }
                         }
                     }
-
-                    if (nameText == null)
-                        return node;
-
-                    var reg = (nameText.Text,
-                        $@"{clrtype.Namespace}.{clrtype.Name}",
-                        accessText != null ? (AccessLevel) Enum.Parse(typeof(AccessLevel), accessText.Text) : AccessLevel.Protected);
-                    if (!_names.Contains(reg))
-                    {
-                        _names.Add(reg);
-                    }
                 }
 
                 return node;
@@ -111,8 +93,7 @@ namespace Robust.Client.AutoGenerated
         private static string GenerateSourceCode(
             INamedTypeSymbol classSymbol,
             string xamlFile,
-            CSharpCompilation comp,
-            string fileName)
+            CSharpCompilation comp)
         {
             var className = classSymbol.Name;
             var nameSpace = classSymbol.ContainingNamespace.ToDisplayString();
@@ -130,48 +111,11 @@ namespace Robust.Client.AutoGenerated
             compiler.Transform(parsed);
             var initialRoot = (XamlAstObjectNode) parsed.Root;
             var names = NameVisitor.GetNames(initialRoot);
-
-            var rootType = (INamedTypeSymbol)initialRoot.Type.GetClrType().Id;
-            var rootTypeString = rootType.ToString();
-            if (classSymbol.ToString() != rootTypeString && classSymbol.BaseType?.ToString() != rootTypeString)
-                throw new InvalidXamlRootTypeException(rootType, classSymbol, classSymbol.BaseType);
-
-            var namedControls = names.Select(info =>
-            {
-                (string name, string type, AccessLevel access) = info;
-
-                string accessStr;
-                switch (access)
-                {
-                    case AccessLevel.Public:
-                        accessStr = "public";
-                        break;
-                    case AccessLevel.Protected when classSymbol.IsSealed:
-                    case AccessLevel.PrivateProtected when classSymbol.IsSealed:
-                    case AccessLevel.Private:
-                        accessStr = "private";
-                        break;
-                    case AccessLevel.Protected:
-                        accessStr = "protected";
-                        break;
-                    case AccessLevel.PrivateProtected:
-                        accessStr = "private protected";
-                        break;
-                    case AccessLevel.Internal:
-                    case AccessLevel.ProtectedInternal when classSymbol.IsSealed:
-                        accessStr = "internal";
-                        break;
-                    case AccessLevel.ProtectedInternal:
-                        accessStr = "protected internal";
-                        break;
-                    default:
-                        throw new ArgumentException($"Invalid access level \"{Enum.GetName(typeof(AccessLevel), access)}\" " +
-                                                    $"for control {name} in file {fileName}.");
-                }
-
-                return $"        {accessStr} global::{type} {name} => this.FindControl<global::{type}>(\"{name}\");";
-            });
-
+            var fieldAccess = classSymbol.IsSealed ? "private" : "protected";
+            //var names = NameVisitor.GetNames((XamlAstObjectNode)XDocumentXamlParser.Parse(xamlFile).Root);
+            var namedControls = names.Select(info => "        " +
+                                                     $"{fieldAccess} global::{info.type} {info.name} => " +
+                                                     $"this.FindControl<global::{info.type}>(\"{info.name}\");");
             return $@"// <auto-generated />
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -185,6 +129,7 @@ namespace {nameSpace}
 ";
         }
 
+
         public void Execute(GeneratorExecutionContext context)
         {
             var comp = (CSharpCompilation) context.Compilation;
@@ -202,10 +147,9 @@ namespace {nameSpace}
             foreach (var typeSymbol in symbols)
             {
                 var xamlFileName = $"{typeSymbol.Name}.xaml";
-                var xamlFileNameSep = $"{Path.DirectorySeparatorChar}{xamlFileName}";
-                var relevantXamlFiles = context.AdditionalFiles.Where(t => t.Path.EndsWith(xamlFileNameSep)).ToArray();
+                var relevantXamlFile = context.AdditionalFiles.FirstOrDefault(t => t.Path.EndsWith(xamlFileName));
 
-                if (relevantXamlFiles.Length == 0)
+                if (relevantXamlFile == null)
                 {
                     context.ReportDiagnostic(
                         Diagnostic.Create(
@@ -221,28 +165,13 @@ namespace {nameSpace}
                     continue;
                 }
 
-                if (relevantXamlFiles.Length > 1)
-                {
-                    context.ReportDiagnostic(
-                        Diagnostic.Create(
-                            new DiagnosticDescriptor(
-                                "RXN0002",
-                                $"Found multiple candidate XAML files for {typeSymbol}",
-                                $"Multiple files exist with name {xamlFileName}",
-                                "Usage",
-                                DiagnosticSeverity.Error,
-                                true),
-                            typeSymbol.Locations[0]));
-                    continue;
-                }
-
-                var txt = relevantXamlFiles[0].GetText()?.ToString();
+                var txt = relevantXamlFile.GetText()?.ToString();
                 if (txt == null)
                 {
                     context.ReportDiagnostic(
                         Diagnostic.Create(
                             new DiagnosticDescriptor(
-                                "RXN0004",
+                                "RXN0002",
                                 $"Unexpected empty Xaml-File was found at {xamlFileName}",
                                 "Expected Content due to a Class with the same name being annotated with [GenerateTypedNameReferences].",
                                 "Usage",
@@ -255,30 +184,15 @@ namespace {nameSpace}
 
                 try
                 {
-                    var sourceCode = GenerateSourceCode(typeSymbol, txt, comp, xamlFileName);
+                    var sourceCode = GenerateSourceCode(typeSymbol, txt, comp);
                     context.AddSource($"{typeSymbol.Name}.g.cs", SourceText.From(sourceCode, Encoding.UTF8));
                 }
-                catch (InvalidXamlRootTypeException invRootType)
-                {
-                    context.ReportDiagnostic(
-                        Diagnostic.Create(
-                            new DiagnosticDescriptor(
-                                "RXN0005",
-                                $"XAML-File {xamlFileName} has the wrong root type!",
-                                $"{xamlFileName}: Expected root type '{invRootType.ExpectedType}' or '{invRootType.ExpectedBaseType}', but got '{invRootType.Actual}'.",
-                                "Usage",
-                                DiagnosticSeverity.Error,
-                                true),
-                            Location.Create(xamlFileName, new TextSpan(0, 0),
-                                new LinePositionSpan(new LinePosition(0, 0), new LinePosition(0, 0)))));
-                    continue;
-                }
                 catch (Exception e)
                 {
                     context.ReportDiagnostic(
                         Diagnostic.Create(
                             new DiagnosticDescriptor(
-                                "RXN0003",
+                                "AXN0003",
                                 "Unhandled exception occured while generating typed Name references.",
                                 $"Unhandled exception occured while generating typed Name references: {e}",
                                 "Usage",
@@ -301,7 +215,7 @@ namespace {nameSpace}
             foreach (var candidateClass in receiver.CandidateClasses)
             {
                 var model = compilation.GetSemanticModel(candidateClass.SyntaxTree);
-                var typeSymbol = model.GetDeclaredSymbol(candidateClass);
+                var typeSymbol = (INamedTypeSymbol) model.GetDeclaredSymbol(candidateClass);
                 var relevantAttribute = typeSymbol.GetAttributes().FirstOrDefault(attr =>
                     attr.AttributeClass != null &&
                     attr.AttributeClass.Equals(attributeSymbol, SymbolEqualityComparer.Default));
@@ -326,7 +240,7 @@ namespace {nameSpace}
                     context.ReportDiagnostic(
                         Diagnostic.Create(
                             new DiagnosticDescriptor(
-                                "RXN0006",
+                                "RXN0004",
                                 missingPartialKeywordMessage,
                                 missingPartialKeywordMessage,
                                 "Usage",

Robust.Client.WebView/BrowserWindowCreateParameters.cs

@@ -1,16 +0,0 @@
-namespace Robust.Client.WebView
-{
-    public sealed class BrowserWindowCreateParameters
-    {
-        public int Width { get; set; }
-        public int Height { get; set; }
-
-        public string Url { get; set; } = "about:blank";
-
-        public BrowserWindowCreateParameters(int width, int height)
-        {
-            Width = width;
-            Height = height;
-        }
-    }
-}