From 179cd4ff29a67eea24cefbf20fa1b13415ddbd11 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Fri, 22 Apr 2022 16:06:40 -0300 Subject: [PATCH 1/4] File.CopyTo was not working when target is a shared on the network. --- .../dotnetframework/GxClasses/Domain/GXFileIO.cs | 16 ++++++++++++---- .../DotNetCoreUnitTest/DotNetCoreUnitTest.csproj | 3 ++- dotnet/test/DotNetUnitTest/FileIO/FileIOTests.cs | 10 ++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs b/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs index d902231d7..d94e5a9af 100644 --- a/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs +++ b/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs @@ -223,6 +223,7 @@ public void MoveTo(string desDirName) } public class GxFileInfo : IGxFileInfo { + private static readonly ILog log = log4net.LogManager.GetLogger(typeof(GxFileInfo)); FileInfo _file; string _baseDirectory; @@ -309,10 +310,17 @@ public string Separator public IGxFileInfo CopyTo(string filename, bool overwrite) { filename = FileUtil.NormalizeSource(filename, _baseDirectory); - - FileInfo targetFile = new FileInfo(filename); - if (!targetFile.Directory.Exists) - targetFile.Directory.Create(); + try + { + FileInfo targetFile = new FileInfo(filename); + if (targetFile.Directory!=null && !targetFile.Directory.Exists) + if (!targetFile.Directory.Exists) + targetFile.Directory.Create(); + } + catch (Exception ex) + { + GXLogging.Error(log, ex, "Error creating target directory for ", filename); + } return new GxFileInfo(_file.CopyTo(filename, overwrite)); } diff --git a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj index e532e5ef2..1040ea149 100644 --- a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj +++ b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj @@ -12,7 +12,8 @@ - + + diff --git a/dotnet/test/DotNetUnitTest/FileIO/FileIOTests.cs b/dotnet/test/DotNetUnitTest/FileIO/FileIOTests.cs index aec3fe67f..42d3f835f 100644 --- a/dotnet/test/DotNetUnitTest/FileIO/FileIOTests.cs +++ b/dotnet/test/DotNetUnitTest/FileIO/FileIOTests.cs @@ -13,6 +13,16 @@ public FileIOTests() Config.ConfigFileName = "client.exe.config"; } [Fact] + public void FileSharedToCopy() + { + string target = @"\\192.168.86.3\printer"; + GxFile f = new GxFile(); + f.Source = "Document.txt"; + f.Copy(target); + Assert.Equal(-1, f.ErrCode); + Assert.NotEqual(new NullReferenceException().Message, f.ErrDescription); + } + [Fact] public void FileSourceTest() { GxFileInfo fi = new GxFileInfo(string.Empty); From 7b7e6737913b5597c62da4c7ffcdef4cb90c7c55 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Fri, 22 Apr 2022 16:09:54 -0300 Subject: [PATCH 2/4] Remove unneeded line. --- dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs b/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs index d94e5a9af..8abbd48d3 100644 --- a/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs +++ b/dotnet/src/dotnetframework/GxClasses/Domain/GXFileIO.cs @@ -314,7 +314,6 @@ public IGxFileInfo CopyTo(string filename, bool overwrite) { FileInfo targetFile = new FileInfo(filename); if (targetFile.Directory!=null && !targetFile.Directory.Exists) - if (!targetFile.Directory.Exists) targetFile.Directory.Create(); } catch (Exception ex) From 65615447bdb3078f811e499b78f9c6079fee5fc7 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Fri, 22 Apr 2022 16:44:42 -0300 Subject: [PATCH 3/4] Remove unused format. --- dotnet/test/DotNetUnitTest/PDF/apdfbasictest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/test/DotNetUnitTest/PDF/apdfbasictest.cs b/dotnet/test/DotNetUnitTest/PDF/apdfbasictest.cs index f9817d286..066e57c81 100644 --- a/dotnet/test/DotNetUnitTest/PDF/apdfbasictest.cs +++ b/dotnet/test/DotNetUnitTest/PDF/apdfbasictest.cs @@ -75,7 +75,7 @@ void executePrivate( ) getPrinter().GxDrawText("Name", 183, Gx_line+83, 283, Gx_line+101, 0, 0, 0, 0) ; getPrinter().GxDrawBitMap("lamp.png", 411, Gx_line+33, 619, Gx_line+241) ; getPrinter().GxAttris("Microsoft Sans Serif", 8, false, false, false, false, 0, 0, 0, 0, 0, 255, 255, 255) ; - getPrinter().GxDrawText(StringUtil.RTrim( context.localUtil.Format( AV8htmlvar, "")), 22, Gx_line+122, 400, Gx_line+178, 0, 1, 0, 0) ; + getPrinter().GxDrawText(StringUtil.RTrim( AV8htmlvar), 22, Gx_line+122, 400, Gx_line+178, 0, 1, 0, 0) ; Gx_OldLine = Gx_line; Gx_line = (int)(Gx_line+193); /* Print footer for last page */ From bafa507614f2d38d9fcf14c05115d594ac1d6407 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Mon, 25 Apr 2022 10:06:14 -0300 Subject: [PATCH 4/4] Try to fix error on FileIOTests that happens only when running on git hub actions, iy may be due to shared resources between .NET and .NET framework. --- dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj index 1040ea149..f4299cd46 100644 --- a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj +++ b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj @@ -13,7 +13,6 @@ -