Upgrade to .NET 9 (#5)

KubaZ2 · Nov 29, 2024 · 0edcbde · 0edcbde
1 parent 3b41508
commit 0edcbde
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 42 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     - name: Restore dependencies
       run: dotnet restore

diff --git a/Backend/Manager/Dockerfile b/Backend/Manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
 WORKDIR /src
 
 COPY Manager/Manager.csproj Manager/Manager.csproj
@@ -9,7 +9,7 @@ COPY Manager Manager
 
 RUN dotnet publish Manager/Manager.csproj -c Release -o /app
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 WORKDIR /app
 
 COPY --from=build-env /app .

diff --git a/Backend/Manager/Manager.csproj b/Backend/Manager/Manager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseAppHost>false</UseAppHost>

diff --git a/Backend/Sandbox/Asm/Asm.csproj b/Backend/Sandbox/Asm/Asm.csproj
@@ -6,12 +6,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="8.0.401" />
+    <PackageReference Include="FSharp.Core" Version="9.0.100" />
   </ItemGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UseAppHost>false</UseAppHost>

diff --git a/Backend/Sandbox/Asm/Dockerfile b/Backend/Sandbox/Asm/Dockerfile
@@ -1,5 +1,5 @@
-ARG DOTNET_SDK_VERSION=8.0
-ARG DOTNET_RUNTIME_VERSION=8.0.7
+ARG DOTNET_SDK_VERSION=9.0
+ARG DOTNET_RUNTIME_VERSION=9.0.0
 ARG OS_CODENAME=noble
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:$DOTNET_SDK_VERSION AS build-env

diff --git a/Backend/Sandbox/CheckedJit/Dockerfile b/Backend/Sandbox/CheckedJit/Dockerfile
@@ -1,4 +1,4 @@
-ARG DOTNET_RUNTIME_VERSION=8.0.7
+ARG DOTNET_RUNTIME_VERSION=9.0.0
 ARG OS=ubuntu
 ARG OS_VERSION=24.04
 ARG OS_CODENAME=noble
@@ -14,7 +14,7 @@ ARG BUILDARCH
 RUN git clone --depth 1 --branch v$DOTNET_RUNTIME_VERSION https://github.com/dotnet/runtime.git .
 
 # Asserts fail when running in pwn.red/jail, so we need to remove them
-RUN sed -i 247d src/coreclr/pal/src/misc/cgroup.cpp
+RUN sed -i 214d src/coreclr/pal/src/misc/cgroup.cpp
 RUN sed -i 666d src/coreclr/pal/src/sync/cs.cpp
 
 RUN if [ $TARGETARCH = $BUILDARCH ]; then \

diff --git a/Backend/Sandbox/CheckedJit/docker-compose.yml b/Backend/Sandbox/CheckedJit/docker-compose.yml
@@ -3,4 +3,4 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: ghcr.io/kubaz2/sharp/checked-jit:8.0.7
+    image: ghcr.io/kubaz2/sharp/checked-jit:9.0.0
diff --git a/Backend/Sandbox/Runner/Dockerfile b/Backend/Sandbox/Runner/Dockerfile
@@ -1,5 +1,5 @@
-ARG DOTNET_SDK_VERSION=8.0
-ARG DOTNET_RUNTIME_VERSION=8.0.7
+ARG DOTNET_SDK_VERSION=9.0
+ARG DOTNET_RUNTIME_VERSION=9.0.0
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:$DOTNET_SDK_VERSION AS build-env
 WORKDIR /src

diff --git a/Backend/Sandbox/Runner/Runner.csproj b/Backend/Sandbox/Runner/Runner.csproj
@@ -6,12 +6,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="8.0.401" />
+    <PackageReference Include="FSharp.Core" Version="9.0.100" />
   </ItemGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UseAppHost>false</UseAppHost>

diff --git a/Backend/Sandbox/Shared/Shared.csproj b/Backend/Sandbox/Shared/Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AssemblyName>Sharp.Backend.Sandbox.Shared</AssemblyName>

diff --git a/Bot/Sharp/Compilation/CSharpCompiler.cs b/Bot/Sharp/Compilation/CSharpCompiler.cs
@@ -19,6 +19,8 @@ public class CSharpCompiler : RoslynCompiler
         allowUnsafe: true,
         nullableContextOptions: NullableContextOptions.Enable);
 
+    private static readonly CSharpParseOptions _parseOptions = new(LanguageVersion.Preview);
+
     private static CSharpCompilationOptions GetOptions(SyntaxTree syntaxTree, CompilationOutput? output)
     {
         if (output.HasValue)
@@ -53,14 +55,14 @@ private static SyntaxTree CreateGlobalUsingsSyntaxTree(params string[] namespace
             stringBuilder.AppendLine();
         }
 
-        return CSharpSyntaxTree.ParseText(stringBuilder.ToString());
+        return CSharpSyntaxTree.ParseText(stringBuilder.ToString(), _parseOptions);
     }
 
     public override Language Language => Language.CSharp;
 
     protected override Microsoft.CodeAnalysis.Compilation CreateCompilation(string code, CompilationOutput? output)
     {
-        var syntaxTree = CSharpSyntaxTree.ParseText(code);
+        var syntaxTree = CSharpSyntaxTree.ParseText(code, _parseOptions);
 
         return CSharpCompilation.Create("_", [_globalUsingsSyntaxTree, syntaxTree], _references, GetOptions(syntaxTree, output));
     }

diff --git a/Bot/Sharp/Compilation/FSharpCompiler.cs b/Bot/Sharp/Compilation/FSharpCompiler.cs
@@ -28,8 +28,8 @@ static FSharpCompiler()
     {
         FileSystemAutoOpens.FileSystem = _fileSystem = new VirtualFileSystem();
 
-        var references = Net80.References.All.Select(r => r.FilePath!).Where(p => p is not "System.Runtime.dll").Select(p => $"-r:{p}");
-        _baseArguments = [string.Empty, "--targetprofile:netcore", "--noframework", "--nowin32manifest", .. references, $"-r:{typeof(JitGenericAttribute).Assembly.Location}"];
+        var references = Net90.References.All.Select(r => r.FilePath!).Where(p => p is not "System.Runtime.dll").Select(p => $"-r:{p}");
+        _baseArguments = [string.Empty, "--targetprofile:netcore", "--noframework", "--nowin32manifest" , "--checknulls", .. references, $"-r:{typeof(JitGenericAttribute).Assembly.Location}"];
     }
 
     private const string SourceName = "_.fs";
@@ -506,7 +506,7 @@ public override string NormalizePathShim(string path)
             return base.NormalizePathShim(path);
         }
 
-        public override Stream OpenFileForReadShim(string filePath, [OptionalArgument] FSharpOption<bool> useMemoryMappedFile, [OptionalArgument] FSharpOption<bool> shouldShadowCopy)
+        public override Stream OpenFileForReadShim(string filePath, [OptionalArgument] FSharpOption<bool>? useMemoryMappedFile, [OptionalArgument] FSharpOption<bool>? shouldShadowCopy)
         {
             if (TryGetVirtualPath(filePath.AsMemory(), out var virtualPath))
             {
@@ -519,7 +519,7 @@ public override Stream OpenFileForReadShim(string filePath, [OptionalArgument] F
             return base.OpenFileForReadShim(filePath, useMemoryMappedFile, shouldShadowCopy);
         }
 
-        public override Stream OpenFileForWriteShim(string filePath, [OptionalArgument] FSharpOption<FileMode> fileMode, [OptionalArgument] FSharpOption<FileAccess> fileAccess, [OptionalArgument] FSharpOption<FileShare> fileShare)
+        public override Stream OpenFileForWriteShim(string filePath, FSharpOption<FileMode>? fileMode, FSharpOption<FileAccess>? fileAccess, FSharpOption<FileShare>? fileShare)
         {
             if (TryGetVirtualPath(filePath.AsMemory(), out var virtualPath))
             {

diff --git a/Bot/Sharp/Compilation/RoslynCompiler.cs b/Bot/Sharp/Compilation/RoslynCompiler.cs
@@ -6,7 +6,7 @@ namespace Sharp.Compilation;
 
 public abstract class RoslynCompiler : ICompiler
 {
-    protected static readonly MetadataReference[] _references = [.. Net80.References.All, MetadataReference.CreateFromFile(typeof(JitGenericAttribute).Assembly.Location)];
+    protected static readonly MetadataReference[] _references = [.. Net90.References.All, MetadataReference.CreateFromFile(typeof(JitGenericAttribute).Assembly.Location)];
 
     public abstract Language Language { get; }
 

diff --git a/Bot/Sharp/CompilationResponse/ICompilationResponseProvider.cs b/Bot/Sharp/CompilationResponse/ICompilationResponseProvider.cs
@@ -6,7 +6,7 @@ namespace Sharp.CompilationResponse;
 
 public abstract record CompilationFormatResult
 {
-    public record Success(EmbedProperties Embed, IEnumerable<MessageComponentProperties>? Components) : CompilationFormatResult;
+    public record Success(EmbedProperties Embed, IEnumerable<ComponentProperties>? Components) : CompilationFormatResult;
 
     public record Expired : CompilationFormatResult;
 }

diff --git a/Bot/Sharp/Diagnostics/DiagnosticsFormatter.cs b/Bot/Sharp/Diagnostics/DiagnosticsFormatter.cs
@@ -31,7 +31,7 @@ public DiagnosticsFormatResult.Success FormatDiagnostics(ulong operationId, bool
 
         var fields = CreateDiagnosticsFields(visibleDiagnostics, 1, embedContentLength, out var more);
 
-        IEnumerable<MessageComponentProperties>? components;
+        IEnumerable<ComponentProperties>? components;
 
         if (more)
         {

diff --git a/Bot/Sharp/Diagnostics/IDiagnosticsFormatter.cs b/Bot/Sharp/Diagnostics/IDiagnosticsFormatter.cs
@@ -6,7 +6,7 @@ namespace Sharp.Diagnostics;
 
 public abstract record DiagnosticsFormatResult
 {
-    public record Success(List<EmbedFieldProperties> Fields, IEnumerable<MessageComponentProperties>? Components) : DiagnosticsFormatResult;
+    public record Success(List<EmbedFieldProperties> Fields, IEnumerable<ComponentProperties>? Components) : DiagnosticsFormatResult;
 
     public record Expired : DiagnosticsFormatResult;
 }

diff --git a/Bot/Sharp/Dockerfile b/Bot/Sharp/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
 WORKDIR /src
 
 COPY Sharp.Runtime/Sharp.Runtime.csproj Sharp.Runtime/Sharp.Runtime.csproj
@@ -16,7 +16,7 @@ COPY Bot/Sharp Bot/Sharp
 
 RUN dotnet publish Bot/Sharp/Sharp.csproj -c Release -o /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0
+FROM mcr.microsoft.com/dotnet/sdk:9.0
 WORKDIR /app
 
 COPY --from=build-env /app .

diff --git a/Bot/Sharp/Sharp.csproj b/Bot/Sharp/Sharp.csproj
@@ -2,26 +2,25 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UseAppHost>false</UseAppHost>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.7.9" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net90" Version="1.7.9" />
     <PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.11.0" />
-    <PackageReference Include="FSharp.Compiler.Service" Version="43.8.401" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageReference Include="NetCord" Version="1.0.0-alpha.325" />
-    <PackageReference Include="NetCord.Services" Version="1.0.0-alpha.226" />
-    <PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.95" />
-    <PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.104" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.final " />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.12.0-3.final " />
+    <PackageReference Include="FSharp.Compiler.Service" Version="43.9.100" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="NetCord" Version="1.0.0-alpha.333" />
+    <PackageReference Include="NetCord.Services" Version="1.0.0-alpha.333" />
+    <PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.333" />
+    <PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.333" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Sharp.Runtime/Sharp.Runtime.csproj b/Sharp.Runtime/Sharp.Runtime.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Sharp</RootNamespace>