pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-16 21:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into hotfix/ssh-issues

Browse Source
This commit is contained in:
Andrew Welker
2020-08-14 08:56:10 -06:00
parent a67baaa9c8 8e39c4b743
commit a8696b356d
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,10 +144,14 @@ jobs:
uses: nuget/setup-nuget@v1 uses: nuget/setup-nuget@v1
- name: Add Github Packages source - name: Add Github Packages source
run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
- name: Add nuget.org API Key
run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
- name: Create nuget package - name: Create nuget package
run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }} run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }}
- name: Publish nuget package to Github registry - name: Publish nuget package to Github registry
run: nuget push **/*.nupkg -source github run: nuget push **/*.nupkg -source github
- name: Publish nuget package to nuget.org
run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
# This step always runs and pushes the build to the internal build rep # This step always runs and pushes the build to the internal build rep
Internal_Push_Output: Internal_Push_Output:
needs: Build_Project needs: Build_Project

4
.github/workflows/master.yml → .github/workflows/main.yml vendored
View File

@@ -119,10 +119,14 @@ jobs:
uses: nuget/setup-nuget@v1 uses: nuget/setup-nuget@v1
- name: Add Github Packages source - name: Add Github Packages source
run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
- name: Add nuget.org API Key
run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
- name: Create nuget package - name: Create nuget package
run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }} run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }}
- name: Publish nuget package to Github registry - name: Publish nuget package to Github registry
run: nuget push **/*.nupkg -source github run: nuget push **/*.nupkg -source github
- name: Publish nuget package to nuget.org
run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
Internal_Push_Output: Internal_Push_Output:
needs: Build_Project needs: Build_Project
runs-on: windows-latest runs-on: windows-latest

6
Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs
View File

@@ -93,6 +93,12 @@ namespace PepperDash.Core.Config
else else
merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"], "sourceLists")); merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"], "sourceLists"));
if (system["destinationLists"] == null)
merged.Add("destinationLists", template["destinationLists"]);
else
merged.Add("destinationLists",
Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
// Template tie lines take precedence. Config tool doesn't do them at system // Template tie lines take precedence. Config tool doesn't do them at system
// level anyway... // level anyway...
if (template["tieLines"] != null) if (template["tieLines"] != null)

2
Readme.md
View File

@@ -1,5 +1,7 @@
# PepperDash Core (c) 2020 # PepperDash Core (c) 2020
## [Latest Release](https://github.com/PepperDash/PepperDashCore/releases/latest)
## License ## License
Provided under MIT license Provided under MIT license