diff options
author | Dimitrij <kvarkas@gmail.com> | 2022-05-13 03:55:18 +0300 |
---|---|---|
committer | Dimitrij <kvarkas@gmail.com> | 2022-05-13 03:55:18 +0300 |
commit | ace62c07beae0dbc8b271aa97e2ea0ebd744f947 (patch) | |
tree | 5b707021c12929d179d001c237e97ca35a43be0d | |
parent | ec2f3024b641b8c46438415facb5a73ea76ea016 (diff) |
lib update
-rw-r--r-- | ExternalConnectors/ExternalConnectors.csproj | 4 | ||||
-rw-r--r-- | mRemoteNG/Config/Import/RemoteDesktopManagerImporter.cs | 18 | ||||
-rw-r--r-- | mRemoteNG/mRemoteNG.csproj | 6 | ||||
-rw-r--r-- | mRemoteNGSpecs/mRemoteNGSpecs.csproj | 2 | ||||
-rw-r--r-- | mRemoteNGTests/mRemoteNGTests.csproj | 2 |
5 files changed, 17 insertions, 15 deletions
diff --git a/ExternalConnectors/ExternalConnectors.csproj b/ExternalConnectors/ExternalConnectors.csproj index e5410447..27d69072 100644 --- a/ExternalConnectors/ExternalConnectors.csproj +++ b/ExternalConnectors/ExternalConnectors.csproj @@ -11,8 +11,8 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="AWSSDK.Core" Version="3.7.10.11" /> - <PackageReference Include="AWSSDK.EC2" Version="3.7.66" /> + <PackageReference Include="AWSSDK.Core" Version="3.7.11.2" /> + <PackageReference Include="AWSSDK.EC2" Version="3.7.72" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> </ItemGroup> diff --git a/mRemoteNG/Config/Import/RemoteDesktopManagerImporter.cs b/mRemoteNG/Config/Import/RemoteDesktopManagerImporter.cs index d4e12de4..60158589 100644 --- a/mRemoteNG/Config/Import/RemoteDesktopManagerImporter.cs +++ b/mRemoteNG/Config/Import/RemoteDesktopManagerImporter.cs @@ -29,17 +29,19 @@ public class RemoteDesktopManagerImporter : IConnectionImporter<string> var dataProvider = new FileDataProvider(filePath); var csvString = dataProvider.Load(); - if (csvString.IsNullOrEmpty()) + if (string.IsNullOrEmpty(csvString)) + { + var csvDeserializer = new CsvConnectionsDeserializerRdmFormat(); + var connectionTreeModel = csvDeserializer.Deserialize(csvString); + + var rootContainer = new ContainerInfo { Name = Path.GetFileNameWithoutExtension(filePath) }; + rootContainer.AddChildRange(connectionTreeModel.RootNodes); + destinationContainer.AddChild(rootContainer); + } + else { Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "Unable to import file. File is empty."); return; } - - var csvDeserializer = new CsvConnectionsDeserializerRdmFormat(); - var connectionTreeModel = csvDeserializer.Deserialize(csvString); - - var rootContainer = new ContainerInfo { Name = Path.GetFileNameWithoutExtension(filePath) }; - rootContainer.AddChildRange(connectionTreeModel.RootNodes); - destinationContainer.AddChild(rootContainer); } }
\ No newline at end of file diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index e44cec82..75a60824 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -67,7 +67,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Castle.Core" Version="4.4.1" /> + <PackageReference Include="Castle.Core" Version="5.0.0" /> <PackageReference Include="ConsoleControl" Version="1.3.0" /> <PackageReference Include="Cucumber.Messages" Version="16.0.1" /> <PackageReference Include="DockPanelSuite" Version="3.1.0" /> @@ -78,7 +78,7 @@ <PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" /> <PackageReference Include="log4net" Version="2.0.14" /> <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" /> - <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1185.39" /> + <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1210.39" /> <PackageReference Include="MySql.Data" Version="8.0.29" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="ObjectListView" Version="2.7.1.5" /> @@ -86,7 +86,7 @@ <PackageReference Include="OpenCover" Version="4.7.1221" /> <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" /> <PackageReference Include="Renci.SshNet.Async" Version="1.4.0" /> - <PackageReference Include="ReportGenerator" Version="5.1.5" /> + <PackageReference Include="ReportGenerator" Version="5.1.6" /> <PackageReference Include="System.Data.Common" Version="4.3.0" /> <PackageReference Include="System.Data.SqlClient" Version="4.8.3" /> <PackageReference Include="System.DirectoryServices" Version="6.0.0" /> diff --git a/mRemoteNGSpecs/mRemoteNGSpecs.csproj b/mRemoteNGSpecs/mRemoteNGSpecs.csproj index c0aedb5c..5fee2939 100644 --- a/mRemoteNGSpecs/mRemoteNGSpecs.csproj +++ b/mRemoteNGSpecs/mRemoteNGSpecs.csproj @@ -24,7 +24,7 @@ <PackageReference Include="NUnit.Runners" Version="3.12.0" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" /> - <PackageReference Include="SpecFlow" Version="3.9.69" /> + <PackageReference Include="SpecFlow" Version="3.9.74" /> <PackageReference Include="SpecRun.Runner" Version="3.9.31" /> <PackageReference Include="System.Memory" Version="4.5.4" /> <PackageReference Include="System.Reflection.Emit" Version="4.7.0" /> diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj index c2433302..5b9a665c 100644 --- a/mRemoteNGTests/mRemoteNGTests.csproj +++ b/mRemoteNGTests/mRemoteNGTests.csproj @@ -15,7 +15,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" /> <PackageReference Include="NSubstitute" Version="4.3.0" /> <PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit.Console" Version="3.15.0" /> |