6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

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

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

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.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 Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

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

0.0

/Rdmp.Core/ReusableLibraryCode/AssemblyResolver.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;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;

namespace Rdmp.Core.ReusableLibraryCode;

/// <summary>
/// Create a resolver for when assemblies cannot be properly loaded through the usual mechanism
/// and the bindingredirect is not available.
/// </summary>
public static class AssemblyResolver
{
    private static Dictionary<string, Assembly> assemblyResolveAttempts = new();

    public static void SetupAssemblyResolver(params DirectoryInfo[] dirs)
    {
        AppDomain.CurrentDomain.AssemblyResolve += (sender, resolveArgs) =>
        {
            var assemblyInfo = resolveArgs.Name;
            var parts = assemblyInfo.Split(',');
            var name = parts[0];

            if (assemblyResolveAttempts.TryGetValue(assemblyInfo, out var expression))
                return expression;

            //start out assuming we cannot load it
            assemblyResolveAttempts.Add(assemblyInfo, null);

            foreach (var dir in dirs)
            {
                var dll = dir.EnumerateFiles($"{name}.dll").SingleOrDefault();
                if (dll != null)
                    return assemblyResolveAttempts[assemblyInfo] = LoadFile(dll); //cache and return answer
            }

            var assembly = AppContext.BaseDirectory;
            if (string.IsNullOrWhiteSpace(assembly))
                return null;

            var directoryInfo = new DirectoryInfo(assembly);
            var file = directoryInfo?.EnumerateFiles($"{name}.dll").FirstOrDefault();
            if (file == null)
                return null;

            return assemblyResolveAttempts[assemblyInfo] = Assembly.LoadFile(file.FullName); //cache and return answer
        };
    }

    public static Assembly LoadFile(FileInfo f)
    {
        try
        {
            return F1(f);
        }
        catch (FileLoadException)
        {
            //AssemblyLoadContext.Default.LoadFromAssemblyPath causes this Exception at runtime only
            return F2(f);
        }
    }

    private static Assembly F2(FileInfo f) => Assembly.LoadFile(f.FullName);

    private static Assembly F1(FileInfo f) => AssemblyLoadContext.Default.LoadFromAssemblyPath(f.FullName);
}

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	using System.Collections.Generic;
9	using System.IO;
10	using System.Linq;
11	using System.Reflection;
12	using System.Runtime.Loader;
13
14	namespace Rdmp.Core.ReusableLibraryCode;
15
16	/// <summary>
17	/// Create a resolver for when assemblies cannot be properly loaded through the usual mechanism
18	/// and the bindingredirect is not available.
19	/// </summary>
20	public static class AssemblyResolver
21	{
22	private static Dictionary<string, Assembly> assemblyResolveAttempts = new();	×
23
24	public static void SetupAssemblyResolver(params DirectoryInfo[] dirs)
25	{
26	AppDomain.CurrentDomain.AssemblyResolve += (sender, resolveArgs) =>	×
27	{	×
28	var assemblyInfo = resolveArgs.Name;	×
29	var parts = assemblyInfo.Split(',');	×
30	var name = parts[0];	×
31		×
32	if (assemblyResolveAttempts.TryGetValue(assemblyInfo, out var expression))	×
33	return expression;	×
34		×
35	//start out assuming we cannot load it	×
36	assemblyResolveAttempts.Add(assemblyInfo, null);	×
37		×
38	foreach (var dir in dirs)	×
39	{	×
40	var dll = dir.EnumerateFiles($"{name}.dll").SingleOrDefault();	×
41	if (dll != null)	×
42	return assemblyResolveAttempts[assemblyInfo] = LoadFile(dll); //cache and return answer	×
43	}	×
44		×
45	var assembly = AppContext.BaseDirectory;	×
46	if (string.IsNullOrWhiteSpace(assembly))	×
47	return null;	×
48		×
49	var directoryInfo = new DirectoryInfo(assembly);	×
50	var file = directoryInfo?.EnumerateFiles($"{name}.dll").FirstOrDefault();	×
51	if (file == null)	×
52	return null;	×
53		×
54	return assemblyResolveAttempts[assemblyInfo] = Assembly.LoadFile(file.FullName); //cache and return answer	×
55	};	×
56	}	×
57
58	public static Assembly LoadFile(FileInfo f)
59	{
60	try
61	{
62	return F1(f);	×
63	}
64	catch (FileLoadException)	×
65	{
66	//AssemblyLoadContext.Default.LoadFromAssemblyPath causes this Exception at runtime only
67	return F2(f);	×
68	}
69	}	×
70
71	private static Assembly F2(FileInfo f) => Assembly.LoadFile(f.FullName);	×
72
73	private static Assembly F1(FileInfo f) => AssemblyLoadContext.Default.LoadFromAssemblyPath(f.FullName);	×
74	}

HicServices / RDMP / 6245535001

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