Actually apply FieldOffsetAttribute, migrate to .net 5.0

SamboyCoding · Jan 22, 2021 · c83800d · c83800d
1 parent a4cb018
commit c83800d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/dotnet-core-pull.yml b/.github/workflows/dotnet-core-pull.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.100
     - name: Install dependencies
       run: dotnet restore
     - name: Build - Windows x64

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.100
     - name: Install dependencies
       run: dotnet restore
     - name: Build - Common Lib

diff --git a/Cpp2IL/AssemblyBuilder.cs b/Cpp2IL/AssemblyBuilder.cs
@@ -282,7 +282,12 @@ private static List<CppMethodData> ProcessTypeContents(Il2CppMetadata metadata,
                 var fieldName = metadata.GetStringFromIndex(fieldDef.nameIndex);
                 var fieldTypeRef = Utils.ImportTypeInto(ilTypeDefinition, fieldType, cppAssembly, metadata);
 
+                var fieldOffsetAttributeInst = new CustomAttribute(ilTypeDefinition.Module.ImportReference(fieldOffsetAttribute));
+                fieldOffsetAttributeInst.Fields.Add(new CustomAttributeNamedArgument("Offset", new CustomAttributeArgument(stringType, $"0x{fieldOffset:X}")));
+
                 var fieldDefinition = new FieldDefinition(fieldName, (FieldAttributes) fieldType.attrs, fieldTypeRef);
+                fieldDefinition.CustomAttributes.Add(fieldOffsetAttributeInst);
+
                 ilTypeDefinition.Fields.Add(fieldDefinition);
 
                 //Field default values

diff --git a/Cpp2IL/Cpp2IL.csproj b/Cpp2IL/Cpp2IL.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>8</LangVersion>
     <Nullable>annotations</Nullable>