From c315498a282c97d64b0a07d5ba4ef4fa4657dd8f Mon Sep 17 00:00:00 2001 From: James Friel Date: Fri, 22 Mar 2024 14:04:53 +0000 Subject: [PATCH 1/3] migrate to .rdmp extention --- .github/workflows/dotnet-core.yml | 10 +++++----- README.md | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 146afe3..9989329 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -82,13 +82,13 @@ 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 }}.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 + 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 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 retention-days: 1 - name: Upload release binaries if: contains(github.ref,'refs/tags/') @@ -96,4 +96,4 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ github.ref }} - file: 'HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.nupkg' + file: 'HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.rdmp' diff --git a/README.md b/README.md index 45ff6ee..86b891a 100644 --- a/README.md +++ b/README.md @@ -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_ From 5ef2dd9f2c2b2ac140638a7d2b31add8b1f19ff2 Mon Sep 17 00:00:00 2001 From: James Friel Date: Mon, 8 Apr 2024 11:49:02 +0100 Subject: [PATCH 2/3] bump version --- .github/workflows/dotnet-core.yml | 9 +++++++-- RDMP | 2 +- SharedAssemblyInfo.cs | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 9989329..bdce8fc 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -84,11 +84,15 @@ jobs: 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 rdmp files uses: actions/upload-artifact@v4 with: - path: ./*.rdmp + path: | + ./*.rdmp + ./*.nupkg retention-days: 1 - name: Upload release binaries if: contains(github.ref,'refs/tags/') @@ -96,4 +100,5 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ github.ref }} - file: 'HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.rdmp' + file_glob: true + file: 'HIC.Rdmp.Extensions.Plugin.${{ steps.version.outputs.version }}.*' diff --git a/RDMP b/RDMP index 55fa1df..7285120 160000 --- a/RDMP +++ b/RDMP @@ -1 +1 @@ -Subproject commit 55fa1df55760b615f99aec2cd30cdcd7f4890916 +Subproject commit 72851208fc5be9e1979f15d5649efa0f1b6838fe diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 6d85a33..3cde316 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -9,6 +9,6 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("6.2.2")] -[assembly: AssemblyFileVersion("6.2.2")] -[assembly: AssemblyInformationalVersion("6.2.2")] +[assembly: AssemblyVersion("6.2.3")] +[assembly: AssemblyFileVersion("6.2.3")] +[assembly: AssemblyInformationalVersion("6.2.3")] From 372721ebd2fd53b4abcd1099282a83002f5fbc37 Mon Sep 17 00:00:00 2001 From: James Friel Date: Mon, 8 Apr 2024 12:55:18 +0100 Subject: [PATCH 3/3] bump shared assemblies --- SharedAssemblyInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 3cde316..9c8a8b3 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -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")]