From 76191cf6e51fbf0531fcc1fde764d6567652e4bb Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 14:46:08 -0700 Subject: [PATCH 1/9] adding changelog --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da6525a..4df1e2d 100644 --- a/README.md +++ b/README.md @@ -128,4 +128,15 @@ This will invoke the build script which will clean up the build folder (if it ex ```powershell Import-Module .\build\Modrify Import-Module .\build\Modrify.Skyrim -``` \ No newline at end of file +``` + +## Changelog + +### 0.0.4 + +- Updated to Mutagen 0.43.3 +- Added `-HeaderFlags` to `New-*Mod` cmdlets + +### 0.0.3 + +- Initial release \ No newline at end of file From 930cf212aa0d3e9af59d8b4a42ff78493efdfc7a Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 14:47:42 -0700 Subject: [PATCH 2/9] updating version --- Modrify.build.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Modrify.build.ps1 b/Modrify.build.ps1 index 85a1b7a..fc55e86 100644 --- a/Modrify.build.ps1 +++ b/Modrify.build.ps1 @@ -1,5 +1,5 @@ param ( - [version]$Version = '0.0.3', + [version]$Version = '0.0.4', [string]$NugetApiKey, [ValidateScript({ (Get-ChildItem "$PSScriptRoot/Modrify*" -Directory).Name -contains $_ @@ -103,7 +103,8 @@ task ModuleBuild Clean, dotnetBuild, GenerateFormats, DocBuild, { # Get exported functions if ($modules[$m].isSubModule) { $commands = & pwsh -NonInteractive -NoProfile -ExecutionPolicy Bypass -Command "`$PSStyle.OutputRendering = [System.Management.Automation.OutputRendering]::PlainText;gci '$basePath\build\Modrify\lib\*.dll' | %{Add-Type -Path `$_.FullName};gci '$($modules[$m].modulePath)\lib\*.dll' | %{Add-Type -Path `$_.FullName};Import-Module '$basePath\Build\Modrify\Modrify.dll';Import-Module '$($modules[$m].modulePath)\$m.dll';(Get-Command -Module $m).Name" - } else { + } + else { $commands = & pwsh -NonInteractive -NoProfile -ExecutionPolicy Bypass -Command "`$PSStyle.OutputRendering = [System.Management.Automation.OutputRendering]::PlainText;gci '$($modules[$m].modulePath)\lib\*.dll' | %{Add-Type -Path `$_.FullName};Import-Module '$($modules[$m].modulePath)\$m.dll';(Get-Command -Module $m).Name" } From 4bad5d04fabc29f1b8f00a44ea3fd19aa0bb0784 Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 14:48:11 -0700 Subject: [PATCH 3/9] enabling workflow --- .github/workflows/CI.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index d25c675..88068e8 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -8,8 +8,7 @@ on: jobs: CICD: - # Disabling build until GitHub runners support PS 7.3+ (.NET 7) - if: false + #if: false runs-on: ubuntu-latest steps: From f5b7e5cd9063bcd507401d710447b9b7061865eb Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 14:50:36 -0700 Subject: [PATCH 4/9] fixing output path --- Modrify.build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modrify.build.ps1 b/Modrify.build.ps1 index fc55e86..6957368 100644 --- a/Modrify.build.ps1 +++ b/Modrify.build.ps1 @@ -68,7 +68,7 @@ task dotnetBuild { $filesToSkip = if ($modules[$m].isSubModule) { Get-ChildItem "$PSScriptRoot\build\Modrify\lib\*.dll" } - Get-ChildItem "$($modules[$m].basePath)\bin\Debug\net7.0\publish\*.dll" | ForEach-Object { + Get-ChildItem "$($modules[$m].basePath)\bin\Debug\net8.0\publish\*.dll" | ForEach-Object { if ($filesToSkip.Name -notcontains $_.Name) { Copy-Item $_.FullName -Destination "$($modules[$m].modulePath)\lib\" -Force } From a0bacb3b68168f385ea4818f0f4dd409be89bdb0 Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 19:54:39 -0700 Subject: [PATCH 5/9] adding release --- Modrify.Fallout4/Mods.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modrify.Fallout4/Mods.cs b/Modrify.Fallout4/Mods.cs index a69fa19..165774d 100644 --- a/Modrify.Fallout4/Mods.cs +++ b/Modrify.Fallout4/Mods.cs @@ -76,7 +76,7 @@ public class NewFalloutMod : PSCmdlet protected override void ProcessRecord() { - IFallout4Mod mod = new Fallout4Mod(ModKey); + IFallout4Mod mod = new Fallout4Mod(ModKey, Release); if (HeaderFlag != null) { mod.ModHeader.Flags = (Fallout4ModHeader.HeaderFlag)HeaderFlag; From 9a773e63ef614b0bb5b4afa2826ae8b5a41c4004 Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 20:00:03 -0700 Subject: [PATCH 6/9] fixing winning context override --- Modrify.Fallout4/helpers/WinningContextOverridesHelper.cs | 2 +- .../helpers/WinningContextOverridesHelper_Generate.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modrify.Fallout4/helpers/WinningContextOverridesHelper.cs b/Modrify.Fallout4/helpers/WinningContextOverridesHelper.cs index 48c6232..205aca1 100644 --- a/Modrify.Fallout4/helpers/WinningContextOverridesHelper.cs +++ b/Modrify.Fallout4/helpers/WinningContextOverridesHelper.cs @@ -10,7 +10,7 @@ public static partial class Helpers { public static IEnumerable> WinningContextOverrides(string recordType) { - IGameEnvironment fge = GameEnvironment.Typical.Fallout4(); + IGameEnvironment fge = GameEnvironment.Typical.Fallout4(ModrifyConfig.TryGetEnvironment().GameRelease.ToFallout4Release()); switch (recordType) { case "GameSetting": diff --git a/Modrify.Fallout4/helpers/WinningContextOverridesHelper_Generate.ps1 b/Modrify.Fallout4/helpers/WinningContextOverridesHelper_Generate.ps1 index 48b50e2..495e3d3 100644 --- a/Modrify.Fallout4/helpers/WinningContextOverridesHelper_Generate.ps1 +++ b/Modrify.Fallout4/helpers/WinningContextOverridesHelper_Generate.ps1 @@ -11,7 +11,7 @@ namespace Modrify.Fallout4 { public static IEnumerable> WinningContextOverrides(string recordType) { - IGameEnvironmentfge = GameEnvironment.Typical.Fallout4(); + IGameEnvironment fge = GameEnvironment.Typical.Fallout4(ModrifyConfig.TryGetEnvironment().GameRelease.ToFallout4Release()); switch (recordType) { {cases} From 723b155bf423bbebcf765ca0ce9c1975ea9918d9 Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 20:04:36 -0700 Subject: [PATCH 7/9] updating to release path --- Modrify.build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modrify.build.ps1 b/Modrify.build.ps1 index 6957368..dfc5807 100644 --- a/Modrify.build.ps1 +++ b/Modrify.build.ps1 @@ -68,7 +68,7 @@ task dotnetBuild { $filesToSkip = if ($modules[$m].isSubModule) { Get-ChildItem "$PSScriptRoot\build\Modrify\lib\*.dll" } - Get-ChildItem "$($modules[$m].basePath)\bin\Debug\net8.0\publish\*.dll" | ForEach-Object { + Get-ChildItem "$($modules[$m].basePath)\bin\Release\net8.0\publish\*.dll" | ForEach-Object { if ($filesToSkip.Name -notcontains $_.Name) { Copy-Item $_.FullName -Destination "$($modules[$m].modulePath)\lib\" -Force } From 7dd111748d29e4a1227c9526c1ab158baf97c10d Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 20:42:43 -0700 Subject: [PATCH 8/9] updating versions --- Modrify.Fallout4/Modrify.Fallout4.psd1 | 2 +- Modrify.Skyrim/Modrify.Skyrim.psd1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modrify.Fallout4/Modrify.Fallout4.psd1 b/Modrify.Fallout4/Modrify.Fallout4.psd1 index ed16e24..a04204d 100644 --- a/Modrify.Fallout4/Modrify.Fallout4.psd1 +++ b/Modrify.Fallout4/Modrify.Fallout4.psd1 @@ -12,7 +12,7 @@ RootModule = 'Modrify.Fallout4.dll' # Version number of this module. - ModuleVersion = '0.0.3' + ModuleVersion = '0.0.4' # Supported PSEditions # CompatiblePSEditions = @() diff --git a/Modrify.Skyrim/Modrify.Skyrim.psd1 b/Modrify.Skyrim/Modrify.Skyrim.psd1 index 268b59c..cdde356 100644 --- a/Modrify.Skyrim/Modrify.Skyrim.psd1 +++ b/Modrify.Skyrim/Modrify.Skyrim.psd1 @@ -12,7 +12,7 @@ RootModule = 'Modrify.Skyrim.dll' # Version number of this module. - ModuleVersion = '0.0.3' + ModuleVersion = '0.0.4' # Supported PSEditions # CompatiblePSEditions = @() From ebda76deb2bf197d946edf115899ceeb5a8d304a Mon Sep 17 00:00:00 2001 From: Anthony Howell Date: Sun, 31 Mar 2024 20:43:10 -0700 Subject: [PATCH 9/9] adding requiredmodules back in --- Modrify.build.ps1 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Modrify.build.ps1 b/Modrify.build.ps1 index dfc5807..b464acc 100644 --- a/Modrify.build.ps1 +++ b/Modrify.build.ps1 @@ -117,13 +117,15 @@ task ModuleBuild Clean, dotnetBuild, GenerateFormats, DocBuild, { FunctionsToExport = $commands ModuleVersion = $version RequiredAssemblies = (Get-ChildItem "$($modules[$m].modulePath)\lib\*.dll" | ForEach-Object { "lib/$($_.Name)" }) - <#RequiredModules = @{ - ModuleName = 'Modrify' - RequiredVersion = [version]'0.0.1' - }#> + } + if ($modules[$m].isSubModule) { + $moduleManifestData['RequiredModules'] = @{ + ModuleName = 'Modrify' + RequiredVersion = $Version + } } if ($null -ne $preRelease) { - $moduleManifestData['Prerelease'] = $preRelease + #$moduleManifestData['Prerelease'] = $preRelease } if (Test-Path "$($modules[$m].modulePath)\$($modules[$m].moduleName).format.ps1xml") { $moduleManifestData['FormatsToProcess'] = "$($modules[$m].moduleName).format.ps1xml"