Update workflows, 4.2.0-goatcorp1

Author: goaaats

.github/workflows/build-and-publish.yml

@@ -2,15 +2,14 @@ name: Build and Publish
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, modified ]
     tags:
       - '*'
   pull_request:
-    branches: [ master ]
+    branches: [ master, modified ]
   workflow_dispatch:
 
 env: 
-  CHANGELOG_PATH: ./Changelog.md
   CODE_COVERAGE_PATH: ./Coverage.xml
   RELOADED_HOOKS_NUPKG_GLOB: ./source/Reloaded.Hooks/bin/Release/*.nupkg
   RELOADED_HOOKS_DEFINITIONS_NUPKG_GLOB: ./source/Reloaded.Hooks.Definitions/bin/Release/*.nupkg
@@ -25,31 +24,15 @@ jobs:
         shell: pwsh
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Setup .NET Core SDK
-      uses: actions/setup-dotnet@v1.9.0
+      uses: actions/setup-dotnet@v3
       with:
         # Optional SDK version(s) to use. If not provided, will install global.json version when available. Examples: 2.2.104, 3.1, 3.1.x
-        dotnet-version: 6.0.x
-    
-    - name: Setup .NET Core SDK 7.X
-      uses: actions/setup-dotnet@v1.9.0
-      with:
-        # Optional SDK version(s) to use. If not provided, will install global.json version when available. Examples: 2.2.104, 3.1, 3.1.x
-        dotnet-version: 7.0.x
-        include-prerelease: true
-    
-    # Required for C#10 features.
-    - name: Setup Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: '14'
-
-    - name: Setup AutoChangelog
-      run: npm install -g auto-changelog
+        dotnet-version: 9.0.x
 
     - name: Get Dotnet Info
       run: dotnet --info
@@ -65,62 +48,17 @@ jobs:
     
            dotnet test -f net6.0 .\source\Reloaded.Hooks.Tests.X86\Reloaded.Hooks.Tests.X86.csproj /p:AltCover=true /p:CopyLocalLockFileAssemblies="true" /p:AltCoverAttributeFilter="ExcludeFromCodeCoverageAttribute" /p:AltCoverAssemblyExcludeFilter="Reloaded.Hooks.Tests.X86|Reloaded.Hooks.Tests.X64|Reloaded.Hooks.Tests.Shared|xunit\.*" /p:AltCoverTypeFilter="xunit\.*|AltCover\.*|Reloaded\.Assembler.*" /p:AltCoverReport="../../coverage-86.xml"
            dotnet test -f net6.0 .\source\Reloaded.Hooks.Tests.X64\Reloaded.Hooks.Tests.X64.csproj /p:AltCover=true /p:CopyLocalLockFileAssemblies="true" /p:AltCoverAttributeFilter="ExcludeFromCodeCoverageAttribute" /p:AltCoverAssemblyExcludeFilter="Reloaded.Hooks.Tests.X86|Reloaded.Hooks.Tests.X64|Reloaded.Hooks.Tests.Shared|xunit\.*" /p:AltCoverTypeFilter="xunit\.*|AltCover\.*|Reloaded\.Assembler.*" /p:AltCoverReport="../../coverage-64.xml"
-    
-           Get-ChildItem coverage-* | Merge-OpenCover -OutputFile "$env:CODE_COVERAGE_PATH" | Out-Null
-           choco install codecov -f -y | Out-Null
-           codecov -f $env:CODE_COVERAGE_PATH
 
-    - name: Codecov
-        # You may pin to the exact commit or the version.
-        # uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b
-      uses: codecov/codecov-action@v2.1.0
-      with:
-          # Comma-separated list of files to upload
-          files: ${{ env.CODE_COVERAGE_PATH }}
-      
-    - name: Create Changelog (on Tag)
-      run: |
-        if ($env:IS_RELEASE -eq 'true') 
-        {
-            auto-changelog --sort-commits date --hide-credit --template keepachangelog --commit-limit false --unreleased --starting-version "$env:RELEASE_TAG" --output "$env:CHANGELOG_PATH"
-        }
-        else 
-        {
-            auto-changelog --sort-commits date --hide-credit --template keepachangelog --commit-limit false --unreleased --output "$env:CHANGELOG_PATH"
-        }
-        
     - name: Upload NuGet Package Artifact
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       with:
         # Artifact name
         name: NuGet Packages
         # A file, directory or wildcard pattern that describes what to upload
         path: |
           ${{ env.RELOADED_HOOKS_NUPKG_GLOB }}
           ${{ env.RELOADED_HOOKS_DEFINITIONS_NUPKG_GLOB }}
-        
-    - name: Upload Changelog Artifact
-      uses: actions/upload-artifact@v2.2.4
-      with:
-        # Artifact name
-        name: Changelog
-        # A file, directory or wildcard pattern that describes what to upload
-        path: ${{ env.CHANGELOG_PATH }}
-        retention-days: 0
-        
-        
-    - name: Upload to GitHub Releases
-      uses: softprops/action-gh-release@v0.1.14
-      if: env.IS_RELEASE == 'true'
-      with:
-        # Path to load note-worthy description of changes in release from
-        body_path: ${{ env.CHANGELOG_PATH }}
-        # Newline-delimited list of path globs for asset files to upload
-        files: |
-          ${{ env.RELOADED_HOOKS_NUPKG_GLOB }}
-          ${{ env.RELOADED_HOOKS_DEFINITIONS_NUPKG_GLOB }}
-          ${{ env.CHANGELOG_PATH }}
-        
+
     - name: Upload to NuGet (on Tag)
       env: 
         NUGET_KEY: ${{ secrets.NUGET_KEY }}

.gitignore

@@ -216,3 +216,5 @@ FakesAssemblies/
 **/*.Server/GeneratedArtifacts
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
+
+.idea/

source/Reloaded.Hooks/Reloaded.Hooks.csproj

@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net5.0;netstandard2.0</TargetFrameworks>
-    <Authors>Sewer56, goaaats</Authors>
+    <Authors>Sewer56, goatcorp Contributors</Authors>
     <LangVersion>preview</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageId>goaaats.Reloaded.Hooks</PackageId>
+    <PackageId>goatcorp.Reloaded.Hooks</PackageId>
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/goatcorp/Reloaded.Hooks</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <RepositoryUrl>https://github.com/goatcorp/Reloaded.Hooks</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Advanced native function hooks for x86, x64. Welcome to the next level!</Description>
-    <Version>4.2.0-goat.4</Version>
+    <Version>4.2.0-goatcorp1</Version>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageIcon>Icon.png</PackageIcon>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -29,11 +29,11 @@
 
   <ItemGroup>
     <PackageReference Include="Iced" Version="1.17.0" />
-    <PackageReference Include="goaaats.Reloaded.Assembler" Version="1.0.14-goat.2">
+    <PackageReference Include="goatcorp.Reloaded.Assembler" Version="1.0.14-goatcorp3">
       <IncludeAssets>All</IncludeAssets>
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Reloaded.Memory.Buffers" Version="2.0.0" />
+    <PackageReference Include="goatcorp.Reloaded.Memory.Buffers" Version="2.0.0-goatcorp6" />
   </ItemGroup>
 
   <ItemGroup>

source/Reloaded.Hooks/X64/Wrapper.cs

@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Reloaded.Hooks.Definitions.Helpers;
 using Reloaded.Hooks.Definitions.X64;
-using Reloaded.Hooks.Internal;
 using Reloaded.Hooks.Tools;
-
-using Reloaded.Hooks.Definitions.Structs;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Reloaded.Hooks.X64
 {
@@ -160,7 +157,7 @@ public static nuint Create<
                     assemblyCode.Add($"mov {toConvention.ReturnRegister}, {fromConvention.ReturnRegister}");
 
                 // Callee Restore Registers
-                foreach (var register in toConvention.CalleeSavedRegisters.Reverse())
+                foreach (var register in toConvention.CalleeSavedRegisters.AsEnumerable().Reverse())
                     assemblyCode.Add($"pop {register}");
 
                 assemblyCode.Add("pop rbp");

source/Reloaded.Hooks/X86/Wrapper.cs

@@ -150,7 +150,7 @@ public static nuint Create<
                     assemblyCode.Add($"mov {toConvention.ReturnRegister}, {fromConvention.ReturnRegister}");
 
                 // Callee Restore Registers
-                foreach (var register in toConvention.CalleeSavedRegisters.Reverse())
+                foreach (var register in toConvention.CalleeSavedRegisters.AsEnumerable().Reverse())
                     assemblyCode.Add($"pop {register}");
 
                 assemblyCode.Add("pop ebp");