Merge pull request #9 from ipax77/dotnet10

ipax77 · web-flow · commit 3ad7c6bf9cd4 · 2025-11-17T10:19:36.000+01:00
update to dotnet 10
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/README.md b/README.md
@@ -121,7 +121,13 @@ Server start:
 
 # ChangeLog
 
-<details open="open"><summary>v0.3.1</summary>
+<details open="open"><summary>v0.3.2</summary>
+
+>- Update to dotnet 10
+
+</details>
+
+<details><summary>v0.3.1</summary>
 
 >- **Breaking Changes**
 >- Code Lists fix to receive meta information
diff --git a/src/pax.XRechnung.NET.tests/AnnotationDtoTests.cs b/src/pax.XRechnung.NET.tests/AnnotationDtoTests.cs
@@ -86,7 +86,7 @@ public void FromXml_MapsCorrectlyToDto()
         Assert.AreEqual(xml.Id.Content, dto.Id);
         Assert.AreEqual(xml.DocumentCurrencyCode, dto.DocumentCurrencyCode);
         Assert.AreEqual(xml.SellerParty.Party.PartyName.Name, dto.SellerParty.Name);
-        Assert.AreEqual(xml.InvoiceLines.Count, dto.InvoiceLines.Count);
+        Assert.HasCount(xml.InvoiceLines.Count, dto.InvoiceLines);
     }
 
     [TestMethod]
@@ -99,7 +99,7 @@ public void Roundtrip_ProducesEquivalentXml()
         var roundtripXml = mapper.ToXml(dto);
 
         Assert.AreEqual(original.Id.Content, roundtripXml.Id.Content);
-        Assert.AreEqual(original.InvoiceLines.Count, roundtripXml.InvoiceLines.Count);
+        Assert.HasCount(original.InvoiceLines.Count, roundtripXml.InvoiceLines);
         Assert.AreEqual(original.SellerParty.Party.PartyName.Name, roundtripXml.SellerParty.Party.PartyName.Name);
     }
 
diff --git a/src/pax.XRechnung.NET.tests/BaseDtoTests.cs b/src/pax.XRechnung.NET.tests/BaseDtoTests.cs
@@ -84,7 +84,7 @@ public void FromXml_MapsCorrectlyToDto()
         Assert.AreEqual(xml.Id.Content, dto.Id);
         Assert.AreEqual(xml.DocumentCurrencyCode, dto.DocumentCurrencyCode);
         Assert.AreEqual(xml.SellerParty.Party.PartyName.Name, dto.SellerParty.Name);
-        Assert.AreEqual(xml.InvoiceLines.Count, dto.InvoiceLines.Count);
+        Assert.HasCount(xml.InvoiceLines.Count, dto.InvoiceLines);
     }
 
     [TestMethod]
@@ -97,7 +97,7 @@ public void Roundtrip_ProducesEquivalentXml()
         var roundtripXml = mapper.ToXml(dto);
 
         Assert.AreEqual(original.Id.Content, roundtripXml.Id.Content);
-        Assert.AreEqual(original.InvoiceLines.Count, roundtripXml.InvoiceLines.Count);
+        Assert.HasCount(original.InvoiceLines.Count, roundtripXml.InvoiceLines);
         Assert.AreEqual(original.SellerParty.Party.PartyName.Name, roundtripXml.SellerParty.Party.PartyName.Name);
     }
 }
diff --git a/src/pax.XRechnung.NET.tests/CustomDtoTests.cs b/src/pax.XRechnung.NET.tests/CustomDtoTests.cs
@@ -85,7 +85,7 @@ public void FromXml_MapsCorrectlyToDto()
         Assert.AreEqual(xml.Id.Content, dto.Id);
         Assert.AreEqual(xml.DocumentCurrencyCode, dto.DocumentCurrencyCode);
         Assert.AreEqual(xml.SellerParty.Party.PartyName.Name, dto.SellerParty.Name);
-        Assert.AreEqual(xml.InvoiceLines.Count, dto.InvoiceLines.Count);
+        Assert.HasCount(xml.InvoiceLines.Count, dto.InvoiceLines);
     }
 
     [TestMethod]
@@ -98,7 +98,7 @@ public void Roundtrip_ProducesEquivalentXml()
         var roundtripXml = mapper.ToXml(dto);
 
         Assert.AreEqual(original.Id.Content, roundtripXml.Id.Content);
-        Assert.AreEqual(original.InvoiceLines.Count, roundtripXml.InvoiceLines.Count);
+        Assert.HasCount(original.InvoiceLines.Count, roundtripXml.InvoiceLines);
         Assert.AreEqual(original.SellerParty.Party.PartyName.Name, roundtripXml.SellerParty.Party.PartyName.Name);
     }
 
@@ -117,7 +117,7 @@ public void CanAddLine()
         var mapper = new MyCustomInvoiceMapper();
         var xmlInvoice = mapper.ToXml(invoiceAnnDto);
 
-        Assert.AreEqual(2, xmlInvoice.InvoiceLines.Count);
+        Assert.HasCount(2, xmlInvoice.InvoiceLines);
 
         var result = XmlInvoiceValidator.Validate(xmlInvoice);
         Assert.IsTrue(result.IsValid);
diff --git a/src/pax.XRechnung.NET.tests/DeSerializationTests.cs b/src/pax.XRechnung.NET.tests/DeSerializationTests.cs
@@ -11,7 +11,7 @@ namespace pax.XRechnung.NET.tests;
 [TestClass]
 public sealed class DeSerializationTests
 {
-    [DataTestMethod]
+    [TestMethod]
     [DataRow("02.01a-INVOICE_ubl.xml")]
     [DataRow("02.02a-INVOICE_ubl.xml")]
     [DataRow("02.03a-INVOICE_ubl.xml")]
diff --git a/src/pax.XRechnung.NET.tests/SchematronValidationTests.cs b/src/pax.XRechnung.NET.tests/SchematronValidationTests.cs
@@ -200,7 +200,7 @@ public async Task CanProduceValidXmlInvoice()
 
         var result = await XmlInvoiceValidator.ValidateSchematron(xmlInvoice);
         var resultText = string.Join(Environment.NewLine, result.Validations.Select(s => $"{s.Severity}:\t{s.Message}"));
-        Assert.IsTrue(result.Validations.Count == 0, resultText);
+        Assert.IsEmpty(result.Validations, resultText);
         Assert.IsTrue(result.IsValid, resultText);
     }
 
@@ -233,7 +233,7 @@ public async Task CanValidateBaseDtoSchematronTest()
         XmlInvoice xmlInvoice = invoiceMapper.ToXml(invoiceBaseDto);
         var result = await XmlInvoiceValidator.ValidateSchematron(xmlInvoice);
         var resultText = string.Join(Environment.NewLine, result.Validations.Select(s => $"{s.Severity}:\t{s.Message}"));
-        Assert.IsTrue(result.Validations.Count == 0, resultText);
+        Assert.IsEmpty(result.Validations, resultText);
         Assert.IsTrue(result.IsValid, resultText);
     }
 
@@ -256,7 +256,7 @@ public async Task CanValidateBaseDtoSchematronWithRoundingTest()
         XmlInvoice xmlInvoice = invoiceMapper.ToXml(invoiceBaseDto);
         var result = await XmlInvoiceValidator.ValidateSchematron(xmlInvoice);
         var resultText = string.Join(Environment.NewLine, result.Validations.Select(s => $"{s.Severity}:\t{s.Message}"));
-        Assert.IsTrue(result.Validations.Count == 0, resultText);
+        Assert.IsEmpty(result.Validations, resultText);
         Assert.IsTrue(result.IsValid, resultText);
     }
 
@@ -277,7 +277,7 @@ public async Task CanProduceValidInvoiceDto()
 
         var result = await XmlInvoiceValidator.ValidateSchematron(mappedXmlInvoice);
         var resultText = string.Join(Environment.NewLine, result.Validations.Select(s => $"{s.Severity}:\t{s.Message}"));
-        Assert.IsTrue(result.Validations.Count == 0, resultText);
+        Assert.IsEmpty(result.Validations, resultText);
         Assert.IsTrue(result.IsValid, resultText);
     }
 
@@ -294,7 +294,7 @@ public async Task CanValidateExtendedDto()
         var xmlInvoice = mapper.ToXml(invoiceExtendedDto);
         var result = await XmlInvoiceValidator.ValidateSchematron(xmlInvoice);
         var resultText = string.Join(Environment.NewLine, result.Validations.Select(s => $"{s.Severity}:\t{s.Message}"));
-        Assert.IsTrue(result.Validations.Count == 0, resultText);
+        Assert.IsEmpty(result.Validations, resultText);
         Assert.IsTrue(result.IsValid, resultText);
     }
 
@@ -315,7 +315,7 @@ public async Task CanProduceValidSmallBusinessXmlInvoice()
 
         var result = await XmlInvoiceValidator.ValidateSchematron(xmlInvoice);
         var resultText = string.Join(Environment.NewLine, result.Validations.Select(s => $"{s.Severity}:\t{s.Message}"));
-        Assert.IsTrue(result.Validations.Count == 0, resultText);
+        Assert.IsEmpty(result.Validations, resultText);
         Assert.IsTrue(result.IsValid, resultText);
     }
 }
diff --git a/src/pax.XRechnung.NET.tests/XmlInvoiceTests.cs b/src/pax.XRechnung.NET.tests/XmlInvoiceTests.cs
@@ -135,7 +135,7 @@ public void CanSerialize()
     {
         var invoice = GetTestInvoice();
         var xmlText = XmlInvoiceWriter.Serialize(invoice);
-        Assert.IsTrue(xmlText.Length > 0);
+        Assert.IsGreaterThan(0, xmlText.Length);
 
         // File.WriteAllText("/data/xrechnung/testinvoice2.xml", xmlText);
     }
diff --git a/src/pax.XRechnung.NET.tests/XmlValidationTests.cs b/src/pax.XRechnung.NET.tests/XmlValidationTests.cs
@@ -10,7 +10,7 @@ namespace pax.XRechnung.NET.tests;
 [TestClass]
 public sealed class ValidationTests
 {
-    [DataTestMethod]
+    [TestMethod]
     [DataRow("02.01a-INVOICE_ubl.xml")]
     [DataRow("02.02a-INVOICE_ubl.xml")]
     [DataRow("02.03a-INVOICE_ubl.xml")]
@@ -53,9 +53,9 @@ public void XmlIsValid()
         XmlInvoice invoice = fixture.Create<XmlInvoice>();
 
         var result = XmlInvoiceValidator.Validate(invoice);
-        Assert.IsNull(result.Error, result.Error, result.Error);
-        Assert.IsTrue(result.IsValid, string.Join(Environment.NewLine, result.Validations
-            .Where(x => x.Severity == System.Xml.Schema.XmlSeverityType.Error).Select(s => s.Message)));
+        Assert.IsNull(result.Error, result.Error, result?.Error ?? string.Empty);
+        Assert.IsTrue(result?.IsValid, string.Join(Environment.NewLine, result?.Validations
+            .Where(x => x.Severity == System.Xml.Schema.XmlSeverityType.Error).Select(s => s.Message) ?? []));
     }
 }
 
diff --git a/src/pax.XRechnung.NET.tests/pax.XRechnung.NET.tests.csproj b/src/pax.XRechnung.NET.tests/pax.XRechnung.NET.tests.csproj
@@ -1,20 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.18.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest" Version="3.6.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+    <PackageReference Include="MSTest" Version="4.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/pax.XRechnung.NET/pax.XRechnung.NET.csproj b/src/pax.XRechnung.NET/pax.XRechnung.NET.csproj
@@ -1,33 +1,33 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Description>dotnet XRechnung import, export and validate</Description>
     <PackageProjectUrl>https://github.com/ipax77/pax.XRechnung.NET</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/ipax77/pax.XRechnung.NET</RepositoryUrl>
     <PackageTags>dotnet;XRechnung;import;export;validate</PackageTags>
-    <AssemblyVersion>0.3.1</AssemblyVersion>
+    <AssemblyVersion>0.3.2</AssemblyVersion>
     <Owners>Philipp Hetzner</Owners>
     <Authors>Philipp Hetzner</Authors>
-    <Version>0.3.1</Version>
-	  <FileVersion>0.3.1.0</FileVersion>
-    <PackageVersion>0.3.1</PackageVersion>
+    <Version>0.3.2</Version>
+	  <FileVersion>0.3.2.0</FileVersion>
+    <PackageVersion>0.3.2</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>    
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>All</AnalysisMode>
-    <AnalysisLevel>8</AnalysisLevel>
+    <AnalysisLevel>latest</AnalysisLevel>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
     <RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
     <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <WarningsNotAsErrors></WarningsNotAsErrors>
     <DisabledWarnings></DisabledWarnings>
     <NoWarn>CA2227,CA1002</NoWarn>
@@ -103,7 +103,7 @@
   </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+      <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
+      <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
     </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void FromXml_MapsCorrectlyToDto()`
`86`	`86`	`Assert.AreEqual(xml.Id.Content, dto.Id);`
`87`	`87`	`Assert.AreEqual(xml.DocumentCurrencyCode, dto.DocumentCurrencyCode);`
`88`	`88`	`Assert.AreEqual(xml.SellerParty.Party.PartyName.Name, dto.SellerParty.Name);`
`89`		`- Assert.AreEqual(xml.InvoiceLines.Count, dto.InvoiceLines.Count);`
	`89`	`+ Assert.HasCount(xml.InvoiceLines.Count, dto.InvoiceLines);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`[TestMethod]`
`@@ -99,7 +99,7 @@ public void Roundtrip_ProducesEquivalentXml()`
`99`	`99`	`var roundtripXml = mapper.ToXml(dto);`
`100`	`100`
`101`	`101`	`Assert.AreEqual(original.Id.Content, roundtripXml.Id.Content);`
`102`		`- Assert.AreEqual(original.InvoiceLines.Count, roundtripXml.InvoiceLines.Count);`
	`102`	`+ Assert.HasCount(original.InvoiceLines.Count, roundtripXml.InvoiceLines);`
`103`	`103`	`Assert.AreEqual(original.SellerParty.Party.PartyName.Name, roundtripXml.SellerParty.Party.PartyName.Name);`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public void FromXml_MapsCorrectlyToDto()`
`84`	`84`	`Assert.AreEqual(xml.Id.Content, dto.Id);`
`85`	`85`	`Assert.AreEqual(xml.DocumentCurrencyCode, dto.DocumentCurrencyCode);`
`86`	`86`	`Assert.AreEqual(xml.SellerParty.Party.PartyName.Name, dto.SellerParty.Name);`
`87`		`- Assert.AreEqual(xml.InvoiceLines.Count, dto.InvoiceLines.Count);`
	`87`	`+ Assert.HasCount(xml.InvoiceLines.Count, dto.InvoiceLines);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`[TestMethod]`
`@@ -97,7 +97,7 @@ public void Roundtrip_ProducesEquivalentXml()`
`97`	`97`	`var roundtripXml = mapper.ToXml(dto);`
`98`	`98`
`99`	`99`	`Assert.AreEqual(original.Id.Content, roundtripXml.Id.Content);`
`100`		`- Assert.AreEqual(original.InvoiceLines.Count, roundtripXml.InvoiceLines.Count);`
	`100`	`+ Assert.HasCount(original.InvoiceLines.Count, roundtripXml.InvoiceLines);`
`101`	`101`	`Assert.AreEqual(original.SellerParty.Party.PartyName.Name, roundtripXml.SellerParty.Party.PartyName.Name);`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace pax.XRechnung.NET.tests;`
`11`	`11`	`[TestClass]`
`12`	`12`	`public sealed class DeSerializationTests`
`13`	`13`	`{`
`14`		`- [DataTestMethod]`
	`14`	`+ [TestMethod]`
`15`	`15`	`[DataRow("02.01a-INVOICE_ubl.xml")]`
`16`	`16`	`[DataRow("02.02a-INVOICE_ubl.xml")]`
`17`	`17`	`[DataRow("02.03a-INVOICE_ubl.xml")]`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public void CanSerialize()`
`135`	`135`	`{`
`136`	`136`	`var invoice = GetTestInvoice();`
`137`	`137`	`var xmlText = XmlInvoiceWriter.Serialize(invoice);`
`138`		`- Assert.IsTrue(xmlText.Length > 0);`
	`138`	`+ Assert.IsGreaterThan(0, xmlText.Length);`
`139`	`139`
`140`	`140`	`// File.WriteAllText("/data/xrechnung/testinvoice2.xml", xmlText);`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace pax.XRechnung.NET.tests;`
`10`	`10`	`[TestClass]`
`11`	`11`	`public sealed class ValidationTests`
`12`	`12`	`{`
`13`		`- [DataTestMethod]`
	`13`	`+ [TestMethod]`
`14`	`14`	`[DataRow("02.01a-INVOICE_ubl.xml")]`
`15`	`15`	`[DataRow("02.02a-INVOICE_ubl.xml")]`
`16`	`16`	`[DataRow("02.03a-INVOICE_ubl.xml")]`
`@@ -53,9 +53,9 @@ public void XmlIsValid()`
`53`	`53`	`XmlInvoice invoice = fixture.Create<XmlInvoice>();`
`54`	`54`
`55`	`55`	`var result = XmlInvoiceValidator.Validate(invoice);`
`56`		`- Assert.IsNull(result.Error, result.Error, result.Error);`
`57`		`- Assert.IsTrue(result.IsValid, string.Join(Environment.NewLine, result.Validations`
`58`		`- .Where(x => x.Severity == System.Xml.Schema.XmlSeverityType.Error).Select(s => s.Message)));`
	`56`	`+ Assert.IsNull(result.Error, result.Error, result?.Error ?? string.Empty);`
	`57`	`+ Assert.IsTrue(result?.IsValid, string.Join(Environment.NewLine, result?.Validations`
	`58`	`+ .Where(x => x.Severity == System.Xml.Schema.XmlSeverityType.Error).Select(s => s.Message) ?? []));`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`