Update RT, .NET 10

.github/workflows/build-test.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/compiler-test.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Install compiler dependencies
       run: dotnet restore main/DMCompiler/DMCompiler.csproj
     - name: Install disassembler dependencies
@@ -49,7 +49,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Checkout Main
       uses: actions/checkout@v2
       with:
@@ -74,7 +74,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:
@@ -99,7 +99,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:
@@ -124,7 +124,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:
@@ -147,7 +147,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:
@@ -170,7 +170,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:
@@ -193,7 +193,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:
@@ -216,7 +216,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:
@@ -239,7 +239,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.0.x      
+        dotnet-version: 10.0.x      
     - name: Pop build cache
       uses: actions/cache/restore@v4
       with:

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Setup Resharper
         run: dotnet tool install -g JetBrains.ReSharper.GlobalTools
       - name: Run Linter

Content.IntegrationTests/Content.IntegrationTests.csproj

@@ -26,12 +26,13 @@
     <ProjectReference Include="..\OpenDreamShared\OpenDreamShared.csproj" />
     <ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
     <ProjectReference Include="..\DMCompiler\DMCompiler.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
+
   <ItemGroup>
     <DMProject Include="$(ProjectDir)\DMProject\**" />
     <DMStandard Include="..\DMCompiler\DMStandard\**" />

Content.IntegrationTests/ContentIntegrationTest.cs

@@ -27,6 +27,7 @@ protected sealed override ClientIntegrationInstance StartClient(ClientIntegratio
 
         options.ContentStart = true;
 
+        options.LoadTestAssembly = false;
         options.ContentAssemblies = new[] {
             typeof(OpenDreamShared.EntryPoint).Assembly,
             typeof(OpenDreamClient.EntryPoint).Assembly,
@@ -62,6 +63,7 @@ protected override ServerIntegrationInstance StartServer(ServerIntegrationOption
 
         options.ContentStart = true;
 
+        options.LoadTestAssembly = false;
         options.ContentAssemblies = new[] {
             typeof(OpenDreamShared.EntryPoint).Assembly,
             typeof(OpenDreamRuntime.EntryPoint).Assembly,

Content.Tests/Content.Tests.csproj

@@ -23,19 +23,20 @@
     <PackageReference Include="NUnit.ConsoleRunner" />
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Serilog" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DMCompiler\DMCompiler.csproj" />
     <ProjectReference Include="..\OpenDreamClient\OpenDreamClient.csproj" />
     <ProjectReference Include="..\OpenDreamServer\OpenDreamServer.csproj" />
     <ProjectReference Include="..\OpenDreamShared\OpenDreamShared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
 
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
+
   <ItemGroup>
     <!-- Copy DMProject to output directory. -->
     <Content Include="$(ProjectDir)\DMProject\**" CopyToOutputDirectory="PreserveNewest" LinkBase="DMProject\" />

DMCompiler/DMCompiler.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <Configurations>Debug;Release;Tools</Configurations>
     <Platforms>AnyCPU</Platforms>
@@ -12,10 +12,8 @@
   <ItemGroup>
     <DMStandard Include="DMStandard\**" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-  </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
 
   <Target Name="CopyDMStandard" AfterTargets="AfterBuild">
     <Copy SourceFiles="@(DMStandard)" DestinationFiles="@(DMStandard->'$(OutDir)\DMStandard\%(RecursiveDir)%(Filename)%(Extension)')" />

DMDisassembler/DMDisassembler.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Configurations>Debug;Release;Tools</Configurations>
     <Platforms>AnyCPU</Platforms>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

OpenDream.slnx

@@ -1,47 +1,14 @@
 <Solution>
+  <Properties Name="RobustToolbox">
+    <Property Name="Features" Value="WebView" />
+  </Properties>
   <Configurations>
     <BuildType Name="Debug" />
     <BuildType Name="Release" />
     <BuildType Name="Tools" />
     <Platform Name="Any CPU" />
     <Platform Name="x64" />
   </Configurations>
-  <Folder Name="/RobustToolbox/">
-    <Project Path="RobustToolbox/Avalonia.Base/Avalonia.Base.csproj" />
-    <Project Path="RobustToolbox/Lidgren.Network/Lidgren.Network.csproj" />
-    <Project Path="RobustToolbox/NetSerializer/NetSerializer/NetSerializer.csproj" />
-    <Project Path="RobustToolbox/OpenToolkit.GraphicsLibraryFramework/OpenToolkit.GraphicsLibraryFramework.csproj" />
-    <Project Path="RobustToolbox/Robust.Analyzers/Robust.Analyzers.csproj" />
-    <Project Path="RobustToolbox/Robust.Client.Injectors/Robust.Client.Injectors.csproj" />
-    <Project Path="RobustToolbox/Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj" />
-    <Project Path="RobustToolbox/Robust.Client.WebView/Robust.Client.WebView.csproj" />
-    <Project Path="RobustToolbox/Robust.Client/Robust.Client.csproj" />
-    <Project Path="RobustToolbox/Robust.LoaderApi/Robust.LoaderApi/Robust.LoaderApi.csproj" />
-    <Project Path="RobustToolbox/Robust.Packaging/Robust.Packaging.csproj" />
-    <Project Path="RobustToolbox/Robust.Serialization.Generator/Robust.Serialization.Generator.csproj" />
-    <Project Path="RobustToolbox/Robust.Server/Robust.Server.csproj" />
-    <Project Path="RobustToolbox/Robust.Shared.CompNetworkGenerator/Robust.Shared.CompNetworkGenerator.csproj" />
-    <Project Path="RobustToolbox/Robust.Shared.Maths/Robust.Shared.Maths.csproj" />
-    <Project Path="RobustToolbox/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj" />
-    <Project Path="RobustToolbox/Robust.Shared/Robust.Shared.csproj" />
-    <Project Path="RobustToolbox/Robust.UnitTesting/Robust.UnitTesting.csproj" />
-    <Project Path="RobustToolbox/Robust.Xaml/Robust.Xaml.csproj" />
-  </Folder>
-  <Folder Name="/RobustToolbox/cefglue/">
-    <Project Path="RobustToolbox/cefglue/CefGlue/CefGlue.csproj" />
-  </Folder>
-  <Folder Name="/RobustToolbox/MSBuild/">
-    <File Path="RobustToolbox/MSBuild/Robust.Analyzers.targets" />
-    <File Path="RobustToolbox/MSBuild/Robust.DefineConstants.targets" />
-    <File Path="RobustToolbox/MSBuild/Robust.Engine.targets" />
-    <File Path="RobustToolbox/MSBuild/Robust.Properties.targets" />
-    <File Path="RobustToolbox/MSBuild/XamlIL.targets" />
-  </Folder>
-  <Folder Name="/RobustToolbox/XamlX/">
-    <Project Path="RobustToolbox/XamlX/src/XamlX.IL.Cecil/XamlX.IL.Cecil.csproj" />
-    <Project Path="RobustToolbox/XamlX/src/XamlX.Runtime/XamlX.Runtime.csproj" />
-    <Project Path="RobustToolbox/XamlX/src/XamlX/XamlX.csproj" />
-  </Folder>
   <Folder Name="/TestGame/">
     <File Path="TestGame/code.dm" />
     <File Path="TestGame/environment.dme" />
@@ -72,4 +39,142 @@
   <Project Path="OpenDreamRuntime/OpenDreamRuntime.csproj" />
   <Project Path="OpenDreamServer/OpenDreamServer.csproj" />
   <Project Path="OpenDreamShared/OpenDreamShared.csproj" />
+  <Folder Name="/RobustToolbox/.github/workflows/">
+    <File Path="RobustToolbox/.github/workflows/benchmarks.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-all-configurations.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-docfx.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-test.yml" />
+    <File Path="RobustToolbox/.github/workflows/codeql-analysis.yml" />
+    <File Path="RobustToolbox/.github/workflows/publish-client.yml" />
+    <File Path="RobustToolbox/.github/workflows/test-content.yml" />
+  </Folder>
+  <Folder Name="/RobustToolbox/cefglue/">
+    <Project Path="RobustToolbox/cefglue/CefGlue/CefGlue.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+      <Properties Name="RobustToolbox">
+        <Property Name="Feature" Value="WebView" />
+      </Properties>
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Imports/">
+    <File Path="RobustToolbox/Imports/Benchmarks.props" />
+    <File Path="RobustToolbox/Imports/Client.props" />
+    <File Path="RobustToolbox/Imports/Lidgren.props" />
+    <File Path="RobustToolbox/Imports/Packaging.props" />
+    <File Path="RobustToolbox/Imports/Server.props" />
+    <File Path="RobustToolbox/Imports/Shared.props" />
+    <File Path="RobustToolbox/Imports/Testing.props" />
+    <File Path="RobustToolbox/Imports/WebView.props" />
+  </Folder>
+  <Folder Name="/RobustToolbox/MSBuild/">
+    <File Path="RobustToolbox/MSBuild/Robust.Analyzers.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.CompNetworkGenerator.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Configurations.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.DefineConstants.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.Version.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.Platform.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.ProjectReferences.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Properties.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Trimming.targets" />
+    <File Path="RobustToolbox/MSBuild/XamlIL.targets" />
+  </Folder>
+  <Folder Name="/RobustToolbox/NetSerializer/">
+    <Project Path="RobustToolbox/NetSerializer/NetSerializer/NetSerializer.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Project Files/">
+    <File Path="RobustToolbox/Directory.Build.props" />
+    <File Path="RobustToolbox/Directory.Packages.props" />
+    <File Path="RobustToolbox/README.md" />
+    <File Path="RobustToolbox/RELEASE-NOTES.md" />
+  </Folder>
+  <Folder Name="/RobustToolbox/Robust.LoaderApi/">
+    <Project Path="RobustToolbox/Robust.LoaderApi/Robust.LoaderApi/Robust.LoaderApi.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Roslyn/">
+    <Project Path="RobustToolbox/Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Analyzers/Robust.Analyzers.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Serialization.Generator/Robust.Serialization.Generator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Shared.CompNetworkGenerator/Robust.Shared.CompNetworkGenerator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Tools/">
+    <Project Path="RobustToolbox/Tools/Robust.SolutionGen/Robust.SolutionGen.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/XamlX/">
+    <Project Path="RobustToolbox/XamlX/src/XamlX.IL.Cecil/XamlX.IL.Cecil.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/XamlX/src/XamlX.Runtime/XamlX.Runtime.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/XamlX/src/XamlX/XamlX.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/">
+    <Project Path="RobustToolbox/Avalonia.Base/Avalonia.Base.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Lidgren.Network/Lidgren.Network.csproj" />
+    <Project Path="RobustToolbox/Robust.Benchmarks/Robust.Benchmarks.csproj" />
+    <Project Path="RobustToolbox/Robust.Client.Injectors/Robust.Client.Injectors.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Client.WebView/Robust.Client.WebView.csproj">
+      <Properties Name="RobustToolbox">
+        <Property Name="Feature" Value="WebView" />
+      </Properties>
+    </Project>
+    <Project Path="RobustToolbox/Robust.Client.IntegrationTests/Robust.Client.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Client.Tests/Robust.Client.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Client/Robust.Client.csproj" />
+    <Project Path="RobustToolbox/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Packaging/Robust.Packaging.csproj" />
+    <Project Path="RobustToolbox/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Server.Testing/Robust.Server.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Server/Robust.Server.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths.Testing/Robust.Shared.Maths.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths.Tests/Robust.Shared.Maths.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths/Robust.Shared.Maths.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Testing/Robust.Shared.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Tests/Robust.Shared.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared/Robust.Shared.csproj" />
+    <Project Path="RobustToolbox/Robust.UnitTesting/Robust.UnitTesting.csproj" />
+    <Project Path="RobustToolbox/Robust.Xaml/Robust.Xaml.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <File Path="RobustToolbox/RobustToolbox.slnx" />
+  </Folder>
 </Solution>