diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index e4b488d..d04a5d3 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -70,13 +70,17 @@ jobs: dotnet publish Plugin/windows/windows.csproj -c Release -o p/windows dotnet publish Plugin/main/main.csproj -c Release -o p/main + cmd /c 7z a -tzip HIC.Rdmp.HicPlugin.Plugin.${{ steps.version.outputs.version }}.rdmp plugin.nuspec p + dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file HIC.Rdmp.HicPlugin.Plugin.${{ steps.version.outputs.version }}.rdmp --dir yaml cmd /c 7z a -tzip HIC.Rdmp.HicPlugin.Plugin.${{ steps.version.outputs.version }}.nupkg plugin.nuspec p dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file HIC.Rdmp.HicPlugin.Plugin.${{ steps.version.outputs.version }}.nupkg --dir yaml dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- cmd listsupportedcommands --dir yaml - name: Store created nupkg files uses: actions/upload-artifact@v4 with: - path: ./*.nupkg + path: | + ./*.rdmp + ./*.nupkg retention-days: 1 - name: Upload release binaries if: contains(github.ref,'refs/tags/') @@ -84,4 +88,5 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ github.ref }} - file: 'HIC.Rdmp.HicPlugin.Plugin.${{ steps.version.outputs.version }}.nupkg' + file_glob: true + file: 'HIC.Rdmp.HicPlugin.Plugin.${{ steps.version.outputs.version }}.*' diff --git a/DrsPlugin/Extraction/ImageExtraction.cs b/DrsPlugin/Extraction/ImageExtraction.cs index 13ddb8e..e41e229 100644 --- a/DrsPlugin/Extraction/ImageExtraction.cs +++ b/DrsPlugin/Extraction/ImageExtraction.cs @@ -1,4 +1,5 @@ using Rdmp.Core.Curation.Data; +using Rdmp.Core.Curation.Data.DataLoad; using Rdmp.Core.DataExport.DataExtraction.Commands; using Rdmp.Core.DataFlowPipeline; using Rdmp.Core.DataFlowPipeline.Requirements; @@ -6,6 +7,7 @@ using Rdmp.Core.ReusableLibraryCode.Progress; using System; using System.Data; +using System.Linq; using System.Text.RegularExpressions; namespace DrsPlugin.Extraction; @@ -60,8 +62,7 @@ public void PreInitialize(IExtractCommand request, IDataLoadEventListener listen if (Request.ColumnsToExtract is null) throw new InvalidOperationException("The request must contain a list of ColumnsToExtract (even if empty)"); - - if (Request.Catalogue.LoadMetadata is null) + if (Request.Catalogue.CatalogueRepository is not null && !Request.Catalogue.CatalogueRepository.GetAllObjects().Where(l =>l.CatalogueID == Request.Catalogue.ID).Any()) listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "The request has no associated metadata file. You may need to add a Data Load Configuration if you intend to extract the image files.")); //May be able to get rid of this warning entirely } diff --git a/GoDartsPluginUI/CommandExecution/AtomicCommands/ExecuteCommandSetupGoFusionFromDatabase.cs b/GoDartsPluginUI/CommandExecution/AtomicCommands/ExecuteCommandSetupGoFusionFromDatabase.cs index a4ffc73..99fec24 100644 --- a/GoDartsPluginUI/CommandExecution/AtomicCommands/ExecuteCommandSetupGoFusionFromDatabase.cs +++ b/GoDartsPluginUI/CommandExecution/AtomicCommands/ExecuteCommandSetupGoFusionFromDatabase.cs @@ -171,7 +171,7 @@ private LoadMetadata CreateLoadMetadata(List importedCatalogues) foreach (var catalogue in importedCatalogues) { - ((Catalogue)catalogue).LoadMetadata_ID = lmd.ID; + lmd.LinkToCatalogue(catalogue); catalogue.LoggingDataTask = lmd.Name; catalogue.SaveToDatabase(); } diff --git a/RDMP/Directory.Packages.props b/RDMP/Directory.Packages.props index 9044a6d..4a76892 100644 --- a/RDMP/Directory.Packages.props +++ b/RDMP/Directory.Packages.props @@ -11,7 +11,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/README.md b/README.md index 22e654d..190e2cd 100644 --- a/README.md +++ b/README.md @@ -29,15 +29,15 @@ You can build this plugin ready for upload to an RDMP instance using: ```bash dotnet publish -p:DebugType=embedded -p:GenerateDocumentation=false Plugin/windows/windows.csproj -c Release -o p/windows dotnet publish -p:DebugType=embedded -p:GenerateDocumentation=false Plugin/main/main.csproj -c Release -o p/main -7z a -tzip Rdmp.Hic.Plugin.6.1.0.nupkg hicplugin.nuspec p -dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file Rdmp.Hic.Plugin.6.1.0.nupkg --dir yaml +7z a -tzip Rdmp.Hic.Plugin.6.1.0.rdmp hicplugin.nuspec p +dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file Rdmp.Hic.Plugin.6.1.0.rdmp --dir yaml ``` -Once built you will have a file called `Rdmp.Hic.Plugin.6.1.0.nupkg` +Once built you will have a file called `Rdmp.Hic.Plugin.6.1.0.rdmp` Upload it to RDMP using ```bash -./rdmp pack -p -f Z:\Repos\HICPlugin\Rdmp.Hic.Plugin.6.1.0.nupkg +./rdmp pack -p -f Z:\Repos\HICPlugin\Rdmp.Hic.Plugin.6.1.0.rdmp ``` _Upload into RDMP. Or use the gui client 'Plugins' node under the Tables(Advanced) toolbar button_ diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 9b34c37..ff05687 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -10,6 +10,6 @@ [assembly: AssemblyCulture("")] // These should be overwritten by release builds -[assembly: AssemblyVersion("6.1.3")] -[assembly: AssemblyFileVersion("6.1.3")] -[assembly: AssemblyInformationalVersion("6.1.3")] +[assembly: AssemblyVersion("6.1.4")] +[assembly: AssemblyFileVersion("6.1.4")] +[assembly: AssemblyInformationalVersion("6.1.4")]