From 39567fe003323781e3815e1d9870eeb4db418b54 Mon Sep 17 00:00:00 2001
From: EvilBeaver <ovsiankin.aa@gmail.com>
Date: Mon, 4 Aug 2025 11:02:34 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BB=20=D0=BF=D0=BB=D0=B0=D1=82=D1=84=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BC=D1=83=20=D0=BD=D0=B0=20net8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.csproj                                           | 4 ++--
 src/OneScript.DebugProtocol/TcpServer/BinaryChannel.cs | 3 +++
 src/TestApp/TestApp.csproj                             | 2 +-
 src/oscommon.targets                                   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Build.csproj b/Build.csproj
index d50f3f220..d7e4ff276 100644
--- a/Build.csproj
+++ b/Build.csproj
@@ -30,11 +30,11 @@
     <ItemGroup>
         <PublishProjects Include="oscript">
             <ProjectFile>oscript.csproj</ProjectFile>
-            <Framework>net6.0</Framework>
+            <Framework>net8.0</Framework>
         </PublishProjects>
         <PublishProjects Include="TestApp">
             <ProjectFile>TestApp.csproj</ProjectFile>
-            <Framework>net6.0-windows</Framework>
+            <Framework>net8.0-windows</Framework>
         </PublishProjects>
     </ItemGroup>
     
diff --git a/src/OneScript.DebugProtocol/TcpServer/BinaryChannel.cs b/src/OneScript.DebugProtocol/TcpServer/BinaryChannel.cs
index 5d3c3a3af..d806ef8e7 100644
--- a/src/OneScript.DebugProtocol/TcpServer/BinaryChannel.cs
+++ b/src/OneScript.DebugProtocol/TcpServer/BinaryChannel.cs
@@ -8,9 +8,12 @@ This Source Code Form is subject to the terms of the
 using System;
 using System.Net.Sockets;
 using System.Runtime.Serialization;
+#if NET48
 using System.Runtime.Serialization.Formatters.Binary;
+#endif
 using OneScript.DebugProtocol.Abstractions;
 
+// ReSharper disable once CheckNamespace
 namespace OneScript.DebugProtocol
 {
     /// <summary>
diff --git a/src/TestApp/TestApp.csproj b/src/TestApp/TestApp.csproj
index 7d49eb936..241a30b6c 100644
--- a/src/TestApp/TestApp.csproj
+++ b/src/TestApp/TestApp.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
   
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <!--LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets-->
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>
diff --git a/src/oscommon.targets b/src/oscommon.targets
index 2268a19aa..d47770e3a 100644
--- a/src/oscommon.targets
+++ b/src/oscommon.targets
@@ -7,7 +7,7 @@
         <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
         <Platform Condition="'$(Platform)' == ''">x86</Platform>
         <LangVersion>8.0</LangVersion>
-        <TargetFrameworkVersion>net6.0</TargetFrameworkVersion>
+        <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
         <ImplicitUsings>disable</ImplicitUsings>

From 93f3eab7e80f4abc366228d19e20400c62a3dd0e Mon Sep 17 00:00:00 2001
From: EvilBeaver <ovsiankin.aa@gmail.com>
Date: Mon, 4 Aug 2025 11:03:18 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 81fe60bef..d60d93856 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
 
     environment {
         VersionPrefix = '2.0.0'
-        VersionSuffix = 'rc.8'+"+${BUILD_NUMBER}"
+        VersionSuffix = 'rc.9'+"+${BUILD_NUMBER}"
         outputEnc = '65001'
     }
 

From ddebb7aebe26e7540b762af42ad161d0ed257d57 Mon Sep 17 00:00:00 2001
From: EvilBeaver <ovsiankin.aa@gmail.com>
Date: Mon, 4 Aug 2025 11:36:35 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=95=D1=89=D0=B5=20=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B8=20=D0=B1=D0=B8=D0=BB=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.csproj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Build.csproj b/Build.csproj
index d7e4ff276..9ce340219 100644
--- a/Build.csproj
+++ b/Build.csproj
@@ -14,6 +14,8 @@
         <Configuration>Release</Configuration>
         <Solution>$(MSBuildProjectDirectory)/src/1Script.sln</Solution>
         
+        <ActiveFramework>net8.0</ActiveFramework>
+        
     </PropertyGroup>
     
     <ItemGroup>
@@ -30,11 +32,11 @@
     <ItemGroup>
         <PublishProjects Include="oscript">
             <ProjectFile>oscript.csproj</ProjectFile>
-            <Framework>net8.0</Framework>
+            <Framework>$(ActiveFramework)</Framework>
         </PublishProjects>
         <PublishProjects Include="TestApp">
             <ProjectFile>TestApp.csproj</ProjectFile>
-            <Framework>net8.0-windows</Framework>
+            <Framework>$(ActiveFramework)-windows</Framework>
         </PublishProjects>
     </ItemGroup>
     
@@ -106,7 +108,7 @@
         </ItemGroup>
         
         <Exec Command="dotnet publish &quot;src/oscript/oscript.csproj&quot; -r %(RuntimeID.Identity) --self-contained -c $(Configuration) -o &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/bin&quot;" UseUtf8Encoding="Always"/>
-        <Exec Command="dotnet publish &quot;src/TestApp/TestApp.csproj&quot; -f net6.0-windows -c $(Configuration) -p:Platform=%(PlatformItem.MSBuildName) -p:UseAppHost=true -o &quot;$(ArtifactsRoot)/win-%(PlatformItem.Identity)/bin&quot;" UseUtf8Encoding="Always"/>
+        <Exec Command="dotnet publish &quot;src/TestApp/TestApp.csproj&quot; -f $(ActiveFramework)-windows -c $(Configuration) -p:Platform=%(PlatformItem.MSBuildName) -p:UseAppHost=true -o &quot;$(ArtifactsRoot)/win-%(PlatformItem.Identity)/bin&quot;" UseUtf8Encoding="Always"/>
 
         <PropertyGroup>
             <CppBinPrefix>$(MSBuildProjectDirectory)/src/ScriptEngine.NativeApi/bin/$(Configuration)</CppBinPrefix>