Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 14:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2413 from BlueBlock/fix_running_of_unit_tests

Browse Source 
Fix running of unit tests
This commit is contained in:
Dimitrij
2023-03-25 17:17:32 +00:00
committed by GitHub
parent d8f66a4188 c22971cf54
commit 0700b6573c
6 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ExternalConnectors/ExternalConnectors.csproj
View File

@@ -11,8 +11,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.106.5" />
<PackageReference Include="AWSSDK.EC2" Version="3.7.128.2" />
<PackageReference Include="AWSSDK.Core" Version="3.7.106.6" />
<PackageReference Include="AWSSDK.EC2" Version="3.7.128.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
</ItemGroup>

32
mRemoteNG/App/Logger.cs
View File

@@ -1,14 +1,11 @@
using System;
using System.IO;
using System.Reflection;
using System.Runtime.Versioning;
using System.Windows.Forms;
using log4net;
using log4net.Appender;
using log4net.Config;
using mRemoteNG.Properties;
// ReSharper disable ArrangeAccessorOwnerBody
using log4net.Repository;
namespace mRemoteNG.App
{
@@ -29,22 +26,27 @@ namespace mRemoteNG.App
private void Initialize()
{
XmlConfigurator.Configure(LogManager.CreateRepository("mRemoteNG"));
if (string.IsNullOrEmpty(Properties.OptionsNotificationsPage.Default.LogFilePath))
{
Properties.OptionsNotificationsPage.Default.LogFilePath = BuildLogFilePath();
}
SetLogPath(Properties.OptionsNotificationsPage.Default.LogToApplicationDirectory ? DefaultLogPath : Properties.OptionsNotificationsPage.Default.LogFilePath);
}
public void SetLogPath(string path)
{
var repository = LogManager.GetRepository("mRemoteNG");
ILoggerRepository repository = LogManager.GetRepository("mRemoteNG");
XmlConfigurator.Configure(repository, new FileInfo("log4net.config"));
var appenders = repository.GetAppenders();
IAppender[] appenders = repository.GetAppenders();
foreach (var appender in appenders)
{
var fileAppender = (RollingFileAppender)appender;
if (fileAppender == null || fileAppender.Name != "LogFileAppender") continue;
RollingFileAppender fileAppender = (RollingFileAppender)appender;
if (fileAppender is not { Name: "LogFileAppender" }) continue;
fileAppender.File = path;
fileAppender.ActivateOptions();
}
@@ -54,22 +56,26 @@ namespace mRemoteNG.App
private static string BuildLogFilePath()
{
var logFilePath = Runtime.IsPortableEdition ? GetLogPathPortableEdition() : GetLogPathNormalEdition();
var logFileName = Path.ChangeExtension(Application.ProductName, ".log");
string logFilePath = Runtime.IsPortableEdition ? GetLogPathPortableEdition() : GetLogPathNormalEdition();
string logFileName = Path.ChangeExtension(Application.ProductName, ".log");
if (logFileName == null) return "mRemoteNG.log";
var logFile = Path.Combine(logFilePath, logFileName);
string logFile = Path.Combine(logFilePath, logFileName);
return logFile;
}
private static string GetLogPathNormalEdition()
{
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
Application.ProductName);
return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName);
}
private static string GetLogPathPortableEdition()
{
return Application.StartupPath;
}
}
}

2
mRemoteNG/Config/Serializers/ConnectionSerializers/Sql/DataTableSerializer.cs
View File

@@ -52,7 +52,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Sql
return Serialize(rootNode);
}
catch (Exception ex)
catch (Exception)
{
return _dataTable;
}

6
mRemoteNG/mRemoteNG.csproj
View File

@@ -41,7 +41,7 @@
<WarningsAsErrors />
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<WarningLevel>7</WarningLevel>
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
<ResolveComReferenceSilent>False</ResolveComReferenceSilent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Portable|x64'">
<DefineConstants>DEBUG;PORTABLE</DefineConstants>
@@ -60,13 +60,13 @@
<WarningsAsErrors />
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<WarningLevel>7</WarningLevel>
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
<ResolveComReferenceSilent>False</ResolveComReferenceSilent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Installer|x64'">
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<Optimize>True</Optimize>
<WarningLevel>7</WarningLevel>
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
<ResolveComReferenceSilent>False</ResolveComReferenceSilent>
</PropertyGroup>
<ItemGroup>
<None Remove="buildenv.tmp" />

3
mRemoteNGSpecs/mRemoteNGSpecs.csproj
View File

@@ -19,8 +19,11 @@
<ItemGroup>
<PackageReference Include="Cucumber.Messages" Version="21.0.1" />
<PackageReference Include="Google.Protobuf" Version="3.22.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3" />
<PackageReference Include="NUnit.Runners" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />

1
mRemoteNGTests/mRemoteNGTests.csproj
View File

@@ -20,6 +20,7 @@
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3" />
<PackageReference Include="NUnit.Runners" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PrivateAssets>all</PrivateAssets>