Skip to content

Commit f786477

Browse files
HaikAsatryanHaikAsatryan
authored
Merge pull request #58 from PandaTechAM/development
cleanup
2 parents e7f0f15 + a0709a6 commit f786477

File tree

19 files changed

+261
-518
lines changed

19 files changed

+261
-518
lines changed

‎src/FileExporter/FileExporter.csproj‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,15 @@
88
<Copyright>MIT</Copyright>
99
<PackageIcon>Logo.jpg</PackageIcon>
1010
<PackageReadmeFile>Readme.md</PackageReadmeFile>
11-
<Version>4.0.2</Version>
11+
<Version>4.0.3</Version>
1212
<Company>PandaTech</Company>
13-
<Title>Db models to files Exporter</Title>
14-
<RepositoryType>lib</RepositoryType>
13+
<Title>Model to File</Title>
1514
<PackageTags>Pandatech, lib, export, xlsx, csv, pdf</PackageTags>
1615
<Description>Export table data into xls, xlsx, csv, pdf formats</Description>
1716
<RepositoryUrl>https://github.com/PandaTechAM/be-lib-file-exporter</RepositoryUrl>
18-
<PackageReleaseNotes>Fonts include fix</PackageReleaseNotes>
17+
<PackageReleaseNotes>Cleanup</PackageReleaseNotes>
1918
</PropertyGroup>
2019

21-
<ItemGroup>
22-
<None Remove="Fonts\arial.ttf"/>
23-
<None Remove="Fonts\arialbd.ttf"/>
24-
<None Remove="Fonts\ariali.ttf"/>
25-
<None Remove="mime_types.json"/>
26-
</ItemGroup>
27-
2820
<ItemGroup>
2921
<EmbeddedResource Include="Fonts\arial.ttf">
3022
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -47,8 +39,7 @@
4739

4840
<ItemGroup>
4941
<PackageReference Include="ClosedXML" Version="0.104.2" />
50-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
51-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
52-
<PackageReference Include="PdfSharpCore" Version="1.3.65" />
42+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
43+
<PackageReference Include="PdfSharpCore" Version="1.3.67" />
5344
</ItemGroup>
5445
</Project>

‎test/FileExporter.Demo/Context/ApiDbContext.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎test/FileExporter.Demo/Controllers/FileExporterController.cs‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎test/FileExporter.Demo/ExportRules/DummyExportRule.cs‎

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,41 @@ namespace FileExporter.Demo.ExportRules;
55

66
public class DummyExportRule : ExportRule<DummyTable>
77
{
8-
public DummyExportRule()
9-
{
10-
GenerateRules();
8+
public DummyExportRule()
9+
{
10+
GenerateRules();
1111

12-
RuleFor(x => x.RelatedId).WriteToColumn("Related Id");
13-
RuleFor(x => x.Name).WriteToColumn("Custom Name - No Description").WithDefaultValue("TEST");
14-
RuleFor(x => x.CreationDate).WriteToColumn("Created At");
15-
RuleFor(x => x.ExpirationDate).WriteToColumn("Expires At");
12+
RuleFor(x => x.RelatedId)
13+
.WriteToColumn("Related Id");
14+
RuleFor(x => x.Name)
15+
.WriteToColumn("Custom Name - No Description")
16+
.WithDefaultValue("TEST");
17+
RuleFor(x => x.CreationDate)
18+
.WriteToColumn("Created At");
19+
RuleFor(x => x.ExpirationDate)
20+
.WriteToColumn("Expires At");
1621

17-
RuleFor(x => x.DTO).WriteToColumn("Dto").WithDefaultValue("Default value");
18-
}
19-
20-
public DummyExportRule(string fileName) : base(fileName)
21-
{
22-
GenerateRules();
22+
RuleFor(x => x.DTO)
23+
.WriteToColumn("Dto")
24+
.WithDefaultValue("Default value");
25+
}
2326

24-
RuleFor(x => x.RelatedId).WriteToColumn("Related Id");
25-
RuleFor(x => x.Name).WriteToColumn("Custom Name - No Description").WithDefaultValue("TEST");
26-
RuleFor(x => x.CreationDate).WriteToColumn("Created At");
27-
RuleFor(x => x.ExpirationDate).WriteToColumn("Expires At");
27+
public DummyExportRule(string fileName) : base(fileName)
28+
{
29+
GenerateRules();
2830

29-
RuleFor(x => x.DTO).WriteToColumn("Dto").WithDefaultValue("Default value");
30-
}
31+
RuleFor(x => x.RelatedId)
32+
.WriteToColumn("Related Id");
33+
RuleFor(x => x.Name)
34+
.WriteToColumn("Custom Name - No Description")
35+
.WithDefaultValue("TEST");
36+
RuleFor(x => x.CreationDate)
37+
.WriteToColumn("Created At");
38+
RuleFor(x => x.ExpirationDate)
39+
.WriteToColumn("Expires At");
40+
41+
RuleFor(x => x.DTO)
42+
.WriteToColumn("Dto")
43+
.WithDefaultValue("Default value");
44+
}
3145
}

‎test/FileExporter.Demo/FileExporter.Demo.csproj‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
</PackageReference>
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
21-
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
22-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4"/>
11+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1"/>
12+
</ItemGroup>
2313

24-
<ItemGroup>
25-
<ProjectReference Include="..\..\src\FileExporter\FileExporter.csproj" />
26-
</ItemGroup>
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\src\FileExporter\FileExporter.csproj"/>
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Folder Include="Controllers\"/>
20+
</ItemGroup>
2721

2822
</Project>

‎test/FileExporter.Demo/Migrations/20230607202101_initial.Designer.cs‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎test/FileExporter.Demo/Migrations/20230607202101_initial.cs‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)