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: 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.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; 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} 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 = @() diff --git a/Modrify.build.ps1 b/Modrify.build.ps1 index 85a1b7a..b464acc 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 $_ @@ -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\Release\net8.0\publish\*.dll" | ForEach-Object { if ($filesToSkip.Name -notcontains $_.Name) { Copy-Item $_.FullName -Destination "$($modules[$m].modulePath)\lib\" -Force } @@ -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" } @@ -116,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" 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