Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RT update, .NET 9 #2165

Merged
merged 2 commits into from
Jan 9, 2025
Merged

RT update, .NET 9 #2165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
342dbc3
RT update, .NET 9
PJB3005 Jan 9, 2025
d55eaa2
Update workflows to .NET 9
wixoaGit Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Content.Tests/DMTests.cs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Open in desktop
Submodule RobustToolbox updated 255 files
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
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"
}
}
Loading