From d2737bd8192e4f332d0e6a6242bde6fe14161335 Mon Sep 17 00:00:00 2001
From: smolchanovsky <smolchanovsky@gmail.com>
Date: Fri, 16 Jan 2026 19:04:26 +0400
Subject: [PATCH] Port tests to .NET 9.0

---
 .github/workflows/build.yml                               | 8 +-------
 dotnet.cmd                                                | 4 ++--
 .../JitCodegenProviderTests.cs                            | 6 +++---
 .../ReSharperPlugin.DotNetDisassembler.Tests.csproj       | 8 +++++++-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4623a6..05451e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,7 +129,7 @@ jobs:
           files: ${{ github.workspace }}/build/reports/kover/report.xml
           token: ${{ secrets.CODECOV_TOKEN }}
 
-  # Run .NET tests on Linux (net472 runs via Mono)
+  # Run .NET tests on Linux (net9.0)
   testDotNet:
     name: Test .NET
     needs: [ build ]
@@ -153,12 +153,6 @@ jobs:
         with:
           cache-disabled: true
 
-      # Install Mono for .NET Framework tests
-      - name: Setup Mono
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y mono-complete
-
       # Run .NET tests
       - name: Run .NET Tests
         run: ./gradlew testDotNet
diff --git a/dotnet.cmd b/dotnet.cmd
index 0ae14da..5770b50 100755
--- a/dotnet.cmd
+++ b/dotnet.cmd
@@ -5,7 +5,7 @@ GOTO :CMDSCRIPT
 
 set -eu
 
-DOTNET_VERSION=8.0.403
+DOTNET_VERSION=9.0.101
 SCRIPT_VERSION=v2
 COMPANY_DIR="JetBrains"
 TARGET_DIR="${TEMPDIR:-$HOME/.local/share}/$COMPANY_DIR/dotnet-cmd"
@@ -134,7 +134,7 @@ exec "$DOTNET_TARGET_DIR/dotnet" "$@"
 :CMDSCRIPT
 
 setlocal
-set DOTNET_VERSION=8.0.403
+set DOTNET_VERSION=9.0.101
 set SCRIPT_VERSION=v2
 set COMPANY_NAME=JetBrains
 set TARGET_DIR=%LOCALAPPDATA%\%COMPANY_NAME%\dotnet-cmd\
diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/JitCodegenProviderTests.cs b/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/JitCodegenProviderTests.cs
index b3a055d..344bbb7 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/JitCodegenProviderTests.cs
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/JitCodegenProviderTests.cs
@@ -32,7 +32,7 @@ public void SetUp()
             <Project Sdk=""Microsoft.NET.Sdk"">
               <PropertyGroup>
                 <OutputType>Exe</OutputType>
-                <TargetFramework>net8.0</TargetFramework>
+                <TargetFramework>net9.0</TargetFramework>
                 <UseAppHost>false</UseAppHost>
               </PropertyGroup>
             </Project>");
@@ -318,8 +318,8 @@ private JitDisasmProjectContext CreateProjectContext([CanBeNull] JitDisasmTarget
         return new JitDisasmProjectContext(
             Sdk: "Microsoft.NET.Sdk",
             Tfm: tfm ?? new JitDisasmTargetFramework(
-                UniqueString: "net8.0",
-                new Version(8, 0, 0, 0),
+                UniqueString: "net9.0",
+                new Version(9, 0, 0, 0),
                 IsNetCore: true),
             OutputPath: "bin",
             ProjectFilePath: _testProjectFile,
diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/ReSharperPlugin.DotNetDisassembler.Tests.csproj b/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/ReSharperPlugin.DotNetDisassembler.Tests.csproj
index ebb792f..ed70849 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/ReSharperPlugin.DotNetDisassembler.Tests.csproj
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler.Tests/ReSharperPlugin.DotNetDisassembler.Tests.csproj
@@ -2,14 +2,20 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
+    <TargetFramework>net9.0</TargetFramework>
+    <AssetTargetFallback>$(AssetTargetFallback);net472</AssetTargetFallback>
+    <NoWarn>$(NoWarn);NU1701;NU1702</NoWarn>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>