sarahelsaig · Jul 19, 2026 · Jan 7, 2026 · Jan 9, 2026 · Jan 9, 2026 · Jan 16, 2026
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ wwwroot/
 node_modules/
 *.user
 .pnpm-debug.log
+*.orig
 
 # Mac
 .DS_Store

diff --git a/Lombiq.EInvoiceValidator.Benchmark/Lombiq.EInvoiceValidator.Benchmark.csproj b/Lombiq.EInvoiceValidator.Benchmark/Lombiq.EInvoiceValidator.Benchmark.csproj
@@ -1,12 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-  </ItemGroup>
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="2.0.1" />
 
   <ItemGroup>
     <ProjectReference Include="..\Lombiq.EInvoiceValidator\Lombiq.EInvoiceValidator.csproj" />
@@ -18,4 +17,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="2.0.1" />
 </Project>
diff --git a/Lombiq.EInvoiceValidator.Benchmark/Program.cs b/Lombiq.EInvoiceValidator.Benchmark/Program.cs
@@ -14,7 +14,6 @@
 var invoiceValidationService = serviceProvider.GetRequiredService<IInvoiceValidationService>();
 
 // Start the benchmark.
-await ValidationBenchmarkHelpers.RunBenchMarkAsync(
-    async stream =>
-        // Step 2. Validate the eInvoice XML file read into a stream using the helper method.
-        await invoiceValidationService.ValidateInvoiceAsync(stream));
+// Step 2. Validate the eInvoice XML file read into a stream using the helper method.
+await ValidationBenchmarkHelpers.RunBenchMarkAsync(async stream =>
+    await invoiceValidationService.ValidateInvoiceAsync(stream));
diff --git a/Lombiq.EInvoiceValidator.Sample/Lombiq.EInvoiceValidator.Sample.csproj b/Lombiq.EInvoiceValidator.Sample/Lombiq.EInvoiceValidator.Sample.csproj
@@ -1,30 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="2.0.1" />
+
   <PropertyGroup>
     <Title>Lombiq eInvoice Validator Sample</Title>
-    <Authors>Lombiq Technologies</Authors>
-    <Copyright>Copyright © 2025, Lombiq Technologies Ltd.</Copyright>
-    <Description>Lombiq eInvoice Validator Sample: Sample console application to showcase the Lombiq eInvoice Validator. See the project website for detailed documentation.</Description>
-    <PackageIcon>NuGetIcon.png</PackageIcon>
+    <CopyrightYear>2025</CopyrightYear>
+    <DescriptionBody>Sample console application to showcase the Lombiq eInvoice Validator. See the project website for detailed documentation.</DescriptionBody>
     <PackageTags>OrchardCore;Lombiq;AspNetCore;EN16931;eInvoice;XML;UBL;CII</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/eInvoice-Validator</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/eInvoice-Validator/Lombiq.EInvoiceValidator.Sample/Readme.md</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Readme.md" />
-    <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Lombiq.EInvoiceValidator\Lombiq.EInvoiceValidator.csproj" />
   </ItemGroup>
@@ -33,8 +24,11 @@
     <None Update="SampleInvoices\**\*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Pack>true</Pack>
-      <PackagePath>contentFiles\any\any</PackagePath>
+      <PackagePath>contentFiles\any\$(TargetFramework)</PackagePath>
       <PackageCopyToOutput>true</PackageCopyToOutput>
     </None>
   </ItemGroup>
+
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="2.0.1" />
 </Project>
diff --git a/Lombiq.EInvoiceValidator.Tests/Lombiq.EInvoiceValidator.Tests.csproj b/Lombiq.EInvoiceValidator.Tests/Lombiq.EInvoiceValidator.Tests.csproj
@@ -1,21 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
-    <PackageReference Include="xunit.v3" Version="3.2.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Tests.Sdk" Version="2.0.1" />
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\test\Lombiq.Tests\Lombiq.Tests.csproj" />
     <ProjectReference Include="..\Lombiq.EInvoiceValidator\Lombiq.EInvoiceValidator.csproj" />
   </ItemGroup>
 
@@ -25,4 +16,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Tests.Sdk" Version="2.0.1" />
 </Project>
diff --git a/Lombiq.EInvoiceValidator.Tests/Tests/ValidatorTests.cs b/Lombiq.EInvoiceValidator.Tests/Tests/ValidatorTests.cs
@@ -3,13 +3,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using System.IO;
+using System.Text;
 using System.Threading.Tasks;
 using Xunit;
 
 namespace Lombiq.EInvoiceValidator.Tests.Tests;
 
 public class ValidatorTests
 {
+    private readonly ITestOutputHelper _testOutputHelper;
+
     public static TheoryData<string> InvoiceFilePaths
     {
         get
@@ -25,10 +28,24 @@ public static TheoryData<string> InvoiceFilePaths
         }
     }
 
+    public ValidatorTests(ITestOutputHelper testOutputHelper) =>
+        _testOutputHelper = testOutputHelper;
+
     [Theory]
     [MemberData(nameof(InvoiceFilePaths))]
     public async Task TestInvoiceValidation(string filePath)
     {
+        var directoryTree = new StringBuilder("node_modules directory contents:\n");
+        var directoryInfo = new DirectoryInfo("node_modules");
+
+        if (!directoryInfo.Exists)
+        {
+            throw new DirectoryNotFoundException($"The directory \"{directoryInfo.FullName}\" does not exist!");
+        }
+
+        WriteTree(directoryTree, directoryInfo, depth: 0);
+        _testOutputHelper.WriteLine(directoryTree.ToString());
+
         var services = new ServiceCollection();
         services.AddEInvoiceValidationServices();
         var serviceProvider = services.BuildServiceProvider();
@@ -49,4 +66,23 @@ public async Task TestInvoiceValidation(string filePath)
             result.Successful.ShouldBeTrue($"{filePath} should pass validation but did not.");
         }
     }
+
+    private static void WriteTree(StringBuilder builder, DirectoryInfo info, int depth)
+    {
+        builder.Append(new string(' ', 2 * depth));
+        builder.AppendLine(info.Name);
+
+        var nextDepth = depth + 1;
+
+        foreach (var child in info.GetDirectories())
+        {
+            WriteTree(builder, child, nextDepth);
+        }
+
+        foreach (var child in info.GetFiles())
+        {
+            builder.Append(new string(' ', 2 * nextDepth));
+            builder.AppendLine(child.Name);
+        }
+    }
 }
diff --git a/Lombiq.EInvoiceValidator.sln b/Lombiq.EInvoiceValidator.sln
diff --git a/Lombiq.EInvoiceValidator.slnx b/Lombiq.EInvoiceValidator.slnx
@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="Lombiq.EInvoiceValidator.Sample/Lombiq.EInvoiceValidator.Sample.csproj" />
+  <Project Path="Lombiq.EInvoiceValidator/Lombiq.EInvoiceValidator.csproj" />
+</Solution>
diff --git a/Lombiq.EInvoiceValidator/Lombiq.EInvoiceValidator.csproj b/Lombiq.EInvoiceValidator/Lombiq.EInvoiceValidator.csproj
@@ -1,27 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <LombiqMSBuildLibManTarget>node_modules</LombiqMSBuildLibManTarget>
   </PropertyGroup>
 
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.props" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.Library.Sdk" Version="2.0.1" />
+
   <PropertyGroup>
     <Title>Lombiq eInvoice Validator</Title>
-    <Authors>Lombiq Technologies</Authors>
-    <Copyright>Copyright © 2025, Lombiq Technologies Ltd.</Copyright>
-    <Description>Lombiq eInvoice Validator: Adds validation for EU eInvoices that follow the EN 16931 standard. See the project website for detailed documentation.</Description>
-    <PackageIcon>NuGetIcon.png</PackageIcon>
+    <CopyrightYear>2025</CopyrightYear>
+    <DescriptionBody>Adds validation for EU eInvoices that follow the EN 16931 standard. See the project website for detailed documentation.</DescriptionBody>
     <PackageTags>OrchardCore;Lombiq;AspNetCore;EN16931;eInvoice;XML;UBL;CII</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/eInvoice-Validator</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/Lombiq/eInvoice-Validator</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="../Readme.md" />
-    <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
-
     <None Remove="SchemaFiles\CII\*.xsd" />
     <EmbeddedResource Include="SchemaFiles\CII\*.xsd" />
     <None Remove="SchemaFiles\UBL\common\*.xsd" />
@@ -35,7 +30,7 @@
     <Content Include="validator.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Pack>true</Pack>
-      <PackagePath>contentFiles\any\any</PackagePath>
+      <PackagePath>contentFiles\any\$(TargetFramework)</PackagePath>
       <PackageCopyToOutput>true</PackageCopyToOutput>
     </Content>
 
@@ -47,27 +42,16 @@
 
   <ItemGroup>
     <PackageReference Include="Jering.Javascript.NodeJS" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="3.0.114" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.5.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="$(PackageVersionLombiqHelpfulLibraries)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
     <ProjectReference Include="..\..\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
   </ItemGroup>
 
-  <!--  Needed for projects that uses this project by a NuGet package.  -->
-  <Target Name="AddNodeModules" AfterTargets="LibraryManagerRestore" Condition="'$(NuGetBuild)' == 'true'">
-    <ItemGroup>
-      <Content Include="node_modules\**\*">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <Pack>true</Pack>
-        <PackagePath>contentFiles\any\any\node_modules</PackagePath>
-        <PackageCopyToOutput>true</PackageCopyToOutput>
-      </Content>
-    </ItemGroup>
-  </Target>
-
+  <Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.Library.Sdk/Sdk/Import.targets" />
+  <Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.Library.Sdk" Version="2.0.1" />
 </Project>
diff --git a/Lombiq.EInvoiceValidator/build/Lombiq.EInvoiceValidator.targets b/Lombiq.EInvoiceValidator/build/Lombiq.EInvoiceValidator.targets
@@ -0,0 +1,18 @@
+<Project>
+
+  <PropertyGroup>
+    <IncludeNodeModulesBaseDir>$(MSBuildThisFileDirectory)..\contentFiles\any\net10.0\</IncludeNodeModulesBaseDir>
+  </PropertyGroup>
+
+  <Target Name="IncludeNodeModules" BeforeTargets="Build">
+    <ItemGroup>
+      <IncludeNodeModulesFiles Include="$(IncludeNodeModulesBaseDir)**\*.*"/>
+    </ItemGroup>
+
+    <Copy
+        SourceFiles="@(IncludeNodeModulesFiles)"
+        DestinationFiles="$(TargetDir)%(RecursiveDir)%(Filename)%(Extension)"
+        SkipUnchangedFiles="true"/>
+  </Target>
+
+</Project>
diff --git a/NuGet.config b/NuGet.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!-- Ignore global configuration -->
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
+    <add key="Lombiq" value="https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json" />
+  </packageSources>
+</configuration>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ wwwroot/ @@
     node_modules/
     *.user
     .pnpm-debug.log
+    *.orig
     # Mac
     .DS_Store
@@ Expand Down @@