Skip to content

Commit

Permalink
RT update, .NET 9 (#2165)
Browse files Browse the repository at this point in the history
Co-authored-by: wixoaGit <[email protected]>
  • Loading branch information
PJB3005 and wixoaGit authored Jan 9, 2025
1 parent d360564 commit 788b84b
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.100
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compiler-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.100
- name: Install compiler dependencies
run: dotnet restore main/DMCompiler/DMCompiler.csproj
- name: Install disassembler dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.100
- name: Setup Resharper
run: dotnet tool install -g JetBrains.ReSharper.GlobalTools
- name: Run Linter
Expand Down
8 changes: 4 additions & 4 deletions Content.Tests/DMTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public enum DMTestFlags {
NoReturn = 16, // Shouldn't return (aka stopped by a stack-overflow or runtimes)
}

private void OnException(object? sender, Exception exception) => TestContext.WriteLine(exception);
private void OnException(object? sender, Exception exception) => TestContext.Out.WriteLine(exception);

[OneTimeSetUp]
public void OneTimeSetup() {
Expand Down Expand Up @@ -63,7 +63,7 @@ private static void Cleanup(string? compiledFile) {
[Test, TestCaseSource(nameof(GetTests))]
public void TestFiles(string sourceFile, DMTestFlags testFlags, int errorCode) {
string initialDirectory = Directory.GetCurrentDirectory();
TestContext.WriteLine($"--- TEST {sourceFile} | Flags: {testFlags}");
TestContext.Out.WriteLine($"--- TEST {sourceFile} | Flags: {testFlags}");
try {
var dmCompiler = new DMCompiler.DMCompiler();
var compiledFile = Compile(dmCompiler, Path.Join(initialDirectory, TestsDirectory, sourceFile));
Expand All @@ -73,7 +73,7 @@ public void TestFiles(string sourceFile, DMTestFlags testFlags, int errorCode) {
Assert.That(compiledFile, Is.Null, "Expected an error during DM compilation");

Cleanup(compiledFile);
TestContext.WriteLine($"--- PASS {sourceFile}");
TestContext.Out.WriteLine($"--- PASS {sourceFile}");
return;
}

Expand Down Expand Up @@ -107,7 +107,7 @@ public void TestFiles(string sourceFile, DMTestFlags testFlags, int errorCode) {
GC.Collect();
_dreamMan.Update();
Cleanup(compiledFile);
TestContext.WriteLine($"--- PASS {sourceFile}");
TestContext.Out.WriteLine($"--- PASS {sourceFile}");
} finally {
// Restore the original CurrentDirectory, since loading a compiled JSON changes it.
Directory.SetCurrentDirectory(initialDirectory);
Expand Down
2 changes: 1 addition & 1 deletion DMCompiler/DMCompiler.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Tools</Configurations>
<Platforms>AnyCPU</Platforms>
Expand Down
2 changes: 1 addition & 1 deletion DMDisassembler/DMDisassembler.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Configurations>Debug;Release;Tools</Configurations>
<Platforms>AnyCPU</Platforms>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand Down
2 changes: 1 addition & 1 deletion OpenDreamPackageTool/OpenDreamPackageTool.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NoWarn>NU1507</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion OpenDreamPackaging/OpenDreamPackaging.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NoWarn>NU1507</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion OpenDreamRuntime/OpenDreamRuntime.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>Debug;Release;Tools</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 255 files
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.0",
"version": "9.0.0",
"rollForward": "latestFeature"
}
}

0 comments on commit 788b84b

Please sign in to comment.