ConceptProd/Exteor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ConceptProd:cb5155b4443cd69d6785bf65d0307716a397545f
Branches Tags
ConceptProd:main
..
compare: ConceptProd:ee0653c2bb23639c409b3a11c425cf57ff7f2f90
Branches Tags
ConceptProd:main

2 Commits
cb5155b444 ... ee0653c2bb

Author SHA1 Message Date
Ivan
ee0653c2bb Fix encoding 2024-07-13 19:32:03 +03:00
Ivan
6317ee40b7 Improve NuGet packages restoration for first build 2024-07-13 19:30:03 +03:00
5 changed files with 75 additions and 66 deletions
Show Stats Expand all files Collapse all files

48
Exteor.vcxproj
View File

@ -48,18 +48,18 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets" Condition="Exists('packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" /> <Import Project="..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" />
<Import Project="packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets" Condition="Exists('packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" /> <Import Project="..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets" Condition="Exists('..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" />
<Import Project="packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets" Condition="Exists('packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" /> <Import Project="..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets" Condition="Exists('..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" />
<Import Project="packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets" Condition="Exists('packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" /> <Import Project="..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets" Condition="Exists('..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" />
<Import Project="packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets" Condition="Exists('packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" /> <Import Project="..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" />
<Import Project="packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets" Condition="Exists('packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" /> <Import Project="..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets" Condition="Exists('..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" />
<Import Project="packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets" Condition="Exists('packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" /> <Import Project="..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" />
<Import Project="packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets" Condition="Exists('packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" /> <Import Project="..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets" Condition="Exists('..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" />
<Import Project="packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets" Condition="Exists('packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" /> <Import Project="..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets" Condition="Exists('..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" />
<Import Project="packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets" Condition="Exists('packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" /> <Import Project="..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets" Condition="Exists('..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" />
<Import Project="packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets" Condition="Exists('packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" /> <Import Project="..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" />
<Import Project="packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets" Condition="Exists('packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" /> <Import Project="..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets" Condition="Exists('..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -495,17 +495,17 @@ copy "C:\Program Files (x86)\Python312-32\Python312_d.pdb" "$(OutDir)"</Command>
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets'))" />
<Error Condition="!Exists('packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets'))" />
<Error Condition="!Exists('packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets'))" />
<Error Condition="!Exists('packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets'))" /> <Error Condition="!Exists('..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets'))" />
<Error Condition="!Exists('packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets'))" />
<Error Condition="!Exists('packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets'))" />
<Error Condition="!Exists('packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets'))" />
<Error Condition="!Exists('packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets'))" />
<Error Condition="!Exists('packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets'))" /> <Error Condition="!Exists('..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets'))" />
<Error Condition="!Exists('packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets'))" />
<Error Condition="!Exists('packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets'))" />
<Error Condition="!Exists('packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets'))" /> <Error Condition="!Exists('..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets'))" />
</Target> </Target>
</Project> </Project>

9
NuGet.Config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<config>
<add key="repositoryPath" value="../packages" />
</config>
</configuration>

52
test/XTRCoreTest.vcxproj
View File

@ -51,19 +51,19 @@
<ImportGroup Label="ExtensionSettings" /> <ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="Shared" /> <ImportGroup Label="Shared" />
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" /> <Import Project="..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
<Import Project="..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" /> <Import Project="..\..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets" Condition="Exists('..\..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" />
<Import Project="..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets" Condition="Exists('..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" /> <Import Project="..\..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets" Condition="Exists('..\..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" />
<Import Project="..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets" Condition="Exists('..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" /> <Import Project="..\..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets" Condition="Exists('..\..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" />
<Import Project="..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets" Condition="Exists('..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" /> <Import Project="..\..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets" Condition="Exists('..\..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" />
<Import Project="..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" /> <Import Project="..\..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets" Condition="Exists('..\..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" />
<Import Project="..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets" Condition="Exists('..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" /> <Import Project="..\..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets" Condition="Exists('..\..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" />
<Import Project="..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" /> <Import Project="..\..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets" Condition="Exists('..\..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" />
<Import Project="..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets" Condition="Exists('..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" /> <Import Project="..\..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets" Condition="Exists('..\..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" />
<Import Project="..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets" Condition="Exists('..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" /> <Import Project="..\..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets" Condition="Exists('..\..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" />
<Import Project="..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets" Condition="Exists('..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" /> <Import Project="..\..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets" Condition="Exists('..\..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" />
<Import Project="..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets" Condition="Exists('..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" /> <Import Project="..\..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets" Condition="Exists('..\..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" />
<Import Project="..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets" Condition="Exists('..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" /> <Import Project="..\..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets" Condition="Exists('..\..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -264,18 +264,18 @@ copy "C:\Program Files (x86)\Python312-32\Python312.pdb" "$(OutDir)"</Command>
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" /> <Error Condition="!Exists('..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Foundation.vs150.noarch.1.10.1\build\native\Poco.Foundation.vs150.noarch.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Foundation.vs150.static.1.10.1\build\native\Poco.Foundation.vs150.static.targets'))" />
<Error Condition="!Exists('..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.JSON.vs150.noarch.1.10.1\build\native\Poco.JSON.vs150.noarch.targets'))" />
<Error Condition="!Exists('..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.JSON.vs150.static.1.10.1\build\native\Poco.JSON.vs150.static.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Net.vs150.noarch.1.10.1\build\native\Poco.Net.vs150.noarch.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Net.vs150.static.1.10.1\build\native\Poco.Net.vs150.static.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Util.vs150.noarch.1.10.1\build\native\Poco.Util.vs150.noarch.targets'))" />
<Error Condition="!Exists('..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.XML.vs150.noarch.1.10.1\build\native\Poco.XML.vs150.noarch.targets'))" />
<Error Condition="!Exists('..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.XML.vs150.static.1.10.1\build\native\Poco.XML.vs150.static.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Util.vs150.static.1.10.1\build\native\Poco.Util.vs150.static.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Zip.vs150.noarch.1.10.1\build\native\Poco.Zip.vs150.noarch.targets'))" />
<Error Condition="!Exists('..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets'))" /> <Error Condition="!Exists('..\..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Poco.Zip.vs150.static.1.10.1\build\native\Poco.Zip.vs150.static.targets'))" />
</Target> </Target>
</Project> </Project>

8
test/src/testDocuments.cpp
View File

@ -11,7 +11,7 @@ protected:
}; };
TEST_F(UTDocuments, RSFormSaveLoad) { TEST_F(UTDocuments, RSFormSaveLoad) {
const auto filePath = ::LocalPathToGlobal(LR"(Data\ÒåñòÊèðèëëèöà.trs)"); const auto filePath = ::LocalPathToGlobal(LR"(Data\ТестКириллица.trs)");
MockRSFormDoc rsdoc{}; MockRSFormDoc rsdoc{};
auto& schema = *rsdoc.schema; auto& schema = *rsdoc.schema;
@ -98,7 +98,7 @@ TEST_F(UTDocuments, OSSLoad) {
TEST_F(UTDocuments, RSModelSaveLoad) { TEST_F(UTDocuments, RSModelSaveLoad) {
using ccl::semantic::CstType; using ccl::semantic::CstType;
using ccl::semantic::EvalStatus; using ccl::semantic::EvalStatus;
const auto filePath = ::LocalPathToGlobal(LR"(Data\ÒåñòÊèðèëëèöà.rsm)"); const auto filePath = ::LocalPathToGlobal(LR"(Data\ТестКириллица.rsm)");
MockRSModelDoc rsdoc{}; MockRSModelDoc rsdoc{};
auto& model = *rsdoc.model; auto& model = *rsdoc.model;
@ -152,7 +152,7 @@ TEST_F(UTDocuments, RSModelSaveLoad) {
TEST_F(UTDocuments, RSModelCalculate) { TEST_F(UTDocuments, RSModelCalculate) {
MockRSModelDoc document{}; MockRSModelDoc document{};
const auto filePath = ::LocalPathToGlobal(LR"(Data\Òåñò_Ìîäåëè\TestCalculate.rsm)"); const auto filePath = ::LocalPathToGlobal(LR"(Data\Тест_Модели\TestCalculate.rsm)");
ASSERT_TRUE(document.LoadFrom(filePath)); ASSERT_TRUE(document.LoadFrom(filePath));
document.model->Calculations().RecalculateAll(); document.model->Calculations().RecalculateAll();
EXPECT_EQ(document.model->Calculations().Count(ccl::semantic::EvalStatus::AXIOM_FAIL), 0U); EXPECT_EQ(document.model->Calculations().Count(ccl::semantic::EvalStatus::AXIOM_FAIL), 0U);
@ -161,7 +161,7 @@ TEST_F(UTDocuments, RSModelCalculate) {
} }
TEST_F(UTDocuments, OSSSaveLoad) { TEST_F(UTDocuments, OSSSaveLoad) {
const auto filePath = ::LocalPathToGlobal(LR"(Data\ÒåñòÊèðèëëèöà.oss)"); const auto filePath = ::LocalPathToGlobal(LR"(Data\ТестКириллица.oss)");
MockOSSDoc ossdoc{}; MockOSSDoc ossdoc{};
auto& initial = *ossdoc.oss; auto& initial = *ossdoc.oss;

24
test/src/testTextProcessor.cpp
View File

@ -36,28 +36,28 @@ protected:
TEST_F(UTPyTextProcessor, Inflect) { TEST_F(UTPyTextProcessor, Inflect) {
EXPECT_EQ(processor->Inflect("", Morphology{}), ""); EXPECT_EQ(processor->Inflect("", Morphology{}), "");
EXPECT_EQ(processor->Inflect("", "sing,datv"_form), ""); EXPECT_EQ(processor->Inflect("", "sing,datv"_form), "");
EXPECT_EQ(processor->Inflect(u8"ñëîí"_c17, Morphology{}), u8"ñëîí"_c17); EXPECT_EQ(processor->Inflect(u8"слон"_c17, Morphology{}), u8"слон"_c17);
EXPECT_EQ(processor->Inflect(u8"ñëîí"_c17, "sing,datv"_form), u8"ñëîíó"_c17); EXPECT_EQ(processor->Inflect(u8"слон"_c17, "sing,datv"_form), u8"слону"_c17);
EXPECT_EQ(processor->Inflect(u8"ñèíèé ñëîí"_c17, "plur,datv"_form), u8"ñèíèì ñëîíàì"_c17); EXPECT_EQ(processor->Inflect(u8"синий слон"_c17, "plur,datv"_form), u8"синим слонам"_c17);
EXPECT_EQ(processor->Inflect(u8"ñèíèé ñëîí"_c17, "ADJF,pres,datv"_form), u8"ñèíèé ñëîí"_c17); EXPECT_EQ(processor->Inflect(u8"синий слон"_c17, "ADJF,pres,datv"_form), u8"синий слон"_c17);
EXPECT_EQ(processor->Inflect(u8"óñèëåííî îáåñïå÷èâàòü"_c17, "past,masc"_form), u8"óñèëåííî îáåñïå÷èâàë"_c17); EXPECT_EQ(processor->Inflect(u8"усиленно обеспечивать"_c17, "past,masc"_form), u8"усиленно обеспечивал"_c17);
EXPECT_EQ(processor->Inflect(u8"óñèëåííî îáåñïå÷èâàòü"_c17, "past,masc"_form), u8"óñèëåííî îáåñïå÷èâàë"_c17); EXPECT_EQ(processor->Inflect(u8"усиленно обеспечивать"_c17, "past,masc"_form), u8"усиленно обеспечивал"_c17);
} }
TEST_F(UTPyTextProcessor, InflectDependant) { TEST_F(UTPyTextProcessor, InflectDependant) {
EXPECT_EQ(processor->InflectDependant("", ""), ""); EXPECT_EQ(processor->InflectDependant("", ""), "");
EXPECT_EQ(processor->InflectDependant("", "invalid"), ""); EXPECT_EQ(processor->InflectDependant("", "invalid"), "");
EXPECT_EQ(processor->InflectDependant("invalid", ""), "invalid"); EXPECT_EQ(processor->InflectDependant("invalid", ""), "invalid");
EXPECT_EQ(processor->InflectDependant("", u8"òåðìèí"_c17), ""); EXPECT_EQ(processor->InflectDependant("", u8"термин"_c17), "");
EXPECT_EQ(processor->InflectDependant(u8"òåðìèíîì"_c17, ""), u8"òåðìèíîì"_c17); EXPECT_EQ(processor->InflectDependant(u8"термином"_c17, ""), u8"термином"_c17);
EXPECT_EQ(processor->InflectDependant(u8"îáùèé"_c17, u8"ìàòü"_c17), u8"îáùàÿ"_c17); EXPECT_EQ(processor->InflectDependant(u8"общий"_c17, u8"мать"_c17), u8"общая"_c17);
EXPECT_EQ(processor->InflectDependant(u8"ìîãó÷èé êðàñèâûé"_c17, u8"ðóññêîãî áîãàòûðÿ"_c17), u8"ìîãó÷åãî êðàñèâîãî"_c17); EXPECT_EQ(processor->InflectDependant(u8"могучий красивый"_c17, u8"русского богатыря"_c17), u8"могучего красивого"_c17);
} }
TEST_F(UTPyTextProcessor, IsSubstr) { TEST_F(UTPyTextProcessor, IsSubstr) {
EXPECT_TRUE(processor->IsSubstr("", "")); EXPECT_TRUE(processor->IsSubstr("", ""));
EXPECT_TRUE(processor->IsSubstr("", "123")); EXPECT_TRUE(processor->IsSubstr("", "123"));
EXPECT_FALSE(processor->IsSubstr("4", "123")); EXPECT_FALSE(processor->IsSubstr("4", "123"));
EXPECT_TRUE(processor->IsSubstr(u8"÷åëîâåê"_c17, u8"ëþäè"_c17)); EXPECT_TRUE(processor->IsSubstr(u8"человек"_c17, u8"люди"_c17));
EXPECT_TRUE(processor->IsSubstr(u8"ñòèëüíûé ÷åëîâåê"_c17, u8"ñòèëüíûìè ëþäüìè"_c17)); EXPECT_TRUE(processor->IsSubstr(u8"стильный человек"_c17, u8"стильными людьми"_c17));
} }