From 91d25088a314c67c63e06385ad89da4e61608636 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Fri, 17 Jul 2020 15:38:30 -0600 Subject: [PATCH 1/5] add 'destinationLists' object to merge method --- .../Pepperdash Core/Config/PortalConfigReader.cs | 6 ++++++ 1 file changed, 6 insertions(+) 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) From cf21ae888aff8a4b86168fe5598ebfdcecd5929e Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 10:59:57 -0600 Subject: [PATCH 2/5] adding nuget.org publishing --- .github/workflows/docker.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bf0a9d4..d0ee7a2 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 source + run: nuget sources add -name nuget -source https://api.nuget.org/v3/index.json -key ${{ 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 nuget # This step always runs and pushes the build to the internal build rep Internal_Push_Output: needs: Build_Project From 082c24882dcd564780595681e635542b46ccbdaf Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 11:18:58 -0600 Subject: [PATCH 3/5] fix for nuget source command --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d0ee7a2..8d60ca7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -145,7 +145,7 @@ jobs: - 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 source - run: nuget sources add -name nuget -source https://api.nuget.org/v3/index.json -key ${{ secrets.NUGET_API_KEY }} + run: nuget sources add -name nuget -source https://api.nuget.org/v3/index.json -username andrew-welker -password ${{ secrets.NUGET_API_KEY }} - name: Create nuget package run: nuget pack "./PepperDash_Core.nuspec" -version ${{ env.VERSION }} - name: Publish nuget package to Github registry From 3c6eb034332ada41beea8586dfedac32b4abb907 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 22:33:24 -0600 Subject: [PATCH 4/5] add API Key --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8d60ca7..17fcebf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -144,14 +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 source - run: nuget sources add -name nuget -source https://api.nuget.org/v3/index.json -username andrew-welker -password ${{ secrets.NUGET_API_KEY }} + - 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 nuget + 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 From 25048448762aa1be76218f3f18c12684548eab28 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 23:00:14 -0600 Subject: [PATCH 5/5] rename master -> main & add nuget push --- .github/workflows/{master.yml => main.yml} | 4 ++++ 1 file changed, 4 insertions(+) rename .github/workflows/{master.yml => main.yml} (97%) 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