Merge branch 'develop' into feature/RDMP-113-datasets

.github/workflows/build.yml

@@ -126,20 +126,18 @@ jobs:
       - name: Sign
         shell: bash
         run: |
-          signtool=(/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/*/x64/signtool.exe)
-          signtool=${signtool[${#signtool[@]}-1]}
-          signtool=`echo $signtool | sed -e 's#^/c#c:#' | tr / \\\\`
-          echo ${{ secrets.DIGICERT_PFX }} | base64 --decode > GitHubActionsWorkflow.pfx
-          echo '"'$signtool'"' 'Sign  /f GitHubActionsWorkflow.pfx /fd sha256 /tr http://timestamp.digicert.com /td sha256 /p ${{ secrets.DIGICERT_PASSWORD }} PublishWindows/*.exe PublishWinForms/*.exe' | cmd
+          dotnet tool install --global AzureSignTool 
+          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v PublishWindows/rdmp.exe
+          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v PublishWinForms/ResearchDataManagementPlatform.exe
           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 *.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 *.nupkg | cmd)
 
+
       - name: Install Perl dependencies
         uses: shogo82148/[email protected]
         with:

CHANGELOG.md

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [8.1.1] - WIP
+## [8.1.1] - 2023-12-01
 
 ### Changed
 

Documentation/CodeTutorials/Packages.md

@@ -34,9 +34,7 @@
 | YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
 | SixLabors.ImageSharp | [GitHub](https://github.com/SixLabors/ImageSharp) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Platform-independent replacement for legacy Windows-only System.Drawing.Common | |
 | SixLabors.ImageSharp.Drawing | [GitHub](https://github.com/SixLabors/ImageSharp.Drawing) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Font handling for ImageSharp | |
-| System.Threading.AccessControl | [GitHub](https://github.com/dotnet/runtime) |[MIT](https://opensource.org/licenses/MIT) | Required by Scintilla for sync primitives |  |
 | System.Threading.ThreadPool | [GitHub](https://github.com/dotnet/corefx) |[MIT](https://opensource.org/licenses/MIT) | Required to compile native linux binaries |  |
-| System.Security.Permissions |[GitHub](https://github.com/dotnet/corefx) |[MIT](https://opensource.org/licenses/MIT) | Provides common types for Xml doc reading in UI code |  |
 | [AutoComplete Console](https://www.codeproject.com/Articles/1182358/Using-Autocomplete-in-Windows-Console-Applications) by Jasper Lammers | Embedded | [CPOL](https://www.codeproject.com/info/cpol10.aspx) | Provides interactive autocomplete in console input | |
 | System.Resources.Extensions | [GitHub](https://github.com/dotnet/corefx) | [MIT](https://opensource.org/licenses/MIT) | Allows [publishing with dotnet publish on machines with netcoreapp3.0 SDK installed](https://github.com/microsoft/msbuild/issues/4704#issuecomment-530034240) | |
 | Spectre.Console | [GitHub](https://github.com/spectreconsole/spectre.console) | [MIT](https://opensource.org/licenses/MIT) | Allows richer command line interactions| |

Rdmp.Core/Rdmp.Core.csproj

@@ -309,7 +309,7 @@
     <PackageReference Include="MongoDB.Driver" Version="2.22.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NPOI" Version="2.6.2" />
-    <PackageReference Include="NLog" Version="5.2.6" />
+    <PackageReference Include="NLog" Version="5.2.7" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.1" />
     <PackageReference Include="Spectre.Console" Version="0.48.0" />

Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs

@@ -7,7 +7,7 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Security;
+using System.Xml;
 using System.Xml.Linq;
 
 namespace Rdmp.Core.Reports.DublinCore;
@@ -105,7 +105,7 @@ public void WriteXml(Stream to)
     public void LoadFrom(XElement element)
     {
         if (element.Name != "metadata")
-            throw new XmlSyntaxException($"Expected metadata element but got {element}");
+            throw new XmlException($"Expected metadata element but got {element}");
 
         var descendants = element.Descendants().ToArray();
         Title = GetElement(descendants, "title", true);
@@ -137,7 +137,7 @@ private static string GetElement(XElement[] descendants, string tagLocalName, bo
             e.Name.LocalName.Equals(tagLocalName, StringComparison.CurrentCultureIgnoreCase));
 
         if (match == null)
-            return mandatory ? throw new XmlSyntaxException($"Failed to find mandatory tag {tagLocalName}") : null;
+            return mandatory ? throw new XmlException($"Failed to find mandatory tag {tagLocalName}") : null;
 
         return match.Value.Trim();
     }

Rdmp.UI/Rdmp.UI.csproj

@@ -49,9 +49,7 @@
     </PackageReference>
     <PackageReference Include="ObjectListView.Repack.NET6Plus" Version="2.9.4" />
     <PackageReference Include="Scintilla.NET" Version="5.3.2.9" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.1" />
     <PackageReference Include="VPKSoft.ScintillaLexers.NET" Version="1.1.16" />
     <PackageReference Include="WeCantSpell.Hunspell" Version="4.1.0" />
   </ItemGroup>

SharedAssemblyInfo.cs

@@ -12,4 +12,4 @@
 
 [assembly: AssemblyVersion("8.1.1")]
 [assembly: AssemblyFileVersion("8.1.1")]
-[assembly: AssemblyInformationalVersion("8.1.1-rc2")]
+[assembly: AssemblyInformationalVersion("8.1.1")]