mirror of
https://github.com/krugersu/YY.EventLogExportAssistant.git
synced 2026-06-20 01:16:51 +02:00
Merge pull request #44 from YPermitin/develop
Обновлены используемые библиотеки
This commit is contained in:
@@ -19,6 +19,11 @@ jobs:
|
|||||||
dotnet-version: 3.1.301
|
dotnet-version: 3.1.301
|
||||||
- name: Install ClickHouse
|
- name: Install ClickHouse
|
||||||
run: sudo chmod +x ./Scripts/install-clickhouse.sh && ./Scripts/install-clickhouse.sh
|
run: sudo chmod +x ./Scripts/install-clickhouse.sh && ./Scripts/install-clickhouse.sh
|
||||||
|
#- name: Install MySQL
|
||||||
|
# run: sudo chmod +x ./Scripts/install-mysql.sh && ./Scripts/install-mysql.sh
|
||||||
|
- uses: mirromutth/mysql-action@v1.1
|
||||||
|
with:
|
||||||
|
mysql root password: Password12!
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
- name: Build
|
- name: Build
|
||||||
@@ -27,3 +32,5 @@ jobs:
|
|||||||
run: dotnet test Tests/YY.EventLogExportAssistant.Core.Tests/YY.EventLogExportAssistant.Core.Tests.csproj
|
run: dotnet test Tests/YY.EventLogExportAssistant.Core.Tests/YY.EventLogExportAssistant.Core.Tests.csproj
|
||||||
- name: Test ClickHouse
|
- name: Test ClickHouse
|
||||||
run: dotnet test Tests/YY.EventLogExportAssistant.ClickHouse.Tests/YY.EventLogExportAssistant.ClickHouse.Tests.csproj
|
run: dotnet test Tests/YY.EventLogExportAssistant.ClickHouse.Tests/YY.EventLogExportAssistant.ClickHouse.Tests.csproj
|
||||||
|
- name: Test MySQL
|
||||||
|
run: dotnet test Tests/YY.EventLogExportAssistant.MySQL.Tests/YY.EventLogExportAssistant.MySQL.Tests.csproj
|
||||||
|
|||||||
-10
@@ -4,7 +4,6 @@ dist: bionic
|
|||||||
dotnet: 3.1
|
dotnet: 3.1
|
||||||
services:
|
services:
|
||||||
- postgresql
|
- postgresql
|
||||||
- mysql
|
|
||||||
addons:
|
addons:
|
||||||
postgresql: "10"
|
postgresql: "10"
|
||||||
before_install:
|
before_install:
|
||||||
@@ -19,21 +18,12 @@ before_install:
|
|||||||
install:
|
install:
|
||||||
- dotnet restore
|
- dotnet restore
|
||||||
before_script:
|
before_script:
|
||||||
# - wget https://repo.mysql.com//mysql-apt-config_0.8.10-1_all.deb
|
|
||||||
# - sudo dpkg -i mysql-apt-config_0.8.10-1_all.deb
|
|
||||||
# - sudo apt-get update -q
|
|
||||||
# - sudo apt-get install -q -y --allow-unauthenticated -o Dpkg::Options::=--force-confnew mysql-server
|
|
||||||
# - sudo systemctl restart mysql
|
|
||||||
# - sudo mysql_upgrade
|
|
||||||
# - mysql --version
|
|
||||||
- sleep 30
|
- sleep 30
|
||||||
script:
|
script:
|
||||||
- dotnet build --configuration Release
|
- dotnet build --configuration Release
|
||||||
- dotnet test Tests/YY.EventLogExportAssistant.Core.Tests/YY.EventLogExportAssistant.Core.Tests.csproj
|
- dotnet test Tests/YY.EventLogExportAssistant.Core.Tests/YY.EventLogExportAssistant.Core.Tests.csproj
|
||||||
- dotnet test Tests/YY.EventLogExportAssistant.PostgreSQL.Tests/YY.EventLogExportAssistant.PostgreSQL.Tests.csproj
|
- dotnet test Tests/YY.EventLogExportAssistant.PostgreSQL.Tests/YY.EventLogExportAssistant.PostgreSQL.Tests.csproj
|
||||||
- dotnet test Tests/YY.EventLogExportAssistant.ElasticSearch.Tests/YY.EventLogExportAssistant.ElasticSearch.Tests.csproj
|
- dotnet test Tests/YY.EventLogExportAssistant.ElasticSearch.Tests/YY.EventLogExportAssistant.ElasticSearch.Tests.csproj
|
||||||
# Òåñòû äëÿ MySQL âðåìåííî îòêëþ÷åíû â Travis CI
|
|
||||||
# - dotnet test Tests/YY.EventLogExportAssistant.MySQL.Tests/YY.EventLogExportAssistant.MySQL.Tests.csproj
|
|
||||||
- dotnet test Tests/YY.EventLogExportAssistant.ClickHouse.Tests/YY.EventLogExportAssistant.ClickHouse.Tests.csproj
|
- dotnet test Tests/YY.EventLogExportAssistant.ClickHouse.Tests/YY.EventLogExportAssistant.ClickHouse.Tests.csproj
|
||||||
deploy:
|
deploy:
|
||||||
skip_cleanup: true
|
skip_cleanup: true
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
+3
-3
@@ -3,7 +3,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<Version>1.0.0.13</Version>
|
<Version>1.0.0.15</Version>
|
||||||
<Authors>Permitin Yuriy</Authors>
|
<Authors>Permitin Yuriy</Authors>
|
||||||
<Company>Permitin Yuriy</Company>
|
<Company>Permitin Yuriy</Company>
|
||||||
<Product>Event log export assistant to ClickHouse</Product>
|
<Product>Event log export assistant to ClickHouse</Product>
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
<RepositoryType>GIT</RepositoryType>
|
<RepositoryType>GIT</RepositoryType>
|
||||||
<PackageTags>event, log, 1C, enterprise, export, elasticsearch, elk</PackageTags>
|
<PackageTags>event, log, 1C, enterprise, export, elasticsearch, elk</PackageTags>
|
||||||
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
||||||
<AssemblyVersion>1.0.0.13</AssemblyVersion>
|
<AssemblyVersion>1.0.0.15</AssemblyVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ClickHouse.Client" Version="2.3.0.326" />
|
<PackageReference Include="ClickHouse.Client" Version="3.0.0.357" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ namespace YY.EventLogExportAssistant.Database.Models
|
|||||||
public override string Name { get; set; }
|
public override string Name { get; set; }
|
||||||
[MaxLength(500)]
|
[MaxLength(500)]
|
||||||
public override string Description { get; set; }
|
public override string Description { get; set; }
|
||||||
|
[MaxLength(500)]
|
||||||
|
public override string TimeZoneName { get; set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace YY.EventLogExportAssistant
|
|||||||
public virtual long Id { get; set; }
|
public virtual long Id { get; set; }
|
||||||
public virtual string Name { get; set; }
|
public virtual string Name { get; set; }
|
||||||
public virtual string Description { get; set; }
|
public virtual string Description { get; set; }
|
||||||
public string TimeZoneName { get; set; }
|
public virtual string TimeZoneName { get; set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
<RootNamespace>YY.EventLogExportAssistant</RootNamespace>
|
<RootNamespace>YY.EventLogExportAssistant</RootNamespace>
|
||||||
<Version>1.0.0.43</Version>
|
<Version>1.0.0.45</Version>
|
||||||
<PackageId>YY.EventLogExportAssistant.Core</PackageId>
|
<PackageId>YY.EventLogExportAssistant.Core</PackageId>
|
||||||
<Authors>Permitin Yuriy</Authors>
|
<Authors>Permitin Yuriy</Authors>
|
||||||
<Company />
|
<Company />
|
||||||
@@ -17,17 +17,17 @@
|
|||||||
<RepositoryUrl>https://github.com/YPermitin/YY.EventLogExportAssistant</RepositoryUrl>
|
<RepositoryUrl>https://github.com/YPermitin/YY.EventLogExportAssistant</RepositoryUrl>
|
||||||
<RepositoryType>GIT</RepositoryType>
|
<RepositoryType>GIT</RepositoryType>
|
||||||
<PackageTags>event, log, 1C, enterprise, export</PackageTags>
|
<PackageTags>event, log, 1C, enterprise, export</PackageTags>
|
||||||
<AssemblyVersion>1.0.0.43</AssemblyVersion>
|
<AssemblyVersion>1.0.0.45</AssemblyVersion>
|
||||||
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
|
||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||||
<PackageReference Include="YY.EventLogReaderAssistant" Version="1.0.0.49" />
|
<PackageReference Include="YY.EventLogReaderAssistant" Version="1.0.0.50" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
<Version>1.0.0.25</Version>
|
<Version>1.0.0.27</Version>
|
||||||
<Company>Permitin Yuriy</Company>
|
<Company>Permitin Yuriy</Company>
|
||||||
<Authors>Permitin Yuriy</Authors>
|
<Authors>Permitin Yuriy</Authors>
|
||||||
<Product>Event log export assistant to ElasticSearch</Product>
|
<Product>Event log export assistant to ElasticSearch</Product>
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
<PackageTags>event, log, 1C, enterprise, export, elasticsearch, elk</PackageTags>
|
<PackageTags>event, log, 1C, enterprise, export, elasticsearch, elk</PackageTags>
|
||||||
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<AssemblyVersion>1.0.0.25</AssemblyVersion>
|
<AssemblyVersion>1.0.0.27</AssemblyVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
<Version>1.0.0.22</Version>
|
<Version>1.0.0.24</Version>
|
||||||
<Authors>Permitin Yuriy</Authors>
|
<Authors>Permitin Yuriy</Authors>
|
||||||
<Product>Event log export assistant for MySQL</Product>
|
<Product>Event log export assistant for MySQL</Product>
|
||||||
<Description>Library for exprorting 1C:Enterprise 8.x platform's event log files to MySQL database</Description>
|
<Description>Library for exprorting 1C:Enterprise 8.x platform's event log files to MySQL database</Description>
|
||||||
@@ -14,8 +14,8 @@
|
|||||||
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
||||||
<PackageIcon>icon.png</PackageIcon>
|
<PackageIcon>icon.png</PackageIcon>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<AssemblyVersion>1.0.0.22</AssemblyVersion>
|
<AssemblyVersion>1.0.0.24</AssemblyVersion>
|
||||||
<FileVersion>1.0.0.22</FileVersion>
|
<FileVersion>1.0.0.24</FileVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
+7
-7
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
<Version>1.0.0.43</Version>
|
<Version>1.0.0.45</Version>
|
||||||
<PackageId>YY.EventLogExportAssistant.PostgreSQL</PackageId>
|
<PackageId>YY.EventLogExportAssistant.PostgreSQL</PackageId>
|
||||||
<Authors>Permitin Yuriy</Authors>
|
<Authors>Permitin Yuriy</Authors>
|
||||||
<Product>Event log export assistant for PostgreSQL</Product>
|
<Product>Event log export assistant for PostgreSQL</Product>
|
||||||
@@ -14,19 +14,19 @@
|
|||||||
<RepositoryType>GIT</RepositoryType>
|
<RepositoryType>GIT</RepositoryType>
|
||||||
<PackageTags>event, log, 1C, enterprise, export, postgres, postgresql</PackageTags>
|
<PackageTags>event, log, 1C, enterprise, export, postgres, postgresql</PackageTags>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<AssemblyVersion>1.0.0.43</AssemblyVersion>
|
<AssemblyVersion>1.0.0.45</AssemblyVersion>
|
||||||
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
||||||
<FileVersion>1.0.0.43</FileVersion>
|
<FileVersion>1.0.0.45</FileVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.1">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
+8
-8
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
<Version>1.0.0.43</Version>
|
<Version>1.0.0.45</Version>
|
||||||
<PackageId>YY.EventLogExportAssistant.SQLServer</PackageId>
|
<PackageId>YY.EventLogExportAssistant.SQLServer</PackageId>
|
||||||
<Authors>Permitin Yuriy</Authors>
|
<Authors>Permitin Yuriy</Authors>
|
||||||
<Company />
|
<Company />
|
||||||
@@ -15,21 +15,21 @@
|
|||||||
<RepositoryUrl>https://github.com/YPermitin/YY.EventLogExportAssistant</RepositoryUrl>
|
<RepositoryUrl>https://github.com/YPermitin/YY.EventLogExportAssistant</RepositoryUrl>
|
||||||
<RepositoryType>GIT</RepositoryType>
|
<RepositoryType>GIT</RepositoryType>
|
||||||
<PackageTags>event, log, 1C, enterprise, export, sqlserver</PackageTags>
|
<PackageTags>event, log, 1C, enterprise, export, sqlserver</PackageTags>
|
||||||
<AssemblyVersion>1.0.0.43</AssemblyVersion>
|
<AssemblyVersion>1.0.0.45</AssemblyVersion>
|
||||||
<FileVersion>1.0.0.43</FileVersion>
|
<FileVersion>1.0.0.45</FileVersion>
|
||||||
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="EFCore.BulkExtensions" Version="3.2.7" />
|
<PackageReference Include="EFCore.BulkExtensions" Version="3.2.7" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.1">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
wget https://repo.mysql.com/mysql-apt-config_0.8.16-1_all.deb
|
||||||
|
sudo dpkg -i mysql-apt-config_0.8.16-1_all.deb
|
||||||
|
sudo apt-get update -q
|
||||||
|
sudo apt-get install -q -y --allow-unauthenticated -o Dpkg::Options::=--force-confnew mysql-server
|
||||||
|
sudo systemctl restart mysql
|
||||||
|
sudo mysql_upgrade
|
||||||
|
mysql --version
|
||||||
|
sleep 30
|
||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
||||||
|
|||||||
@@ -81,7 +81,9 @@ namespace YY.EventLogExportAssistant.ClickHouse.Tests
|
|||||||
using (var cmdReader = cmd.ExecuteReader())
|
using (var cmdReader = cmd.ExecuteReader())
|
||||||
{
|
{
|
||||||
if (cmdReader.Read())
|
if (cmdReader.Read())
|
||||||
rowsInDB = cmdReader.GetInt64(0);
|
{
|
||||||
|
rowsInDB = Convert.ToInt64(cmdReader.GetValue(0));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
rowsInDB = 0;
|
rowsInDB = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ namespace YY.EventLogExportAssistant.MySQL.Tests
|
|||||||
string configFilePath = "appsettings.json";
|
string configFilePath = "appsettings.json";
|
||||||
if (!File.Exists(configFilePath))
|
if (!File.Exists(configFilePath))
|
||||||
{
|
{
|
||||||
configFilePath = "travisci-appsettings.json";
|
configFilePath = "githubactions-appsettings.json";
|
||||||
IConfiguration Configuration = new ConfigurationBuilder()
|
IConfiguration Configuration = new ConfigurationBuilder()
|
||||||
.AddJsonFile(configFilePath, optional: true, reloadOnChange: true)
|
.AddJsonFile(configFilePath, optional: true, reloadOnChange: true)
|
||||||
.Build();
|
.Build();
|
||||||
|
|||||||
+1
-1
@@ -41,7 +41,7 @@
|
|||||||
<None Update="TestData\LGFFormat\20200516230000.lgp">
|
<None Update="TestData\LGFFormat\20200516230000.lgp">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
<None Update="travisci-appsettings.json">
|
<None Update="githubactions-appsettings.json">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"EventLogDatabase": "server=127.0.0.1;database=EventLogExportTest;user=root;password="
|
"EventLogDatabase": "server=127.0.0.1;database=EventLogExportTest;user=root;password=Password12!"
|
||||||
},
|
},
|
||||||
"LGF": {
|
"LGF": {
|
||||||
"InformationSystem": {
|
"InformationSystem": {
|
||||||
+1
-1
@@ -7,7 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{AF6C
|
|||||||
Scripts\appveyor-runTests.ps1 = Scripts\appveyor-runTests.ps1
|
Scripts\appveyor-runTests.ps1 = Scripts\appveyor-runTests.ps1
|
||||||
Scripts\deploy.sh = Scripts\deploy.sh
|
Scripts\deploy.sh = Scripts\deploy.sh
|
||||||
Scripts\install-clickhouse.sh = Scripts\install-clickhouse.sh
|
Scripts\install-clickhouse.sh = Scripts\install-clickhouse.sh
|
||||||
|
Scripts\install-mysql.sh = Scripts\install-mysql.sh
|
||||||
Scripts\MySQL. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\MySQL. Скрипт создания базы для хранения данных журнала регистрации.sql
|
Scripts\MySQL. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\MySQL. Скрипт создания базы для хранения данных журнала регистрации.sql
|
||||||
Scripts\PostgreSQL. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\PostgreSQL. Скрипт создания базы для хранения данных журнала регистрации.sql
|
Scripts\PostgreSQL. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\PostgreSQL. Скрипт создания базы для хранения данных журнала регистрации.sql
|
||||||
Scripts\SQL Server. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\SQL Server. Скрипт создания базы для хранения данных журнала регистрации.sql
|
Scripts\SQL Server. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\SQL Server. Скрипт создания базы для хранения данных журнала регистрации.sql
|
||||||
|
|||||||
Reference in New Issue
Block a user