Skip to content

Commit

Permalink
Merge pull request #97 from HicServices/task/RDMP-153-migrate-plugin-ext
Browse files Browse the repository at this point in the history
Task/RDMP-153 migrate to .rdmp Extention
  • Loading branch information
JFriel authored Apr 8, 2024
2 parents f8d7c2b + b8b2404 commit dba93cd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,23 @@ jobs:
dotnet publish -p:DebugType=embedded -p:GenerateDocumentation=false Plugin/main/main.csproj -c Release -o p/main
rm p/windows/windows.dll
rm p/main/main.dll
cmd /c 7z a -tzip HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.rdmp plugin.nuspec p
dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.rdmp --dir yaml
cmd /c 7z a -tzip HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.nupkg plugin.nuspec p
dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file HIC.Rdmp.Extensions.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
- name: Store created rdmp 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/')
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ github.ref }}
file: 'HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.nupkg'
file_glob: true
file: 'HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.*'
2 changes: 1 addition & 1 deletion RDMP
Submodule RDMP updated 79 files
+4 −2 .github/workflows/build.yml
+2 −2 AnalysisReport.sarif
+33 −0 CHANGELOG.md
+6 −7 Directory.Packages.props
+0 −1 Documentation/CodeTutorials/Packages.md
+ Documentation/DataLoadEngine/Images/SQL_bak_files.PNG
+15 −0 Documentation/DataLoadEngine/SQLBakFiles.md
+1 −1 HIC.DataManagementPlatform.sln
+9 −15 Rdmp.Core.Tests/CommandExecution/ExecuteCommandConfirmLogsTests.cs
+4 −4 Rdmp.Core.Tests/CommandExecution/TestExecuteCommandAssociateCatalogueWithLoadMetadata.cs
+4 −2 Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndCacheTest.cs
+2 −3 Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLETest.cs
+5 −6 Rdmp.Core.Tests/Curation/ImportTests/GatherAndShareTests.cs
+2 −2 Rdmp.Core.Tests/Curation/ImportTests/ShareLoadMetadataTests.cs
+70 −0 Rdmp.Core.Tests/Curation/Integration/LoadMetadataLinkageTests.cs
+5 −9 Rdmp.Core.Tests/Curation/Integration/MetadataLoggingConfigurationChecksTests.cs
+1 −2 Rdmp.Core.Tests/DataLoad/Engine/Integration/CheckingTests/ProcessTaskCheckingTests.cs
+1 −2 Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseMergeCommandTest.cs
+1 −2 Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadEngineTestsBase.cs
+1 −2 Rdmp.Core.Tests/DataLoad/Engine/Integration/HICPipelineTests.cs
+1 −2 Rdmp.Core.Tests/DataLoad/Engine/Integration/PayloadTest.cs
+2 −1 Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandImportAlreadyExistingCohort.cs
+4 −5 Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCatalogueWithLoadMetadata.cs
+4 −0 Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExternalDatabaseServer.cs
+1 −12 Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFileBasedProcessTask.cs
+4 −4 Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadMetadata.cs
+5 −6 Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestData.cs
+3 −7 Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueProjectSpecific.cs
+6 −2 Rdmp.Core/CommandExecution/GoToCommandFactory.cs
+3 −6 Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs
+1 −3 Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCatalogueEngine.cs
+12 −30 Rdmp.Core/Curation/Data/Catalogue.cs
+0 −1 Rdmp.Core/Curation/Data/DataLoad/ILoadMetadata.cs
+24 −0 Rdmp.Core/Curation/Data/DataLoad/ILoadMetadataCatalogueLinkage.cs
+7 −1 Rdmp.Core/Curation/Data/DataLoad/IProcessTask.cs
+18 −2 Rdmp.Core/Curation/Data/DataLoad/LoadMetadata.cs
+68 −0 Rdmp.Core/Curation/Data/DataLoad/LoadMetadataCatalogueLinkage.cs
+39 −2 Rdmp.Core/Curation/Data/DataLoad/ProcessTask.cs
+0 −8 Rdmp.Core/Curation/Data/ICatalogue.cs
+21 −4 Rdmp.Core/Curation/Data/ImportExport/ShareManager.cs
+24 −12 Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlBakFileRuntimeTask.cs
+6 −6 Rdmp.Core/DataLoad/Modules/DataFlowSources/ExcelDataFlowSource.cs
+16 −7 Rdmp.Core/Databases/CatalogueDatabase/runAfterCreateDatabase/CreateCatalogue.sql
+7 −0 Rdmp.Core/Databases/CatalogueDatabase/up/079_AddProcessTaskConfiguration.sql
+39 −0 Rdmp.Core/Databases/CatalogueDatabase/up/080_AllowMultipleCatalogueLoadMetadatas.sql
+12 −0 Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs
+6 −3 Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx
+2 −1 Rdmp.Core/Icons/IconProvision/RDMPConcept.cs
+ Rdmp.Core/Icons/LoadMetadataCatalogueLinkage.png
+21 −17 Rdmp.Core/Providers/CatalogueChildProvider.cs
+2 −2 Rdmp.Core/Providers/Nodes/LoadMetadataNodes/CatalogueUsedByLoadMetadataNode.cs
+4 −5 Rdmp.Core/Rdmp.Core.csproj
+7 −1 Rdmp.Core/Sharing/Dependency/Gathering/Gatherer.cs
+1 −1 Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTask.cs
+211 −0 Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlBakFileProcessTaskUI.Designer.cs
+128 −0 Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlBakFileProcessTaskUI.cs
+120 −0 Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlBakFileProcessTaskUI.resx
+101 −92 Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlProcessTaskUI.Designer.cs
+6 −1 Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlProcessTaskUI.cs
+25 −25 Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlProcessTaskUI.resx
+14 −10 Rdmp.UI/Menus/CatalogueMenu.cs
+25 −2 Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs
+5 −2 Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PipelineSelectionUIFactory.cs
+3 −2 Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs
+4 −3 Rdmp.UI/Rdmp.UI.csproj
+220 −201 Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.Designer.cs
+25 −2 Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs
+61 −1 Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.resx
+6 −11 Rdmp.UI/SimpleDialogs/Reports/GenerateTestDataUI.cs
+2 −1 Rdmp.UI/SimpleDialogs/WideMessageBox.cs
+3 −3 SharedAssemblyInfo.cs
+1 −2 Tests.Common/Scenarios/TestsRequiringA.cs
+1 −2 Tests.Common/Scenarios/TestsRequiringADle.cs
+1 −1 Tests.Common/Tests.Common.csproj
+15 −6 Tests.Common/UnitTests.cs
+0 −1 Tools/rdmp/rdmp.csproj
+1 −1 directory.build.props
+0 −9 wix/build.cmd
+0 −81 wix/rdmp.wxs
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,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.Extensions.Plugin.6.2.1.nupkg rdmpextension.nuspec p
dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file Rdmp.Extensions.Plugin.6.2.1.nupkg --dir yaml
7z a -tzip Rdmp.Extensions.Plugin.6.2.1.rdmp rdmpextension.nuspec p
dotnet run --project RDMP/Tools/rdmp/rdmp.csproj -c Release -- pack -p --file Rdmp.Extensions.Plugin.6.2.1.rdmp --dir yaml
```

Once built you will have a file called ` Rdmp.Extensions.Plugin.6.2.1.nupkg`. The last step (with the '-p' switch to the pack command) strips out all the duplicated DLLs which are already provided within RDMP.
Once built you will have a file called ` Rdmp.Extensions.Plugin.6.2.1.rdmp`. The last step (with the '-p' switch to the pack command) strips out all the duplicated DLLs which are already provided within RDMP.

Upload it to RDMP using

```bash
./rdmp pack -f Z:\Repos\RdmpExtensions\Rdmp.Extensions.Plugin.6.2.1.nupkg
./rdmp pack -f Z:\Repos\RdmpExtensions\Rdmp.Extensions.Plugin.6.2.1.rdmp
```
_Upload into RDMP. Or use the gui client 'Plugins' node under the Tables(Advanced) toolbar button_
6 changes: 3 additions & 3 deletions SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("6.2.3")]
[assembly: AssemblyFileVersion("6.2.3")]
[assembly: AssemblyInformationalVersion("6.2.3")]
[assembly: AssemblyVersion("6.2.4")]
[assembly: AssemblyFileVersion("6.2.4")]
[assembly: AssemblyInformationalVersion("6.2.4")]

0 comments on commit dba93cd

Please sign in to comment.