Skip to content

build: Поднятие версии netcore до 8.0 #37

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
Stivo182 merged 1 commit into from
Feb 19, 2026
Merged

build: Поднятие версии netcore до 8.0 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions build/ПодготовкаКомпонентов.os
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

СоответствиеПапок = Новый Соответствие();
СоответствиеПапок.Вставить("net4", "net48");
СоответствиеПапок.Вставить("dotnet", "net6.0");
СоответствиеПапок.Вставить("dotnet", "net8.0");

КаталогКомпонентов = ОбъединитьПути(ТекущийКаталог(), "Components");

Expand Down Expand Up @@ -95,7 +95,7 @@
Для Каждого ИмяФайла Из ИменаФайлов Цикл
ПутьКФайлу = ОбъединитьПути(ТекущийКаталог, "Components", ИмяПапки, ИмяФайла);
Если Не ФС.ФайлСуществует(ПутьКФайлу) Тогда
ВызватьИсключение СтрШаблон("Отсутсвует .NET компонента %1 в папке Components/%2", ИмяФайла, ИмяПапки);
ВызватьИсключение СтрШаблон("Отсутствует .NET компонента %1 в папке Components/%2", ИмяФайла, ИмяПапки);
КонецЕсли;
КонецЦикла;
КонецЦикла;
Expand Down
8 changes: 4 additions & 4 deletions src/BenchmarkOneScript.Extensions/BenchmarkOneScript.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net6.0;</TargetFrameworks>
<TargetFrameworks>net48;net8.0;</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<PackageProjectUrl>https://github.com/Stivo182/BenchmarkOneScript</PackageProjectUrl>
<RepositoryUrl>https://github.com/Stivo182/BenchmarkOneScript</RepositoryUrl>
<Title>BenchmarkOneScriptExtensions</Title>
<Company>Stivo182</Company>
<Copyright>Stivo182</Copyright>
<Version>1.0.0</Version>
<Version>1.1.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<AssemblyName>1script_BenchmarkOneScriptExtensions</AssemblyName>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="OneScript.StandardLibrary" Version="2.0.0-rc6" />
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="OneScript.StandardLibrary" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net48'">
Expand Down
4 changes: 2 additions & 2 deletions src/BenchmarkOneScript.Extensions/TypeExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET6_0_OR_GREATER
#if NETCOREAPP
using OneScript.Contexts;
#endif

Expand All @@ -12,7 +12,7 @@ public class TypeExtension : AutoContext<TypeExtension>
{
[ContextProperty("Источник", "Source")]
public string Source =>
#if NET6_0_OR_GREATER
#if NETCOREAPP
AttachedScriptsFactory.GetModuleOfType(_type.ToString())?.Source?.Location ?? "";
#else
AttachedScriptsFactory.GetModuleOfType(_type.ToString())?.ModuleInfo?.Origin ?? "";
Expand Down
2 changes: 1 addition & 1 deletion src/Chronometer/Chronometer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Runtime.CompilerServices;
using ScriptEngine.Machine.Contexts;

#if NET6_0_OR_GREATER
#if NETCOREAPP
using OneScript.Contexts;
#endif

Expand Down
8 changes: 4 additions & 4 deletions src/Chronometer/ChronometerOneScript.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net6.0;</TargetFrameworks>
<TargetFrameworks>net48;net8.0;</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<PackageProjectUrl>https://github.com/Stivo182/BenchmarkOneScript</PackageProjectUrl>
<RepositoryUrl>https://github.com/Stivo182/BenchmarkOneScript</RepositoryUrl>
<Title>Chronometer for OneScript</Title>
<Company>Stivo182</Company>
<Copyright>Stivo182</Copyright>
<Version>1.0.0</Version>
<Version>1.1.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<AssemblyName>1script_Chronometer</AssemblyName>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="OneScript.StandardLibrary" Version="2.0.0-rc6" />
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="OneScript.StandardLibrary" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net48'">
Expand Down