Skip to content

Commit 70e35c7

Browse files
ipax77ipax77
authored
Merge pull request #6 from ipax77/dev
v2.0.1
2 parents dffec98 + 5a0dd2d commit 70e35c7

File tree

8 files changed

+124
-122
lines changed

8 files changed

+124
-122
lines changed

‎pax.XRechnung.NET.sln‎

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4687D5C0-C47D-44C5-B3E8-E763EFA0004C}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pax.XRechnung.NET", "src\pax.XRechnung.NET\pax.XRechnung.NET.csproj", "{2E6F8ACB-B663-4253-ABD1-4580B7A18977}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pax.XRechnung.NET", "src\pax.XRechnung.NET\pax.XRechnung.NET.csproj", "{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pax.XRechnung.NET.tests", "src\pax.XRechnung.NET.tests\pax.XRechnung.NET.tests.csproj", "{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pax.XRechnung.NET.Validator", "src\pax.XRechnung.NET.Validator\pax.XRechnung.NET.Validator.csproj", "{5EAC3760-0558-489E-B9CF-77D7311FBA96}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pax.XRechnung.NET.tests", "src\pax.XRechnung.NET.tests\pax.XRechnung.NET.tests.csproj", "{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}"
1311
EndProject
1412
Global
1513
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,49 +19,36 @@ Global
2119
Release|x86 = Release|x86
2220
EndGlobalSection
2321
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Debug|x64.ActiveCfg = Debug|Any CPU
27-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Debug|x64.Build.0 = Debug|Any CPU
28-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Debug|x86.ActiveCfg = Debug|Any CPU
29-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Debug|x86.Build.0 = Debug|Any CPU
30-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Release|x64.ActiveCfg = Release|Any CPU
33-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Release|x64.Build.0 = Release|Any CPU
34-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Release|x86.ActiveCfg = Release|Any CPU
35-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977}.Release|x86.Build.0 = Release|Any CPU
36-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Debug|x64.ActiveCfg = Debug|Any CPU
39-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Debug|x64.Build.0 = Debug|Any CPU
40-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Debug|x86.ActiveCfg = Debug|Any CPU
41-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Debug|x86.Build.0 = Debug|Any CPU
42-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Release|x64.ActiveCfg = Release|Any CPU
45-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Release|x64.Build.0 = Release|Any CPU
46-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Release|x86.ActiveCfg = Release|Any CPU
47-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D}.Release|x86.Build.0 = Release|Any CPU
48-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Debug|x64.ActiveCfg = Debug|Any CPU
51-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Debug|x64.Build.0 = Debug|Any CPU
52-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Debug|x86.ActiveCfg = Debug|Any CPU
53-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Debug|x86.Build.0 = Debug|Any CPU
54-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Release|Any CPU.ActiveCfg = Release|Any CPU
55-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Release|Any CPU.Build.0 = Release|Any CPU
56-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Release|x64.ActiveCfg = Release|Any CPU
57-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Release|x64.Build.0 = Release|Any CPU
58-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Release|x86.ActiveCfg = Release|Any CPU
59-
{5EAC3760-0558-489E-B9CF-77D7311FBA96}.Release|x86.Build.0 = Release|Any CPU
22+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Debug|x64.ActiveCfg = Debug|Any CPU
25+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Debug|x64.Build.0 = Debug|Any CPU
26+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Debug|x86.ActiveCfg = Debug|Any CPU
27+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Debug|x86.Build.0 = Debug|Any CPU
28+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Release|x64.ActiveCfg = Release|Any CPU
31+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Release|x64.Build.0 = Release|Any CPU
32+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Release|x86.ActiveCfg = Release|Any CPU
33+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B}.Release|x86.Build.0 = Release|Any CPU
34+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Debug|x64.ActiveCfg = Debug|Any CPU
37+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Debug|x64.Build.0 = Debug|Any CPU
38+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Debug|x86.ActiveCfg = Debug|Any CPU
39+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Debug|x86.Build.0 = Debug|Any CPU
40+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Release|x64.ActiveCfg = Release|Any CPU
43+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Release|x64.Build.0 = Release|Any CPU
44+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Release|x86.ActiveCfg = Release|Any CPU
45+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C}.Release|x86.Build.0 = Release|Any CPU
6046
EndGlobalSection
6147
GlobalSection(SolutionProperties) = preSolution
6248
HideSolutionNode = FALSE
6349
EndGlobalSection
6450
GlobalSection(NestedProjects) = preSolution
65-
{2E6F8ACB-B663-4253-ABD1-4580B7A18977} = {4687D5C0-C47D-44C5-B3E8-E763EFA0004C}
66-
{8F65A857-60D4-4BAB-AC43-03AAA2B9A43D} = {4687D5C0-C47D-44C5-B3E8-E763EFA0004C}
67-
{5EAC3760-0558-489E-B9CF-77D7311FBA96} = {4687D5C0-C47D-44C5-B3E8-E763EFA0004C}
51+
{4B8EC7A9-EA5E-4521-8535-4869BE5B916B} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
52+
{9C3FBA3C-187C-4E4A-AD1D-C166D377D01C} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
6853
EndGlobalSection
6954
EndGlobal

‎src/pax.XRechnung.NET.Validator/SchematronValidationResult.cs‎

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

‎src/pax.XRechnung.NET.Validator/pax.XRechnung.NET.Validator.csproj‎

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

src/pax.XRechnung.NET.Validator/HtmlTable.cs renamed to src/pax.XRechnung.NET/KositValidator/HtmlTable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace pax.XRechnung.NET.Validator;
1+
namespace pax.XRechnung.NET.KostiValidator;
22

33
internal sealed record HtmlTable
44
{

src/pax.XRechnung.NET.Validator/KositValidator.cs renamed to src/pax.XRechnung.NET/KositValidator/KositValidator.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
using System.Text;
44
using HtmlAgilityPack;
55

6-
namespace pax.XRechnung.NET.Validator;
6+
namespace pax.XRechnung.NET.KostiValidator;
77

8+
/// <summary>
9+
/// KositValidator
10+
/// </summary>
811
public static class KositValidator
912
{
1013
private const string validatorUri = "http://localhost:8080";
@@ -29,8 +32,8 @@ public static async Task<SchematronValidationResult> Validate(string xmlText, Ur
2932
using var content = new StringContent(xmlText, Encoding.UTF8, "application/xml");
3033
content.Headers.ContentType = new MediaTypeHeaderValue("application/xml");
3134

32-
var response = await client.PostAsync(null as Uri, content);
33-
var result = await response.Content.ReadAsStringAsync();
35+
var response = await client.PostAsync(null as Uri, content).ConfigureAwait(false);
36+
var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
3437
ArgumentNullException.ThrowIfNull(result);
3538
var tables = ParseValidatorResponse(result);
3639
return ToValidationResult(tables);

‎src/pax.XRechnung.NET/KositValidator/SchematronValidationResult.cs‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
using System.Net;
2+
3+
namespace pax.XRechnung.NET.KostiValidator;
4+
5+
/// <summary>
6+
/// Schematron Validation Result
7+
/// </summary>
8+
public class SchematronValidationResult
9+
{
10+
/// <summary>
11+
/// HttpStatusCode
12+
/// </summary>
13+
public HttpStatusCode HttpStatusCode { get; init; }
14+
/// <summary>
15+
/// Validation Steps
16+
/// </summary>
17+
public List<ValidationStep> Steps { get; init; } = [];
18+
/// <summary>
19+
/// Validation Messages
20+
/// </summary>
21+
public List<ValidationMessage> Messages { get; init; } = [];
22+
/// <summary>
23+
/// Error
24+
/// </summary>
25+
public string? Error { get; set; }
26+
/// <summary>
27+
/// Validation is valid
28+
/// </summary>
29+
public bool IsValid { get; set; }
30+
}
31+
32+
/// <summary>
33+
/// Validation Step
34+
/// </summary>
35+
public class ValidationStep
36+
{
37+
/// <summary>
38+
/// Step information
39+
/// </summary>
40+
public string Step { get; set; } = string.Empty;
41+
/// <summary>
42+
/// Errros
43+
/// </summary>
44+
public int Errors { get; set; }
45+
/// <summary>
46+
/// Warnings
47+
/// </summary>
48+
public int Warnings { get; set; }
49+
/// <summary>
50+
/// Infos
51+
/// </summary>
52+
public int Infos { get; set; }
53+
}
54+
55+
/// <summary>
56+
/// Validation Message
57+
/// </summary>
58+
public class ValidationMessage
59+
{
60+
/// <summary>
61+
/// Position
62+
/// </summary>
63+
public string Position { get; set; } = string.Empty;
64+
/// <summary>
65+
/// Code
66+
/// </summary>
67+
public string Code { get; set; } = string.Empty;
68+
/// <summary>
69+
/// Severity
70+
/// </summary>
71+
public string Severity { get; set; } = string.Empty;
72+
/// <summary>
73+
/// Text
74+
/// </summary>
75+
public string Text { get; set; } = string.Empty;
76+
/// <summary>
77+
/// Path
78+
/// </summary>
79+
public string Path { get; set; } = string.Empty;
80+
}

‎src/pax.XRechnung.NET/XmlInvoiceVlidator.Schematron.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
using System.Xml.Schema;
3-
using pax.XRechnung.NET.Validator;
3+
using pax.XRechnung.NET.KostiValidator;
44
using pax.XRechnung.NET.XmlModels;
55

66
namespace pax.XRechnung.NET;

‎src/pax.XRechnung.NET/pax.XRechnung.NET.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<PackageReadmeFile>README.md</PackageReadmeFile>
1010
<RepositoryUrl>https://github.com/ipax77/pax.XRechnung.NET</RepositoryUrl>
1111
<PackageTags>dotnet;XRechnung;import;export;validate</PackageTags>
12-
<AssemblyVersion>0.2.0</AssemblyVersion>
12+
<AssemblyVersion>0.2.1</AssemblyVersion>
1313
<Owners>Philipp Hetzner</Owners>
1414
<Authors>Philipp Hetzner</Authors>
15-
<Version>0.2.0</Version>
16-
<FileVersion>0.2.0.0</FileVersion>
17-
<PackageVersion>0.2.0</PackageVersion>
15+
<Version>0.2.1</Version>
16+
<FileVersion>0.2.1.0</FileVersion>
17+
<PackageVersion>0.2.1</PackageVersion>
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
2020
<EnableNETAnalyzers>true</EnableNETAnalyzers>
@@ -95,14 +95,15 @@
9595
<EmbeddedResource Include="Resources/Schematrons/PEPPOL-EN16931-UBL.sch" />
9696
</ItemGroup>
9797

98-
<ItemGroup>
98+
<ItemGroup>
9999
<None Include="..\..\README.md">
100100
<Pack>True</Pack>
101101
<PackagePath>.</PackagePath>
102102
</None>
103103
</ItemGroup>
104104

105105
<ItemGroup>
106-
<ProjectReference Include="..\pax.XRechnung.NET.Validator\pax.XRechnung.NET.Validator.csproj" />
106+
<PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
107+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
107108
</ItemGroup>
108109
</Project>

0 commit comments

Comments
 (0)