Skip to content

Commit bd9b7e4

Browse files
authored
Перевод на net8 (EvilBeaver#1562)
* Переключил платформу на net8 * Поднял номер версии сборки dev
1 parent 603046f commit bd9b7e4

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

Build.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<Configuration>Release</Configuration>
1515
<Solution>$(MSBuildProjectDirectory)/src/1Script.sln</Solution>
1616

17+
<ActiveFramework>net8.0</ActiveFramework>
18+
1719
</PropertyGroup>
1820

1921
<ItemGroup>
@@ -30,11 +32,11 @@
3032
<ItemGroup>
3133
<PublishProjects Include="oscript">
3234
<ProjectFile>oscript.csproj</ProjectFile>
33-
<Framework>net6.0</Framework>
35+
<Framework>$(ActiveFramework)</Framework>
3436
</PublishProjects>
3537
<PublishProjects Include="TestApp">
3638
<ProjectFile>TestApp.csproj</ProjectFile>
37-
<Framework>net6.0-windows</Framework>
39+
<Framework>$(ActiveFramework)-windows</Framework>
3840
</PublishProjects>
3941
</ItemGroup>
4042

@@ -106,7 +108,7 @@
106108
</ItemGroup>
107109

108110
<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"/>
109-
<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"/>
111+
<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"/>
110112

111113
<PropertyGroup>
112114
<CppBinPrefix>$(MSBuildProjectDirectory)/src/ScriptEngine.NativeApi/bin/$(Configuration)</CppBinPrefix>

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pipeline {
55

66
environment {
77
VersionPrefix = '2.0.0'
8-
VersionSuffix = 'rc.8'+"+${BUILD_NUMBER}"
8+
VersionSuffix = 'rc.9'+"+${BUILD_NUMBER}"
99
outputEnc = '65001'
1010
}
1111

src/OneScript.DebugProtocol/TcpServer/BinaryChannel.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ This Source Code Form is subject to the terms of the
88
using System;
99
using System.Net.Sockets;
1010
using System.Runtime.Serialization;
11+
#if NET48
1112
using System.Runtime.Serialization.Formatters.Binary;
13+
#endif
1214
using OneScript.DebugProtocol.Abstractions;
1315

16+
// ReSharper disable once CheckNamespace
1417
namespace OneScript.DebugProtocol
1518
{
1619
/// <summary>

src/TestApp/TestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>net6.0-windows</TargetFramework>
6+
<TargetFramework>net8.0-windows</TargetFramework>
77
<!--LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets-->
88
<ApplicationIcon>logo.ico</ApplicationIcon>
99
<OutputType>WinExe</OutputType>

src/oscommon.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
88
<Platform Condition="'$(Platform)' == ''">x86</Platform>
99
<LangVersion>8.0</LangVersion>
10-
<TargetFrameworkVersion>net6.0</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
1111
<NoWarn>$(NoWarn);CS1591</NoWarn>
1212
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
1313
<ImplicitUsings>disable</ImplicitUsings>

0 commit comments

Comments
 (0)