pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-14 12:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82 from PepperDash/bugfix/load-plugins-crash-with-no-plugins

Browse Source 
adds missing paren that was causing build error; closes #80
This commit is contained in:
Neil Dorin
2020-04-01 11:52:33 -06:00
committed by GitHub
parent aaf6d0a21a 661b3ef9f4
commit 294f2fd9ec
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/scripts/GenerateVersionNumber.ps1 vendored
View File

@@ -39,6 +39,10 @@ switch -regex ($Env:GITHUB_REF) {
$phase = 'hotfix' $phase = 'hotfix'
$newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
} }
'^refs\/heads\/bugfix\/*.' {
$phase = 'hotfix'
$newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
}
} }

1
.github/workflows/docker.yml vendored
View File

@@ -5,6 +5,7 @@ on:
branches: branches:
- feature/* - feature/*
- hotfix/* - hotfix/*
- bugfix/*
- release/* - release/*
- development - development

2
PepperDashEssentials/PluginLoading/PluginLoading.cs
View File

@@ -415,7 +415,7 @@ namespace PepperDash.Essentials
// Deal with any .cplz files // Deal with any .cplz files
UnzipAndMoveCplzArchives(); UnzipAndMoveCplzArchives();
if(Directory.Exists(_loadedPluginsDirectoryPath) { if(Directory.Exists(_loadedPluginsDirectoryPath)) {
// Load the assemblies from the loadedPlugins folder into the AppDomain // Load the assemblies from the loadedPlugins folder into the AppDomain
LoadPluginAssemblies(); LoadPluginAssemblies();