From 424db28839220c7170d3d8a05da0f40e588b889d Mon Sep 17 00:00:00 2001
From: James Friel <jfriel001@dundee.ac.uk>
Date: Thu, 23 Nov 2023 15:07:56 +0000
Subject: [PATCH] Task/update plugin bundling (#1678)

* attempt to wget dicom plugin

* improved looping for plugins

* update script

* add to bundle

* update build

* add charts

* update changelog

* remove bad files

* improve build

* add verbose curl

* temp diable tests

* attempt to simplify build

* readd tests

---------

Co-authored-by: James A Sutherland <j.a.sutherland@dundee.ac.uk>
---
 .github/workflows/build.yml | 19 +++++++++++++++++--
 CHANGELOG.md                |  5 +++--
 SharedAssemblyInfo.cs       |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 850234e007..eb91171a3a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,6 +107,21 @@ jobs:
           dotnet publish Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj -r win-x64 --self-contained -c Release -o PublishWinForms -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:IncludeNativeLibrariesForSelfExtract=true --verbosity minimal --nologo
           dotnet publish Tools/rdmp/rdmp.csproj -r win-x64 --self-contained -c Release -o PublishWindows -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:IncludeNativeLibrariesForSelfExtract=true --verbosity minimal --nologo
           dotnet publish Tools/rdmp/rdmp.csproj -r linux-x64 --self-contained -c Release -o PublishLinux -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true --verbosity minimal --nologo
+      - name: Install Plugins
+        shell: bash
+        run: |
+          for plugin in https://api.github.com/repos/SMI/RdmpDicom/releases/latest https://api.github.com/repos/HICServices/HicPlugin/releases/latest https://api.github.com/repos/HICServices/RdmpExtensions/releases/latest
+          do
+            PluginName="$(cut -d/ -f6 <<< $plugin)"
+            NAME="$(curl -s $plugin | grep "browser_download_url.*$PluginName.*nupkg" | cut -d : -f 2,3 | cut -d "\"" -f 2)"
+            echo $NAME
+            curl -OL  $NAME
+            for platform in PublishWindows PublishLinux PublishWinForms
+            do
+              cp *.nupkg $platform
+            done
+            rm *.nupkg
+          done
 
       - name: Sign
         shell: bash
@@ -119,11 +134,11 @@ jobs:
           mkdir -p dist
           cmd /c wix\\build.cmd ${{ steps.version.outputs.rdmpversion }}
           echo '"'$signtool'"' 'Sign  /f GitHubActionsWorkflow.pfx /fd sha256 /tr http://timestamp.digicert.com /td sha256 /p ${{ secrets.DIGICERT_PASSWORD }} dist/rdmp.msi' | cmd
-          (cd PublishWindows ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-win-x64.zip rdmp.exe NLog.config *.yaml | cmd)
+          (cd PublishWindows ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-win-x64.zip rdmp.exe NLog.config *.yaml *.nupkg | cmd)
           (cd PublishLinux ; echo 7z a -mx=0 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.zip . | cmd)
           mv PublishLinux rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux
           echo 7z a dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.tar rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux | cmd
-          (cd PublishWinForms ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-client.zip ResearchDataManagementPlatform.exe | cmd)
+          (cd PublishWinForms ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-client.zip ResearchDataManagementPlatform.exe *.nupkg | cmd)
 
       - name: Install Perl dependencies
         uses: shogo82148/actions-setup-perl@v1.24.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 425572477a..4530b93d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [8.1.1] - WIP
 
-...
-
 ### Changed
 
 - Improved file transfer (FTP/SFTP/FTPS) support
+- Improved Plugin Bundling
+- Add ability to bundle UI notifications from plugin pipeline components
+- Add ability to use .bak files as data load
 
 ## [8.1.0] - 2023-09-19
 
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
index 145e22c980..edd0c8e80a 100644
--- a/SharedAssemblyInfo.cs
+++ b/SharedAssemblyInfo.cs
@@ -12,4 +12,4 @@
 
 [assembly: AssemblyVersion("8.1.1")]
 [assembly: AssemblyFileVersion("8.1.1")]
-[assembly: AssemblyInformationalVersion("8.1.1-rc1")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("8.1.1-rc2")]
\ No newline at end of file