IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/backup.core

Browse Source
This commit is contained in:
Anton Suhorukov 2021-08-31 13:55:47 +03:00
commit a812971c07
17 changed files with 13 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.nuget/packages/WebSocketSharpNetStandart.1.0.3-rc11.nupkg
View File

Binary file not shown.

BIN
.nuget/packages/WebSocketSharpNetStandart.1.0.3-rc12.nupkg Normal file
View File

Binary file not shown.

2
common/ASC.Core.Common/Data/DbQuotaService.cs
View File

@ -79,7 +79,6 @@ namespace ASC.Core.Data
MaxFileSize = GetInBytes(r.MaxFileSize), MaxFileSize = GetInBytes(r.MaxFileSize),
MaxTotalSize = GetInBytes(r.MaxTotalSize), MaxTotalSize = GetInBytes(r.MaxTotalSize),
Price = r.Price, Price = r.Price,
Price2 = r.Price2,
Visible = r.Visible Visible = r.Visible
}; };
@ -127,7 +126,6 @@ namespace ASC.Core.Data
ActiveUsers = quota.ActiveUsers, ActiveUsers = quota.ActiveUsers,
Features = quota.Features, Features = quota.Features,
Price = quota.Price, Price = quota.Price,
Price2 = quota.Price2,
AvangateId = quota.AvangateId, AvangateId = quota.AvangateId,
Visible = quota.Visible Visible = quota.Visible
}; };

12
common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
View File

@ -14,7 +14,6 @@ namespace ASC.Core.Common.EF
public int ActiveUsers { get; set; } public int ActiveUsers { get; set; }
public string Features { get; set; } public string Features { get; set; }
public decimal Price { get; set; } public decimal Price { get; set; }
public decimal Price2 { get; set; }
public string AvangateId { get; set; } public string AvangateId { get; set; }
public bool Visible { get; set; } public bool Visible { get; set; }
public override object[] GetKeys() public override object[] GetKeys()
@ -30,7 +29,7 @@ namespace ASC.Core.Common.EF
.Add(MySqlAddDbQuota, Provider.MySql) .Add(MySqlAddDbQuota, Provider.MySql)
.Add(PgSqlAddDbQuota, Provider.Postgre) .Add(PgSqlAddDbQuota, Provider.Postgre)
.HasData( .HasData(
new DbQuota { Tenant = -1, Name = "default", Description = null, MaxFileSize = 102400, MaxTotalSize = 10995116277760, ActiveUsers = 10000, Features = "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", Price = decimal.Parse("0,00"), Price2 = decimal.Parse("0,00"), AvangateId = "0", Visible = false } new DbQuota { Tenant = -1, Name = "default", Description = null, MaxFileSize = 102400, MaxTotalSize = 10995116277760, ActiveUsers = 10000, Features = "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", Price = decimal.Parse("0,00"), AvangateId = "0", Visible = false }
); );
return modelBuilder; return modelBuilder;
@ -81,10 +80,6 @@ namespace ASC.Core.Common.EF
.HasColumnName("price") .HasColumnName("price")
.HasColumnType("decimal(10,2)"); .HasColumnType("decimal(10,2)");
entity.Property(e => e.Price2)
.HasColumnName("price2")
.HasColumnType("decimal(10,2)");
entity.Property(e => e.Visible).HasColumnName("visible"); entity.Property(e => e.Visible).HasColumnName("visible");
}); });
} }
@ -131,11 +126,6 @@ namespace ASC.Core.Common.EF
.HasColumnType("numeric(10,2)") .HasColumnType("numeric(10,2)")
.HasDefaultValueSql("0.00"); .HasDefaultValueSql("0.00");
entity.Property(e => e.Price2)
.HasColumnName("price2")
.HasColumnType("numeric(10,2)")
.HasDefaultValueSql("0.00");
entity.Property(e => e.Visible).HasColumnName("visible"); entity.Property(e => e.Visible).HasColumnName("visible");
}); });
} }

5
common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs generated
View File

@ -657,10 +657,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
.HasColumnType("decimal(10,2)") .HasColumnType("decimal(10,2)")
.HasColumnName("price"); .HasColumnName("price");
b.Property<decimal>("Price2")
.HasColumnType("decimal(10,2)")
.HasColumnName("price2");
b.Property<bool>("Visible") b.Property<bool>("Visible")
.HasColumnType("tinyint(1)") .HasColumnType("tinyint(1)")
.HasColumnName("visible"); .HasColumnName("visible");
@ -681,7 +677,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
MaxTotalSize = 10995116277760L, MaxTotalSize = 10995116277760L,
Name = "default", Name = "default",
Price = 0.00m, Price = 0.00m,
Price2 = 0.00m,
Visible = false Visible = false
}); });
}); });

5
common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
View File

@ -58,7 +58,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
features = table.Column<string>(type: "text", nullable: true, collation: "utf8_general_ci") features = table.Column<string>(type: "text", nullable: true, collation: "utf8_general_ci")
.Annotation("MySql:CharSet", "utf8"), .Annotation("MySql:CharSet", "utf8"),
price = table.Column<decimal>(type: "decimal(10,2)", nullable: false), price = table.Column<decimal>(type: "decimal(10,2)", nullable: false),
price2 = table.Column<decimal>(type: "decimal(10,2)", nullable: false),
avangate_id = table.Column<string>(type: "varchar(128)", nullable: true, collation: "utf8_general_ci") avangate_id = table.Column<string>(type: "varchar(128)", nullable: true, collation: "utf8_general_ci")
.Annotation("MySql:CharSet", "utf8"), .Annotation("MySql:CharSet", "utf8"),
visible = table.Column<bool>(type: "tinyint(1)", nullable: false) visible = table.Column<bool>(type: "tinyint(1)", nullable: false)
@ -181,8 +180,8 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
migrationBuilder.InsertData( migrationBuilder.InsertData(
table: "tenants_quota", table: "tenants_quota",
columns: new[] { "tenant", "active_users", "avangate_id", "description", "features", "max_file_size", "max_total_size", "name", "price", "price2", "visible" }, columns: new[] { "tenant", "active_users", "avangate_id", "description", "features", "max_file_size", "max_total_size", "name", "price", "visible" },
values: new object[] { -1, 10000, "0", null, "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", 102400L, 10995116277760L, "default", 0.00m, 0.00m, false }); values: new object[] { -1, 10000, "0", null, "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", 102400L, 10995116277760L, "default", 0.00m, false });
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "last_modified", name: "last_modified",

5
common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
View File

@ -655,10 +655,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
.HasColumnType("decimal(10,2)") .HasColumnType("decimal(10,2)")
.HasColumnName("price"); .HasColumnName("price");
b.Property<decimal>("Price2")
.HasColumnType("decimal(10,2)")
.HasColumnName("price2");
b.Property<bool>("Visible") b.Property<bool>("Visible")
.HasColumnType("tinyint(1)") .HasColumnType("tinyint(1)")
.HasColumnName("visible"); .HasColumnName("visible");
@ -679,7 +675,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
MaxTotalSize = 10995116277760L, MaxTotalSize = 10995116277760L,
Name = "default", Name = "default",
Price = 0.00m, Price = 0.00m,
Price2 = 0.00m,
Visible = false Visible = false
}); });
}); });

6
common/ASC.Core.Common/Migrations/Npgsql/CoreDbContextNpgsql/20200929123316_CoreDbContextNpgsql.Designer.cs generated
View File

@ -652,12 +652,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
.HasColumnType("numeric(10,2)") .HasColumnType("numeric(10,2)")
.HasDefaultValueSql("0.00"); .HasDefaultValueSql("0.00");
b.Property<decimal>("Price2")
.ValueGeneratedOnAdd()
.HasColumnName("price2")
.HasColumnType("numeric(10,2)")
.HasDefaultValueSql("0.00");
b.Property<bool>("Visible") b.Property<bool>("Visible")
.HasColumnName("visible") .HasColumnName("visible")
.HasColumnType("boolean"); .HasColumnType("boolean");

1
common/ASC.Core.Common/Migrations/Npgsql/CoreDbContextNpgsql/20200929123316_CoreDbContextNpgsql.cs
View File

@ -56,7 +56,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
active_users = table.Column<int>(nullable: false), active_users = table.Column<int>(nullable: false),
features = table.Column<string>(nullable: true), features = table.Column<string>(nullable: true),
price = table.Column<decimal>(type: "numeric(10,2)", nullable: false, defaultValueSql: "0.00"), price = table.Column<decimal>(type: "numeric(10,2)", nullable: false, defaultValueSql: "0.00"),
price2 = table.Column<decimal>(type: "numeric(10,2)", nullable: false, defaultValueSql: "0.00"),
avangate_id = table.Column<string>(maxLength: 128, nullable: true, defaultValueSql: "NULL"), avangate_id = table.Column<string>(maxLength: 128, nullable: true, defaultValueSql: "NULL"),
visible = table.Column<bool>(nullable: false) visible = table.Column<bool>(nullable: false)
}, },

7
common/ASC.Core.Common/Migrations/Npgsql/CoreDbContextNpgsql/CoreDbContextModelSnapshot.cs
View File

@ -650,12 +650,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
.HasColumnType("numeric(10,2)") .HasColumnType("numeric(10,2)")
.HasDefaultValueSql("0.00"); .HasDefaultValueSql("0.00");
b.Property<decimal>("Price2")
.ValueGeneratedOnAdd()
.HasColumnName("price2")
.HasColumnType("numeric(10,2)")
.HasDefaultValueSql("0.00");
b.Property<bool>("Visible") b.Property<bool>("Visible")
.HasColumnName("visible") .HasColumnName("visible")
.HasColumnType("boolean"); .HasColumnType("boolean");
@ -676,7 +670,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
MaxTotalSize = 10995116277760L, MaxTotalSize = 10995116277760L,
Name = "default", Name = "default",
Price = 0.00m, Price = 0.00m,
Price2 = 0.00m,
Visible = false Visible = false
}); });
}); });

2
common/ASC.Core.Common/Tenants/TenantQuota.cs
View File

@ -55,8 +55,6 @@ namespace ASC.Core.Tenants
public decimal Price { get; set; } public decimal Price { get; set; }
public decimal Price2 { get; set; }
public string AvangateId { get; set; } public string AvangateId { get; set; }
public bool Visible { get; set; } public bool Visible { get; set; }

1
common/ASC.Data.Encryption/ASC.Data.Encryption.csproj
View File

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
common/ASC.Data.Storage/ASC.Data.Storage.csproj
View File

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

6
common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
View File

@ -5,13 +5,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" /> <PackageReference Include="NUnit" Version="3.12.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="nunit.framework"> <ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
<HintPath>..\..\..\..\..\Program Files (x86)\Microsoft\Xamarin\NuGet\nunit\3.12.0\lib\netstandard2.0\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
</Project> </Project>

10
common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
View File

@ -4,15 +4,13 @@
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" /> <ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
<ProjectReference Include="..\..\ASC.Notify.Textile\ASC.Notify.Textile.csproj" /> <ProjectReference Include="..\..\ASC.Notify.Textile\ASC.Notify.Textile.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\..\..\..\Program Files (x86)\Microsoft\Xamarin\NuGet\nunit\3.12.0\lib\netstandard2.0\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>

2
common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
View File

@ -21,7 +21,7 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
<PackageReference Include="WebSocketSharpNetStandart" Version="1.0.3-rc11" /> <PackageReference Include="WebSocketSharpNetStandart" Version="1.0.3-rc12" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
thirdparty/websocket-sharp-master/websocket-sharp/websocket-sharp.csproj vendored
View File

@ -24,7 +24,7 @@
<PackageProjectUrl>http://sta.github.io/websocket-sharp</PackageProjectUrl> <PackageProjectUrl>http://sta.github.io/websocket-sharp</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.0.3-rc11</Version> <Version>1.0.3-rc12</Version>
<AssemblyVersion>1.0.2.59611</AssemblyVersion> <AssemblyVersion>1.0.2.59611</AssemblyVersion>
<FileVersion>1.0.2.59611</FileVersion> <FileVersion>1.0.2.59611</FileVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>