Update to .Net 8.0

.github/workflows/build.yml

@@ -11,8 +11,12 @@ jobs:
     runs-on: windows-latest
 
     steps:
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.x'
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Extract version number
         id: extract_version
         shell: pwsh
@@ -42,4 +46,4 @@ jobs:
         with:
           name: cmodconvert-${{ steps.extract_version.outputs.version }}
           path: Publish/
-        
+

CmodConvert.Test/CmodConvert.Test.csproj

@@ -1,31 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFramework>net8.0</TargetFramework>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
-    <Authors>Andrew Tribick</Authors>
-    <Copyright>ⓒ 2021–2023 Andrew Tribick</Copyright>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <RepositoryUrl>https://github.com/ajtribick/cmodconvert</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <IsPublishable>false</IsPublishable>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\CmodConvert\CmodConvert.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>

CmodConvert.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -9,6 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
@@ -18,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "format", "format", "{0D856A
 		format\cmod-binary.md = format\cmod-binary.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CmodConvert.Test", "CmodConvert.Test\CmodConvert.Test.csproj", "{FCBD5246-03B8-4744-918E-E4C021A08B67}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmodConvert.Test", "CmodConvert.Test\CmodConvert.Test.csproj", "{FCBD5246-03B8-4744-918E-E4C021A08B67}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

CmodConvert/CmodConvert.csproj

@@ -16,48 +16,31 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -->
-
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <InvariantGlobalization>true</InvariantGlobalization>
-    <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
-    <Version>0.1.1</Version>
-    <Authors>Andrew Tribick</Authors>
+    <TargetFramework>net8.0</TargetFramework>
     <Description>Convert Celestia CMOD format to Wavefront OBJ/MTL.</Description>
-    <Copyright>ⓒ 2021–2023 Andrew Tribick</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <RepositoryUrl>https://github.com/ajtribick/cmodconvert</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
-    <WarningsAsErrors>true</WarningsAsErrors>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\LICENSE" Link="LICENSE">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\LICENSE">
       <Pack>True</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>
+      </PackagePath>
     </None>
     <None Include="..\README.md" Link="README.md">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.CommandLine" />
   </ItemGroup>
-
-</Project>
+</Project>

CmodConvert/CmodData.cs

@@ -18,14 +18,8 @@
 
 namespace CmodConvert;
 
-public class CmodData
+public class CmodData(IReadOnlyCollection<Material> materials, IReadOnlyCollection<Mesh> meshes)
 {
-    public CmodData(IReadOnlyCollection<Material> materials, IReadOnlyCollection<Mesh> meshes)
-    {
-        Materials = materials;
-        Meshes = meshes;
-    }
-
-    public IReadOnlyCollection<Material> Materials { get; }
-    public IReadOnlyCollection<Mesh> Meshes { get; }
+    public IReadOnlyCollection<Material> Materials { get; } = materials;
+    public IReadOnlyCollection<Mesh> Meshes { get; } = meshes;
 }

CmodConvert/IO/CmodReader.Ascii.cs

@@ -20,18 +20,11 @@ namespace CmodConvert.IO;
 
 public abstract partial class CmodReader
 {
-    private class Ascii : CmodReader
+    private class Ascii(Stream stream) : CmodReader
     {
-        private readonly Stream _stream;
-
-        public Ascii(Stream stream)
-        {
-            _stream = stream;
-        }
-
         public override async Task<CmodData> Read()
         {
-            using var reader = new TokenReader(_stream);
+            using var reader = new TokenReader(stream);
             var materials = new List<Material>();
             var meshes = new List<Mesh>();
 
@@ -87,23 +80,13 @@ private static async Task<Material> ReadMaterial(TokenReader reader)
                         break;
 
                     case "blend":
-                        switch (await reader.NextToken().ConfigureAwait(false))
+                        material.BlendMode = await reader.NextToken().ConfigureAwait(false) switch
                         {
-                            case "normal":
-                                material.BlendMode = BlendMode.Normal;
-                                break;
-
-                            case "add":
-                                material.BlendMode = BlendMode.Additive;
-                                break;
-
-                            case "premultiplied":
-                                material.BlendMode = BlendMode.PremultipliedAlpha;
-                                break;
-
-                            default:
-                                throw new CmodException("Unknown blend mode");
-                        }
+                            "normal" => (BlendMode?)BlendMode.Normal,
+                            "add" => (BlendMode?)BlendMode.Additive,
+                            "premultiplied" => (BlendMode?)BlendMode.PremultipliedAlpha,
+                            _ => throw new CmodException("Unknown blend mode"),
+                        };
                         break;
 
                     case "texture0":

CmodConvert/IO/CmodReader.Binary.cs

@@ -20,18 +20,11 @@ namespace CmodConvert.IO;
 
 public abstract partial class CmodReader
 {
-    private class Binary : CmodReader
+    private class Binary(Stream stream) : CmodReader
     {
-        private readonly Stream _stream;
-
-        public Binary(Stream stream)
-        {
-            _stream = stream;
-        }
-
         public override async Task<CmodData> Read()
         {
-            using var reader = new BufferedReader(_stream);
+            using var reader = new BufferedReader(stream);
 
             var materials = new List<Material>();
             var meshes = new List<Mesh>();

CmodConvert/IO/TokenReader.cs

@@ -23,12 +23,14 @@ namespace CmodConvert.IO;
 
 internal sealed class TokenReader : IDataReader
 {
+    private static readonly char[] s_endTokenChars = [' ', '\t'];
+
     private readonly TextReader _reader;
     private string? _line;
     private int _position;
     private bool _disposed;
 
-    public TokenReader(Stream stream, int capacity = 4096)
+    public TokenReader(Stream stream)
     {
         try
         {
@@ -81,15 +83,15 @@ public TokenReader(Stream stream, int capacity = 4096)
                         break;
 
                     default:
-                        var endToken = _line.IndexOfAny(new[] { ' ', '\t' }, _position + 1);
+                        var endToken = _line.IndexOfAny(s_endTokenChars, _position + 1);
                         if (endToken > 0)
                         {
                             _position = endToken + 1;
-                            return _line.Substring(current, endToken - current);
+                            return _line[current..endToken];
                         }
 
                         _position = _line.Length;
-                        return _line.Substring(current);
+                        return _line[current..];
                 }
             }
         }

CmodConvert/IO/WavefrontWriter.cs

@@ -21,22 +21,13 @@
 
 namespace CmodConvert.IO;
 
-internal class WavefrontWriter
+internal class WavefrontWriter(string objFile, string mtlFile)
 {
-    private readonly string _objFile;
-    private readonly string _mtlFile;
-
-    public WavefrontWriter(string objFile, string mtlFile)
-    {
-        _objFile = objFile;
-        _mtlFile = mtlFile;
-    }
-
     public Task Write(WavefrontMesh mesh) => Task.WhenAll(WriteMtl(mesh.Materials), WriteObj(mesh));
 
     private async Task WriteMtl(IEnumerable<Material> materials)
     {
-        using var stream = new FileStream(_mtlFile, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true);
+        using var stream = new FileStream(mtlFile, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true);
         using var writer = new StreamWriter(stream, Encoding.ASCII);
 
         var i = 0;
@@ -99,11 +90,11 @@ private async Task WriteMtl(IEnumerable<Material> materials)
 
     private async Task WriteObj(WavefrontMesh mesh)
     {
-        using var stream = new FileStream(_objFile, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true);
+        using var stream = new FileStream(objFile, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true);
         using var writer = new StreamWriter(stream, Encoding.ASCII);
 
-        var objDirectory = Path.GetDirectoryName(_objFile);
-        var mtlRelative = objDirectory != null ? Path.GetRelativePath(objDirectory, _mtlFile) : _mtlFile;
+        var objDirectory = Path.GetDirectoryName(objFile);
+        var mtlRelative = objDirectory != null ? Path.GetRelativePath(objDirectory, mtlFile) : mtlFile;
 
         await writer.WriteLineAsync($"mtllib {mtlRelative}").ConfigureAwait(false);
 

CmodConvert/Material.cs

@@ -26,7 +26,7 @@ public class Material
     public float? SpecularPower { get; set; }
     public float? Opacity { get; set; }
     public BlendMode? BlendMode { get; set; }
-    public Dictionary<TextureSemantic, string> Textures { get; } = new();
+    public Dictionary<TextureSemantic, string> Textures { get; } = [];
 
     public Material Clone()
     {

CmodConvert/Mesh.cs

@@ -18,17 +18,11 @@
 
 namespace CmodConvert;
 
-public class Mesh
+public class Mesh(
+    IReadOnlyList<VertexAttribute> vertexAttributes,
+    IReadOnlyList<Primitive> primitives)
 {
-    public Mesh(
-        IReadOnlyList<VertexAttribute> vertexAttributes,
-        IReadOnlyList<Primitive> primitives)
-    {
-        VertexAttributes = vertexAttributes;
-        Primitives = primitives;
-    }
-
-    public int VertexCount => VertexAttributes.First().Count;
-    public IReadOnlyList<VertexAttribute> VertexAttributes { get; }
-    public IReadOnlyList<Primitive> Primitives { get; }
+    public int VertexCount => VertexAttributes[0].Count;
+    public IReadOnlyList<VertexAttribute> VertexAttributes { get; } = vertexAttributes;
+    public IReadOnlyList<Primitive> Primitives { get; } = primitives;
 }

CmodConvert/Primitive.cs

@@ -18,16 +18,9 @@
 
 namespace CmodConvert;
 
-public class Primitive
+public class Primitive(PrimitiveType primitiveType, int materialIndex, int count)
 {
-    public Primitive(PrimitiveType primitiveType, int materialIndex, int count)
-    {
-        PrimitiveType = primitiveType;
-        MaterialIndex = materialIndex;
-        Indices = new(count);
-    }
-
-    public PrimitiveType PrimitiveType { get; }
-    public int MaterialIndex { get; }
-    public List<int> Indices { get; }
+    public PrimitiveType PrimitiveType { get; } = primitiveType;
+    public int MaterialIndex { get; } = materialIndex;
+    public List<int> Indices { get; } = new(count);
 }

CmodConvert/VertexAttribute.Float1.cs

@@ -22,11 +22,9 @@ namespace CmodConvert;
 
 public abstract partial class VertexAttribute
 {
-    private class Float1 : VertexAttribute
+    private class Float1(AttributeType attribute) : VertexAttribute(attribute)
     {
-        private readonly List<float> _data = new();
-
-        public Float1(AttributeType attribute) : base(attribute) { }
+        private readonly List<float> _data = [];
 
         public override int Count => _data.Count;
 

CmodConvert/VertexAttribute.Float2.cs

@@ -22,11 +22,9 @@ namespace CmodConvert;
 
 public abstract partial class VertexAttribute
 {
-    private class Float2 : VertexAttribute
+    private class Float2(AttributeType attribute) : VertexAttribute(attribute)
     {
-        private readonly List<(float, float)> _data = new();
-
-        public Float2(AttributeType attribute) : base(attribute) { }
+        private readonly List<(float, float)> _data = [];
 
         public override int Count => _data.Count;
 

CmodConvert/VertexAttribute.Float3.cs

@@ -22,11 +22,9 @@ namespace CmodConvert;
 
 public abstract partial class VertexAttribute
 {
-    private class Float3 : VertexAttribute
+    private class Float3(AttributeType attribute) : VertexAttribute(attribute)
     {
-        private readonly List<(float, float, float)> _data = new();
-
-        public Float3(AttributeType attribute) : base(attribute) { }
+        private readonly List<(float, float, float)> _data = [];
 
         public override int Count => _data.Count;