diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bf0a9d4..17fcebf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -144,10 +144,14 @@ jobs: uses: nuget/setup-nuget@v1 - 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 }} + - name: Add nuget.org API Key + run: nuget setApiKey ${{ secrets.NUGET_API_KEY }} - name: Create nuget package run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }} - name: Publish nuget package to Github registry 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 Internal_Push_Output: needs: Build_Project diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml similarity index 97% rename from .github/workflows/master.yml rename to .github/workflows/main.yml index eefdcde..b41e08c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/main.yml @@ -119,10 +119,14 @@ jobs: uses: nuget/setup-nuget@v1 - 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 }} + - name: Add nuget.org API Key + run: nuget setApiKey ${{ secrets.NUGET_API_KEY }} - name: Create nuget package run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }} - name: Publish nuget package to Github registry 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: needs: Build_Project runs-on: windows-latest diff --git a/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs b/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs index 01dc0af..e2756c5 100644 --- a/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs +++ b/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs @@ -93,6 +93,12 @@ namespace PepperDash.Core.Config else 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 // level anyway... if (template["tieLines"] != null)