7194961165

Committed 13 Dec 2023 12:07PM UTC coverage: 56.776% (-0.2%) from 57.013%

Build # 7194961165

Build Type

push

github

Committed by

web-flow

Commit Message

Merge Latest Release into main (#1702)

* Bump YamlDotNet from 13.3.1 to 13.4.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 13.3.1 to 13.4.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v13.3.1...v13.4.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump shogo82148/actions-setup-perl from 1.23.1 to 1.24.1

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.23.1 to 1.24.1.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](https://github.com/shogo82148/actions-setup-perl/compare/v1.23.1...v1.24.1)

---
updated-dependencies:
- dependency-name: shogo82148/actions-setup-perl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix checkbox issue

* improve confirmation text (#1639)

* improve confirmation text
* Loop tidyup, use var where possible

---------

Co-authored-by: jas88 <j.a.sutherland@dundee.ac.uk>

* correct typo in create logging sql (#1640)

* Feature/ci codescan (#1641)

* Move SecurityCodescan.VS2019 to run on Github CI alone, integrate results with CodeQL
* Remove SecurityCodescan from Packages.md, no longer used via Nuget

---------

Co-authored-by: James A Sutherland <j@sutherland.pw>

* hide source control when not available

* Remove old Plugin object bits, tidy up (#1636)

* Remove old Plugin object bits, tidy up

* Purge remaining bits of AllExpiredPluginsNode

* Fix plugin display name in tree

* Update CreateNewDataExtractionProjectUI.cs

Casting fix

* Feature/rdmp42 delete plugins (#1642)

* add ui plugin delete functionality

* Warning and inherita... (continued)

Run Details

10722 of 20351 branches covered (0.0%)

Branch coverage included in aggregate %.

215 of 789 new or added lines in 63 files covered. (27.25%)

39 existing lines in 16 files now uncovered.

30650 of 52518 relevant lines covered (58.36%)

7294.17 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/Rdmp.Core/ReusableLibraryCode/Extensions/VersionExtensions.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;

namespace Rdmp.Core.ReusableLibraryCode.Extensions;

public static class VersionExtensions
{
    /// <summary>
    /// Returns true if the two versions are idential up to the significant parts specified
    /// </summary>
    /// <param name="version">The version which depends on <paramref name="other"/> (can include short version e.g. "3.0" will have -1 for Build) </param>
    /// <param name="other">The full version</param>
    /// <param name="significantParts"></param>
    /// <returns></returns>
    public static bool IsCompatibleWith(this Version version, Version other, int significantParts) =>
        version.CompareTo(other, significantParts) == 0;

    /// <summary>
    /// Compares two versions but only up to the significant parts specified.
    /// </summary>
    /// <param name="version">The version which depends on <paramref name="otherVersion"/> (can include short version e.g. "3.0" will have -1 for Build) </param>
    /// <param name="otherVersion">The full version</param>
    /// <param name="significantParts"></param>
    /// <returns></returns>
    public static int CompareTo(this Version version, Version otherVersion, int significantParts)
    {
        if (version == null) throw new ArgumentNullException(nameof(version));
        if (otherVersion == null) return 1;

        if (version.Major != otherVersion.Major && significantParts >= 1)
            return version.Major > otherVersion.Major ? 1 : -1;

        if (version.Minor != otherVersion.Minor && version.Minor != -1 && significantParts >= 2)
            return version.Minor > otherVersion.Minor ? 1 : -1;

        if (version.Build != otherVersion.Build && version.Build != -1 && significantParts >= 3)
            return version.Build > otherVersion.Build ? 1 : -1;

        if (version.Revision != otherVersion.Revision && version.Revision != -1 && significantParts >= 4)
            return version.Revision > otherVersion.Revision ? 1 : -1;

        return 0;
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8
9	namespace Rdmp.Core.ReusableLibraryCode.Extensions;
10
11	public static class VersionExtensions
12	{
13	/// <summary>
14	/// Returns true if the two versions are idential up to the significant parts specified
15	/// </summary>
16	/// <param name="version">The version which depends on <paramref name="other"/> (can include short version e.g. "3.0" will have -1 for Build) </param>
17	/// <param name="other">The full version</param>
18	/// <param name="significantParts"></param>
19	/// <returns></returns>
20	public static bool IsCompatibleWith(this Version version, Version other, int significantParts) =>
UNCOV 21	version.CompareTo(other, significantParts) == 0;	×
22
23	/// <summary>
24	/// Compares two versions but only up to the significant parts specified.
25	/// </summary>
26	/// <param name="version">The version which depends on <paramref name="otherVersion"/> (can include short version e.g. "3.0" will have -1 for Build) </param>
27	/// <param name="otherVersion">The full version</param>
28	/// <param name="significantParts"></param>
29	/// <returns></returns>
30	public static int CompareTo(this Version version, Version otherVersion, int significantParts)
31	{
UNCOV 32	if (version == null) throw new ArgumentNullException(nameof(version));	×
UNCOV 33	if (otherVersion == null) return 1;	×
34
UNCOV 35	if (version.Major != otherVersion.Major && significantParts >= 1)	×
UNCOV 36	return version.Major > otherVersion.Major ? 1 : -1;	×
37
UNCOV 38	if (version.Minor != otherVersion.Minor && version.Minor != -1 && significantParts >= 2)	×
39	return version.Minor > otherVersion.Minor ? 1 : -1;	×
40
UNCOV 41	if (version.Build != otherVersion.Build && version.Build != -1 && significantParts >= 3)	×
42	return version.Build > otherVersion.Build ? 1 : -1;	×
43
UNCOV 44	if (version.Revision != otherVersion.Revision && version.Revision != -1 && significantParts >= 4)	×
45	return version.Revision > otherVersion.Revision ? 1 : -1;	×
46
UNCOV 47	return 0;	×
48	}
49	}

HicServices / RDMP / 7194961165

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous