Update dependencies, CI and some base class

xoofx · Sep 13, 2024 · 6a93fe2 · 6a93fe2
1 parent e2bc6eb
commit 6a93fe2
Show file tree

Hide file tree

Showing 21 changed files with 1,447 additions and 1,487 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -11,21 +11,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-22.04
-
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: true
-        fetch-depth: 0
-
-    - name: Install .NET 8.0
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: Build, Test, Pack, Publish
-      shell: bash
-      run: |
-        dotnet tool install -g dotnet-releaser --configfile .github/workflows/nuget_org_only.config
-        dotnet-releaser run --nuget-token "${{secrets.NUGET_TOKEN}}" --github-token "${{secrets.GITHUB_TOKEN}}" src/dotnet-releaser.toml
+      - name: "Build, Test, Pack and Publish"
+        uses: xoofx/.github/.github/actions/dotnet-releaser-action@main
+        with:
+          NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
diff --git a/src/LibObjectFile.CodeGen/LibObjectFile.CodeGen.csproj b/src/LibObjectFile.CodeGen/LibObjectFile.CodeGen.csproj
@@ -3,6 +3,7 @@
       <TargetFramework>net8.0</TargetFramework>
       <OutputType>Exe</OutputType>
       <IsPackable>false</IsPackable>
+      <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' AND '$(PackAsTool)' != 'true'">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
     </PropertyGroup>
 
     <ItemGroup>
@@ -11,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="CppAst.CodeGen" Version="0.11.3" />
+      <PackageReference Include="CppAst.CodeGen" Version="0.20.0" />
       <Content Include="dwarf.h">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>

diff --git a/src/LibObjectFile.CodeGen/Program.Dwarf.cs b/src/LibObjectFile.CodeGen/Program.Dwarf.cs
@@ -420,9 +420,11 @@ private static void GenerateDwarfDIE(CSharpNamespace ns)
                     currentDIE.BaseTypes.Add(new CSharpFreeType("DwarfDIE"));
                     ns.Members.Add(currentDIE);
 
-                    var csConstructor = new CSharpMethod();
-                    csConstructor.IsConstructor = true;
-                    csConstructor.Body = (writer, element) => writer.WriteLine($"this.Tag = (DwarfTag)DwarfNative.{fullTagName};");
+                    var csConstructor = new CSharpMethod(string.Empty)
+                    {
+                        Kind = CSharpMethodKind.Constructor,
+                        Body = (writer, element) => writer.WriteLine($"this.Tag = (DwarfTag)DwarfNative.{fullTagName};")
+                    };
                     currentDIE.Members.Add(csConstructor);
 
                     dieClasses.Add(currentDIE);
@@ -461,9 +463,8 @@ private static void GenerateDwarfDIE(CSharpNamespace ns)
                 Visibility = CSharpVisibility.Internal
             };
             ns.Members.Add(dieHelperClass);
-            var dieHelperMethod = new CSharpMethod()
+            var dieHelperMethod = new CSharpMethod("ConvertTagToDwarfDIE")
             {
-                Name = "ConvertTagToDwarfDIE",
                 Modifiers =  CSharpModifiers.Static,
                 Visibility =  CSharpVisibility.Public
             };

diff --git a/src/LibObjectFile.CodeGen/Program.cs b/src/LibObjectFile.CodeGen/Program.cs
@@ -14,7 +14,7 @@ namespace LibObjectFile.CodeGen
 {
     partial class Program
     {
-        private const string SrcFolderRelative = @"..\..\..\..";
+        private const string SrcFolderRelative = @"..\..\..\..\..";
 
         static void Main(string[] args)
         {
@@ -255,9 +255,8 @@ private static void ProcessEnum(CSharpConverterOptions cppOptions, CSharpCompila
                 }
             }
 
-            var toStringInternal = new CSharpMethod()
+            var toStringInternal = new CSharpMethod("ToStringInternal")
             {
-                Name = "ToStringInternal",
                 Visibility = CSharpVisibility.Private,
                 ReturnType = CSharpPrimitiveType.String()
             };

diff --git a/src/LibObjectFile.Tests/LibObjectFile.Tests.csproj b/src/LibObjectFile.Tests/LibObjectFile.Tests.csproj
@@ -37,9 +37,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="4.0.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="nunit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
   </ItemGroup>
 
   <ItemGroup>