Skip to content

Перевод на net8 #1562

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

Merged
EvilBeaver merged 3 commits into from
Aug 4, 2025
Merged

Перевод на net8 #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39567fe
Переключил платформу на net8
EvilBeaver Aug 4, 2025
93f3eab
Поднял номер версии сборки dev
EvilBeaver Aug 4, 2025
ddebb7a
Еще правки билда
EvilBeaver Aug 4, 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: 5 additions & 3 deletions Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<Configuration>Release</Configuration>
<Solution>$(MSBuildProjectDirectory)/src/1Script.sln</Solution>

<ActiveFramework>net8.0</ActiveFramework>

</PropertyGroup>

<ItemGroup>
Expand All @@ -30,11 +32,11 @@
<ItemGroup>
<PublishProjects Include="oscript">
<ProjectFile>oscript.csproj</ProjectFile>
<Framework>net6.0</Framework>
<Framework>$(ActiveFramework)</Framework>
</PublishProjects>
<PublishProjects Include="TestApp">
<ProjectFile>TestApp.csproj</ProjectFile>
<Framework>net6.0-windows</Framework>
<Framework>$(ActiveFramework)-windows</Framework>
</PublishProjects>
</ItemGroup>

Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {

environment {
VersionPrefix = '2.0.0'
VersionSuffix = 'rc.8'+"+${BUILD_NUMBER}"
VersionSuffix = 'rc.9'+"+${BUILD_NUMBER}"
outputEnc = '65001'
}

Expand Down
3 changes: 3 additions & 0 deletions src/OneScript.DebugProtocol/TcpServer/BinaryChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/TestApp/TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/oscommon.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading