Upgrade project to target .NET 10 runtime (#29)

jozefizso · web-flow · commit 46dc89d346f6 · 2025-11-21T19:52:05.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
 
     strategy:
       matrix:
-        os: ['ubuntu-24.04', 'windows-2022']
+        os: ['ubuntu-24.04', 'windows-2025']
 
     env:
       Configuration: 'Release'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: checkout
@@ -28,7 +28,7 @@ jobs:
     - name: setup dotnet
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8
+        dotnet-version: 10
 
     - name: restore
       run: dotnet restore
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,10 +1,10 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <VersionPrefix>1.8.0</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/VbaCompiler/README.md b/src/VbaCompiler/README.md
@@ -24,7 +24,7 @@ var macroFilePath = compiler.CompileExcelMacroFile("bin", "MyMacro.xlsm", vbaPro
 
 ### Requirements
 
-The compiler works on .NET 6, 7 and 8 runtimes on Windows and macOS.
+The compiler works on .NET 8 and 10 runtimes on Windows, Linux and macOS.
 
 ### Samples
 
diff --git a/src/VbaCompiler/Vba/ProjectRecord.cs b/src/VbaCompiler/Vba/ProjectRecord.cs
@@ -9,11 +9,11 @@ public class ProjectRecord
     {
         public ProjectRecord()
         {
-            this.HostExtenders = new List<string>()
-            {
+            this.HostExtenders =
+            [
                 Constants.HostExtender_VBE
-            };
-            this.Modules = new List<ModuleUnit>();
+            ];
+            this.Modules = [];
         }
 
         public string Id { get; set; } = "";
@@ -37,7 +37,7 @@ public ProjectRecord()
         /// </summary>
         public string VisibilityState { get; set; } = "";
 
-        public IList<string> HostExtenders { get; }
+        public List<string> HostExtenders { get; }
 
         public ICollection<ModuleUnit> Modules { get; set; }
 
diff --git a/src/VbaCompiler/VbaCompiler.cs b/src/VbaCompiler/VbaCompiler.cs
@@ -14,9 +14,9 @@ namespace vbamc
 {
     public class VbaCompiler
     {
-        private IList<ModuleUnit> modules = new List<ModuleUnit>();
+        private List<ModuleUnit> modules = [];
 
-        public IDictionary<string, string> ExtendedProperties { get; set; } = new Dictionary<string, string>();
+        public Dictionary<string, string> ExtendedProperties { get; set; } = [];
 
         public Guid ProjectId { get; set; }
 
diff --git a/src/VbaCompiler/VbaCompiler.csproj b/src/VbaCompiler/VbaCompiler.csproj
@@ -10,10 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
-    <PackageReference Include="OpenMcdf" Version="2.3.1" />
-    <PackageReference Include="NetOfficeFw.VbaCompression" Version="2.0.0" />
-    <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
+    <PackageReference Include="OpenMcdf" Version="2.4.1" />
+    <PackageReference Include="NetOfficeFw.VbaCompression" Version="3.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/vbamc/Program.cs b/src/vbamc/Program.cs
@@ -15,10 +15,10 @@ public static int Main(string[] args)
 
     [Required]
     [Option("-m|--module")]
-    public IEnumerable<string> Modules { get; } = Enumerable.Empty<string>();
+    public IEnumerable<string> Modules { get; } = [];
 
     [Option("-c|--class")]
-    public IEnumerable<string> Classes { get; } = Enumerable.Empty<string>();
+    public IEnumerable<string> Classes { get; } = [];
 
     // [Option("-d|--document")]
     // public string? Document { get; }
@@ -39,7 +39,7 @@ public static int Main(string[] args)
     public string? UserProfilePath { get; }
 
     [Option("-p|--property", Description = "Extended property in the format name=value")]
-    public string[] ExtendedProperties { get; } = Array.Empty<string>();
+    public string[] ExtendedProperties { get; } = [];
 
     private void OnExecute()
     {
diff --git a/src/vbamc/README.md b/src/vbamc/README.md
@@ -11,7 +11,7 @@ vbamc --module Module.vb --class MyClass.vb --name "VBA Project" --company "ACME
 
 ### Requirements
 
-The compiler works on .NET 6, 7 and 8 runtimes on Windows and macOS.
+The compiler works on .NET 8 and 10 runtimes on Windows, Linux and macOS.
 
 ### Samples
 
diff --git a/tests/VbaCompiler.Tests/VbaCompiler.Tests.csproj b/tests/VbaCompiler.Tests/VbaCompiler.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
@@ -22,16 +22,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Collections" Version="4.3.0" />
-    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/utils/vbad/vbad.csproj b/utils/vbad/vbad.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenMcdf" Version="2.3.1" />
-    <PackageReference Include="NetOfficeFw.VbaCompression" Version="2.0.0" />
+    <PackageReference Include="OpenMcdf" Version="2.4.1" />
+    <PackageReference Include="NetOfficeFw.VbaCompression" Version="3.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/vbamc.sln b/vbamc.sln
diff --git a/vbamc.slnx b/vbamc.slnx
@@ -0,0 +1,13 @@
+<Solution>
+  <Project Path="src/VbaCompiler/VbaCompiler.csproj" />
+  <Project Path="src/vbamc/vbamc.csproj" />
+  
+  <Folder Name="/utils/">
+    <Project Path="utils/vbad/vbad.csproj" />
+  </Folder>
+
+  <Folder Name="/tests/">
+    <Project Path="tests/VbaCompiler.Benchmark/VbaCompiler.Benchmark.csproj" />
+    <Project Path="tests/VbaCompiler.Tests/VbaCompiler.Tests.csproj" />
+  </Folder>
+</Solution>

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ namespace vbamc`
`14`	`14`	`{`
`15`	`15`	`public class VbaCompiler`
`16`	`16`	`{`
`17`		`- private IList<ModuleUnit> modules = new List<ModuleUnit>();`
	`17`	`+ private List<ModuleUnit> modules = [];`
`18`	`18`
`19`		`- public IDictionary<string, string> ExtendedProperties { get; set; } = new Dictionary<string, string>();`
	`19`	`+ public Dictionary<string, string> ExtendedProperties { get; set; } = [];`
`20`	`20`
`21`	`21`	`public Guid ProjectId { get; set; }`
`22`	`22`