os2rc7

Author: dmpas

TestApp/TestApp.csproj

@@ -9,16 +9,12 @@
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Folder Include="Properties" />
-    </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\oscript-sql\oscript-sql.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="OneScript.Hosting" Version="2.0.0-rc4" />
+      <PackageReference Include="OneScript.Hosting" Version="2.0.0-rc.7" />
     </ItemGroup>
 
 </Project>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.3.1-{build}
+version: 1.3.2-{build}
 image: Visual Studio 2022
 environment:
   main_project: oscript-sql
@@ -15,7 +15,7 @@ install:
 
     cd os2
 
-    appveyor DownloadFile https://oscript.io/downloads/night-build/x64/fdd -FileName fdd.zip
+    appveyor DownloadFile https://oscript.io/downloads/preview/OneScript-2.0.0-rc.7-fdd-x64.zip -FileName fdd.zip
 
     7z x fdd.zip > NUL
     
@@ -50,6 +50,7 @@ build:
   verbosity: minimal
 configuration: Release
 test_script:
+- cmd: dotnet nuget locals all --clear
 - cmd: >-
     set OSLIB_LOADER_TRACE=1
     
@@ -61,20 +62,21 @@ test_script:
     os1\bin\oscript.exe testcomponent.os
 
 after_build:
+- ps: dotnet publish --no-build --configuration $env:Configuration
 - cmd: >-
 
-    dotnet publish %main_project%
+    set BUILDDIR=%main_project%\bin\%CONFIGURATION%\net6.0\publish
 
-    cd %main_project%\bin\%CONFIGURATION%\net6.0\publish
+    mkdir oslib\Components\dotnet
 
-    del ScriptEngine*.dll NewtonSoft*.dll DotNetZip*.dll OneScript*.dll *.pdb
+    OneScriptDocumenter.exe json oslib\Components\dotnet\syntaxHelp.json %BUILDDIR%\1script_%main_project%.dll
     
-    cd ..\..\..\..\..
+    del /F /Q %BUILDDIR%\ScriptEngine*.* %BUILDDIR%\NewtonSoft*.* %BUILDDIR%\DotNetZip*.*
     
-    xcopy /E %main_project%\bin\%CONFIGURATION%\net6.0\publish\* oslib\Components\dotnet\
+    xcopy /E %BUILDDIR%\* oslib\Components\dotnet\
     
     cd oslib
-    
+
     ..\os2\bin\oscript.bat ..\os2\lib\opm\src\cmd\opm.os build .
     
     for %%X in (*.ospx) do (..\os2\bin\oscript.bat ..\os2\lib\opm\src\cmd\opm.os install -f %%X )

oscript-sql/oscript-sql.csproj

@@ -11,13 +11,10 @@
   <ItemGroup>
     <PackageReference Include="MySql.Data" Version="8.0.24" />
     <PackageReference Include="Npgsql" Version="8.0.3" />
-    <PackageReference Include="OneScript" Version="2.0.0-rc4" />
-    <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc4" />
-    <PackageReference Include="OneScript.StandardLibrary" Version="2.0.0-rc4" />
+    <PackageReference Include="OneScript" Version="2.0.0-rc.7" />
+    <PackageReference Include="OneScript.CoreLib" Version="2.0.0-rc.7" />
+    <PackageReference Include="OneScript.StandardLibrary" Version="2.0.0-rc.7" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 </Project>

oslib/packagedef

@@ -1,6 +1,6 @@
 
 Описание.Имя("sql")
-		.Версия("1.3.1.1")
+		.Версия("1.3.2")
 		.ВключитьФайл("Components")
 		.ВключитьФайл("docs")
 		.ВключитьФайл("tests")