Changed: Paths in Reloaded Build Script. Don't rely on working-direct…

…ory. Changed: Changelog path in Reloaded Build Script is now Full Path Also build NuGet package for interfaces.
Reloaded-Project · Jun 16, 2022 · bc3cd78 · bc3cd78
1 parent 092eadb
commit bc3cd78
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/reloaded.yml b/.github/workflows/reloaded.yml
@@ -23,14 +23,14 @@ on:
   workflow_dispatch:
 
 env: 
-  PUBLISH_COMMON_PATH: ./External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/
+  PUBLISH_COMMON_PATH: './External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/'
 
-  PUBLISH_GAMEBANANA_PATH: ./External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/GameBanana
-  PUBLISH_GITHUB_PATH: ./External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/Generic
-  PUBLISH_NUGET_PATH: ./External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/NuGet
+  PUBLISH_GAMEBANANA_PATH: './External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/GameBanana'
+  PUBLISH_GITHUB_PATH: './External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/Generic'
+  PUBLISH_NUGET_PATH: './External/Reloaded.Memory.SigScan.ReloadedII/Publish/ToUpload/NuGet'
 
-  PUBLISH_CHANGELOG_PATH: ./External/Reloaded.Memory.SigScan.ReloadedII/Publish/Changelog.md
-  PUBLISH_PATH: ./External/Reloaded.Memory.SigScan.ReloadedII/Publish
+  PUBLISH_CHANGELOG_PATH: './External/Reloaded.Memory.SigScan.ReloadedII/Publish/Changelog.md'
+  PUBLISH_PATH: './External/Reloaded.Memory.SigScan.ReloadedII/Publish'
 
   # Default value is official Reloaded package server.  
   NUGET_URL: http://packages.sewer56.moe:5000/v3/index.json
@@ -44,7 +44,6 @@ jobs:
     defaults:
       run:
         shell: pwsh
-        working-directory: './External/Reloaded.Memory.SigScan.ReloadedII'
 
     steps:
     - uses: actions/checkout@v2
@@ -81,7 +80,7 @@ jobs:
         }
         
     - name: Build
-      run: ./Publish.ps1 -ChangelogPath "$env:PUBLISH_CHANGELOG_PATH"
+      run: ./External/Reloaded.Memory.SigScan.ReloadedII/Publish.ps1 -ChangelogPath "$env:PUBLISH_CHANGELOG_PATH"
 
     - name: Upload GitHub Release Artifact
       uses: actions/[email protected]
@@ -123,8 +122,6 @@ jobs:
       uses: softprops/[email protected]
       if: env.IS_RELEASE == 'true'
       with:
-        # Path to load note-worthy description of changes in release from
-        append_body: true
         # Newline-delimited list of path globs for asset files to upload
         files: |
           ${{ env.PUBLISH_GITHUB_PATH }}/*

diff --git a/...Memory.SigScan.ReloadedII.Interfaces/Reloaded.Memory.SigScan.ReloadedII.Interfaces.csproj b/...Memory.SigScan.ReloadedII.Interfaces/Reloaded.Memory.SigScan.ReloadedII.Interfaces.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -13,9 +13,10 @@
     <PackageProjectUrl>https://github.com/Reloaded-Project/Reloaded.Memory.SigScan</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Reloaded-Project/Reloaded.Memory.SigScan</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <PackageIconUrl>https://avatars1.githubusercontent.com/u/45473408</PackageIconUrl>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/External/Reloaded.Memory.SigScan.ReloadedII/Publish.ps1 b/External/Reloaded.Memory.SigScan.ReloadedII/Publish.ps1
@@ -193,6 +193,7 @@ $reloadedToolsPath = "./Publish/Tools/Reloaded-Tools"    # Used to check if tool
 $updateToolsPath   = "./Publish/Tools/Update-Tools"      # Used to check if update tools are installed.
 $reloadedToolPath = "$reloadedToolsPath/Reloaded.Publisher.exe"  # Path to Reloaded publishing tool.
 $updateToolPath   = "$updateToolsPath/Sewer56.Update.Tool.dll" # Path to Update tool.
+$changelogFullPath = $([System.IO.Path]::GetFullPath($ChangelogPath))
 
 ## => Script <= ##
 # Set Working Directory
@@ -299,7 +300,7 @@ function Get-Common-Publish-Args {
 
 	$arguments = "--modfolder `"$publishBuildDirectory`" --packagename `"$PackageName`""
 	if ($ChangelogPath) {
-        $arguments += " --changelogpath `"$ChangelogPath`""
+        $arguments += " --changelogpath `"$changelogFullPath`""
 	}
 
 	if ($AllowDeltas -and $MakeDelta) {