diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64bbd1d008..f46f014c78 100644 --- a/.github/workflows/build.yml +++ b/.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/actions-setup-perl@v1.24.3 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4530b93d38..5a3361270e 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Documentation/CodeTutorials/Packages.md b/Documentation/CodeTutorials/Packages.md index d324a70fb6..012f38744a 100644 --- a/Documentation/CodeTutorials/Packages.md +++ b/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| | diff --git a/Rdmp.Core/Rdmp.Core.csproj b/Rdmp.Core/Rdmp.Core.csproj index 9004595c84..52d9ebc75a 100644 --- a/Rdmp.Core/Rdmp.Core.csproj +++ b/Rdmp.Core/Rdmp.Core.csproj @@ -309,7 +309,7 @@ - + diff --git a/Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs b/Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs index 1be3fe6333..e36004b1cc 100644 --- a/Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs +++ b/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(); } diff --git a/Rdmp.UI/Rdmp.UI.csproj b/Rdmp.UI/Rdmp.UI.csproj index 66fe410b71..3b3f0493ab 100644 --- a/Rdmp.UI/Rdmp.UI.csproj +++ b/Rdmp.UI/Rdmp.UI.csproj @@ -49,9 +49,7 @@ - - diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index edd0c8e80a..d38a506be7 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-rc2")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("8.1.1")] \ No newline at end of file