Слияние с develop

Author: dmpas

.cursor/rules/langversion.mdc

@@ -0,0 +1,5 @@
+---
+alwaysApply: true
+---
+
+Проект использует .net 8.0 и LangVersion 8, поэтому при генерации кода не используй языковые фичи C#, которые отсутствуют в C# 8.

.cursor/rules/runbsltests.mdc

@@ -0,0 +1,34 @@
+---
+description: When you need to run main tests
+alwaysApply: false
+---
+
+Когда тебе потребуется запустить приемочные тесты всего проекта, убедиться что ничего не сломано, тебе потребуется запустить bsl тесты. Для этого используются готовые скрипты:
+
+1. **ОБЯЗАТЕЛЬНО** собери консольное приложение oscript из исходников с последними изменениями:
+   
+   ```
+   dotnet build src/oscript/oscript.csproj
+   ```
+   
+   После сборки движок будет находиться здесь:
+   - Windows: `src\oscript\bin\Debug\net8.0\oscript.exe`
+   - Linux/macOS: `src/oscript/bin/Debug/net8.0/oscript`
+   
+   **КРИТИЧЕСКИ ВАЖНО**: Тесты должны запускаться только на свежесобранном oscript, а не на версии из системы! Это гарантирует, что тесты валидируют актуальный код после внесённых изменений.
+
+2. Запусти нужный скрипт, **ЯВНО** передав путь к свежесобранному движку:
+   - Windows: `tests\run-bsl-tests.cmd src\oscript\bin\Debug\net8.0\oscript.exe`
+   - Linux/macOS: `tests/run-bsl-tests.sh src/oscript/bin/Debug/net8.0/oscript`
+   
+   **ВАЖНО**: Не полагайся на автоматический поиск oscript в PATH — всегда указывай путь к свежесобранному бинарнику первым параметром!
+   
+   Оба скрипта автоматически:
+   - Устанавливают путь к библиотекам OVM через переменную `OVM_LIB_PATH` (по умолчанию `%USERPROFILE%\AppData\Local\ovm\current\lib` для Windows и `$HOME/.local/share/ovm/current/lib` для Linux/macOS)
+   - Настраивают `OSCRIPT_CONFIG=lib.system=<OVM_LIB_PATH>`, если эта переменная не была задана заранее
+   - Переходят в каталог `tests` и выполняют `testrunner.os -runAll .`
+
+3. Для запуска одного теста также используй свежесобранный oscript.exe: `<путь\к\собранному\oscript.exe> testrunner.os -run <имя файла теста.os>`.
+4. Всегда используй для запуска тестов новую консоль, не переиспользуй консоль от предыдущих запусков.
+5. Если ошибка запуска тестов связана с Component.dll или NativeApi (эти dll упоминаются в ошибках тестов), то такие тесты следует игнорировать и смотреть только на другие ошибки тестов.
+6. Ошибки теста http.os и "Тест_ДолженПроверитьЧтоПеремещениеФайлаРаботаетПоHTTP" следует игнорировать.

.github/workflows/copilot-setup-steps.yml

@@ -17,13 +17,13 @@ jobs:
     # Setup steps for OneScript development environment
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - run: git config --global core.quotepath false
 
-      - uses: actions/setup-dotnet@v4
+      - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Установка OneScript
         uses: otymko/[email protected]

.github/workflows/rebase.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0 # otherwise, you will fail to push refs to dest repo

.github/workflows/sonar.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Cache SonarQube packages

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "dotnet.defaultSolution": "src/1Script.sln"
+}

Build.csproj

@@ -164,11 +164,9 @@
     </Target>
 
     <Target Name="BuildWithCpp" DependsOnTargets="CleanAll;MakeCPP;MakeFDD;MakeSCD;BuildDebugger">
-        <CallTarget Targets="CleanIntermediates"/>
     </Target>
 
     <Target Name="BuildWithoutCpp" DependsOnTargets="CleanAll;MakeFDD;MakeSCD;BuildDebugger">
-        <CallTarget Targets="CleanIntermediates"/>
     </Target>
 
     <!-- Используется для поиска первого собранного oscript.exe -->
@@ -227,7 +225,7 @@
 
     </Target>
 
-    <Target Name="ComposeDistributionFolders">
+    <Target Name="ComposeDistributionFolders" DependsOnTargets="CleanIntermediates">
         <ItemGroup>
             <TargetDir Include="fdd-x64"/>
             <TargetDir Include="fdd-x86"/>
@@ -263,7 +261,7 @@
         <Delete Files="@(TempFiles)"/>
     </Target>
 
-	<Target Name="PrepareDistributionFiles" DependsOnTargets="CleanAll;BuildAll;GatherLibrary;ComposeDistributionFolders"/>
+	<Target Name="PrepareDistributionFiles" DependsOnTargets="CleanAll;BuildAll;GatherLibrary;BuildDocumentation;ComposeDistributionFolders"/>
 
     <Target Name="Test">
         <CallTarget Targets="UnitTests;ScriptedTests" />
@@ -375,5 +373,35 @@
             Command="dotnet nuget push %(NugetAbleProject.Identity) -k $(NugetToken) -s https://api.nuget.org/v3/index.json" UseUtf8Encoding="Always"/>
 
     </Target>
+
+    <Target Name="BuildDocumenter">
+        <Exec Command="dotnet publish &quot;$(MSBuildProjectDirectory)/src/OneScriptDocumenter/OneScriptDocumenter.csproj&quot; -c Release -o &quot;$(ArtifactsRoot)/tools/documenter&quot;" UseUtf8Encoding="Always"/>
+    </Target>
 
+    <Target Name="BuildDocumentation" DependsOnTargets="MakeSCD;BuildDocumenter">
+        <PropertyGroup>
+            <DocInputDir>$(ArtifactsRoot)/win-x64/bin</DocInputDir>
+            <DocsRoot>$(ArtifactsRoot)/docs</DocsRoot>
+            <DocumenterToolDir>$(ArtifactsRoot)/tools/documenter</DocumenterToolDir>
+        </PropertyGroup>
+        <ItemGroup>
+            <DocAssemblies Include="$(DocInputDir)/ScriptEngine.HostedScript.dll"/>
+            <DocAssemblies Include="$(DocInputDir)/ScriptEngine.dll"/>
+            <DocAssemblies Include="$(DocInputDir)/OneScript.StandardLibrary.dll"/>
+            <DocAssemblies Include="$(DocInputDir)/OneScript.Web.Server.dll"/>
+            <DocAssemblies Include="$(DocInputDir)/oscript.dll"/>
+        </ItemGroup>
+
+        <Error Condition="'@(DocAssemblies)' == ''" Text="No input assemblies found in $(DocInputDir) for documentation generation" />
+        
+        <MakeDir Directories="$(DocsRoot)"/>
+        <MakeDir Directories="$(DocsRoot)/markdown"/>
+        <MakeDir Directories="$(DocsRoot)/json"/>
+        <Exec Command="dotnet &quot;$(DocumenterToolDir)/OneScriptDocumenter.dll&quot; @(DocAssemblies->'%(FullPath)', ' ') -t &quot;$(MSBuildProjectDirectory)/src/OneScriptDocumenter/default_toc.json&quot; -m &quot;$(DocsRoot)/markdown&quot; -j &quot;$(DocsRoot)/json/syntax-helper.json&quot;" UseUtf8Encoding="Always"/>
+        
+        <RemoveDir Directories="$(DocumenterToolDir)" Condition="Exists($(DocumenterToolDir))"/>
+        
+    </Target>
+    
+
 </Project>

Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
 
     environment {
         VersionPrefix = '2.0.0'
-        VersionSuffix = 'rc.9'+"+${BUILD_NUMBER}"
+        VersionSuffix = 'rc.10'+"+${BUILD_NUMBER}"
         outputEnc = '65001'
     }
 
@@ -199,8 +199,9 @@ pipeline {
         }
 
         stage ('Publishing night-build') {
-            when { anyOf {
-                branch 'develop';
+            when { 
+                anyOf {
+                    branch 'develop';
                 }
             }
             agent { label 'master' }
@@ -217,8 +218,9 @@ pipeline {
         }
 
         stage ('Publishing preview') {
-            when { anyOf {
-                branch 'release/preview';
+            when { 
+                anyOf {
+                    branch 'release/preview';
                 }
             }
             agent { label 'master' }
@@ -257,6 +259,46 @@ pipeline {
                 }
             }
         }
+
+        stage ('Publishing docker-images') {
+            parallel {
+                stage('Build v1') {
+                    agent { label 'linux' }
+                    when { 
+                        anyOf {
+                            branch 'release/latest'
+                            expression { 
+                                return env.TAG_NAME && env.TAG_NAME.startsWith('v1.')
+                            }
+                        }
+                    }
+                    steps {
+                        script {
+                            def codename = env.TAG_NAME ? env.TAG_NAME : 'latest'
+                            publishDockerImage('v1', codename)
+                        }
+                    }
+                }
+
+                stage('Build v2') {
+                    agent { label 'linux' }
+                    when { 
+                        anyOf {
+                            branch 'develop'
+                            expression { 
+                                return env.TAG_NAME && env.TAG_NAME.startsWith('v2.')
+                            }
+                        }
+                    }
+                    steps {
+                        script {
+                            def codename = env.TAG_NAME ? env.TAG_NAME : 'dev'
+                            publishDockerImage('v2', codename)
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -300,3 +342,12 @@ def publishReleaseNotes(codename) {
     }
 }
 
+def publishDockerImage(flavour, codename) {
+    def imageName = "evilbeaver/onescript:${codename}"
+
+    docker.build(
+        imageName,
+        "--load -f install/builders/base-image/Dockerfile_${flavour} ."
+    ).push()
+}
+

README-EN.md

@@ -1,23 +1,111 @@
-# README #
+# OneScript #
 
-### The project is an independent cross-platform open-source implementation of a virtual machine that executes scripts written in BSL (1C:Enterprise scripting language).
+[![Join telegram chat](https://img.shields.io/badge/chat-telegram-blue?style=flat&logo=telegram)](https://t.me/oscript_library) [![DEV Build Status](https://build.oscript.io/buildStatus/icon?job=1Script%2Fdevelop&style=flat-square&subject=dev)](https://build.oscript.io/job/1Script/job/develop/) [![STABLE Build Status](https://build.oscript.io/buildStatus/icon?job=1Script%2Fmaster&style=flat-square&subject=stable)](https://build.oscript.io/job/1Script/job/master/)
 
-![Logo](.github/logo-small.png)
+## The project is an independent cross-platform implementation of a virtual machine that executes scripts written in the 1C:Enterprise language ##
 
-Script execution doesn't use any 1C:Enterprise system libraries and doesn't require installation of 1C:Enterprise system on the target machine.
+![Logo](.github/logo-small-2.png) ![Logo](.github/logo-small.png)
 
-In other words, this is a possibility to write programs in the 1C (BSL) language without using the 1C:Enterprise platform.
+The 1C:Enterprise system libraries are not used and installation of the 1C:Enterprise system on the target machine is not required.
 
-## Name and pronunciation
+In other words, this is a tool for writing and executing programs in the 1C language without using the 1C:Enterprise platform.
 
-The project is called OneScript, can be abbreviated to the title 1Script on writing.
+## Name and pronunciation ##
 
-## Project site
+The project is called OneScript, can be abbreviated to the title 1Script when writing. Pronounced as `[uanskript]`.
 
-Basic information about the project, releases and technical documentation are located on the official website.
+OneScript allows you to create and execute text scripts written in a language familiar to any specialist working with the 1C:Enterprise system. Using a familiar language for script automation significantly increases a specialist's productivity by simplifying the automation of manual operations.
 
-http://oscript.io
+## Project site ##
 
-## Library of useful scripts
+Main information about the project, releases and technical documentation are located on the official website
 
-The OneScript package already includes a set of commonly used packages.
+[https://oscript.io](https://oscript.io)
+
+## Library of useful scripts ##
+
+The OneScript distribution already includes a set of the most commonly used packages. These, as well as other packages, are located in the [oscript-library](https://github.com/oscript-library) repository and are available to everyone. There is a package manager [opm](https://github.com/oscript-library/opm).
+
+## Installation ##
+
+### Windows ###
+
+- (interactively) download from the [official website](https://oscript.io) or installer from the [Releases](https://github.com/EvilBeaver/OneScript/releases) section and run it. Then, Next, Done.
+
+### Linux ###
+
+- (interactively) download the required package from the [official website](https://oscript.io) or installer from the [Releases](https://github.com/EvilBeaver/OneScript/releases) section and install it.
+
+### MacOS ###
+
+There is no interactive installer, but the engine can be installed from the command line:
+
+- install [homebrew](https://brew.sh/index_ru)
+- install mono with the command `brew install mono`
+- download [ovm](https://github.com/oscript-library/ovm/releases). Download the `ovm.exe` file (despite the .exe extension it will work on MacOS)
+- run the command `mono path/to/ovm.exe install stable`
+
+    *Tip: To correctly specify the path to `ovm.exe`, drag the `ovm.exe` file into the terminal. Example of a full command: `mono Users/username/Downloads/ovm.exe install stable`*
+- run the command `mono path/to/ovm.exe use stable`
+- restart the terminal
+
+#### Additional configuration for Self-Contained distribution (does not require dotnet installation)
+
+```
+chmod +x ./oscript
+xattr -d com.apple.quarantine *.dylib oscript
+codesign -s - ./oscript
+```
+
+
+# Manual local build
+
+## Preparation
+
+Links to distributions are provided below, however, please note that links may change over time and their relevance is not guaranteed. You need dotnet SDK and C++ compiler, which can be downloaded from anywhere you can find.
+
+* Install [MS BuildTools](https://visualstudio.microsoft.com/ru/thank-you-downloading-visual-studio/?sku=buildtools&rel=16), when installing enable targeting for .net6, .net4.8, install C++ compiler.
+
+## Build
+
+Launch Developer Command Prompt (will appear in the Start menu after installing MSBuildTools or Visual Studio). Navigate to the OneScript repository directory. The following are commands in the Developer Command Prompt console.
+Build is performed using msbuild. Targets:
+
+* CleanAll - clean previous build results
+* BuildAll - prepare files for distribution
+* MakeCPP;MakeFDD;MakeSCD;BuildDebugger - separate build targets for preparing different types of distributions
+* PrepareDistributionFiles - build full distribution packages (including libraries)
+* PackDistributions - prepare ZIP archives for distribution
+* CreateNuget - create packages for publishing to NuGet
+
+**Build parameters**
+
+* VersionPrefix - release number prefix, its main part, for example, 2.0.0
+* VersionSuffix - version suffix, which usually acts as an arbitrary versioning suffix according to semver, for example, beta-786 (optional)
+* NoCppCompiler - if True - C++ compiler is not installed, C++ components (NativeApi support) will not be added to the build
+
+All distribution files will be placed in the `built` directory at the root of the 1Script repository
+
+### Building distribution contents in a separate directory
+
+```bat
+msbuild Build.csproj /t:CleanAll;PrepareDistributionFiles
+```
+
+### Building with manual version specification
+
+```bat
+msbuild Build.csproj /t:CleanAll;PrepareDistributionFiles /p:VersionPrefix=2.0.0
+```
+
+### Building ZIP distributions
+
+```bat
+msbuild Build.csproj /t:CleanAll;PrepareDistributionFiles;PackDistributions /p:VersionPrefix=2.0.0 /p:VersionSuffix=preview223
+```
+
+### Documentation generation
+
+```bat
+msbuild Build.csproj /t:BuildDocumentation
+```

README.md

@@ -102,4 +102,10 @@ msbuild Build.csproj /t:CleanAll;PrepareDistributionFiles /p:VersionPrefix=2.0.0
 
 ```bat
 msbuild Build.csproj /t:CleanAll;PrepareDistributionFiles;PackDistributions /p:VersionPrefix=2.0.0 /p:VersionSuffix=preview223
+```
+
+### Генерация документации
+
+```bat
+msbuild Build.csproj /t:BuildDocumentation
 ```