Skip to content

Commit aec88a3

Browse files
fix conflict issues
1 parent 7d5b105 commit aec88a3

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

src/LCT.Common.UTests/FolderActionTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public void CopyToTargetDirectory_PassingDirsWithFiles_ReturnSuccess()
7474
{
7575
//Arrange
7676
string sourcePath = $"{Path.GetTempPath()}\\SampleFolder";
77-
System.IO.Directory.CreateDirectory(sourcePath);
78-
System.IO.Directory.CreateDirectory(sourcePath +"\\SampleSubFolder");
77+
Directory.CreateDirectory(sourcePath);
78+
Directory.CreateDirectory(sourcePath +"\\SampleSubFolder");
7979
File.WriteAllText(sourcePath + "\\Sample.txt", "");
8080
string targetPath = $"{Path.GetTempPath()}/targetPath/";
8181
var folderAction = new FolderAction();

src/LCT.Common/CommonAppSettings.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,10 @@ public string InputFolder
229229
set
230230
{
231231
if (!AppDomain.CurrentDomain.FriendlyName.Contains("SW360PackageCreator") &&
232-
!AppDomain.CurrentDomain.FriendlyName.Contains("ArtifactoryUploader"))
232+
!AppDomain.CurrentDomain.FriendlyName.Contains("ArtifactoryUploader"))
233233
{
234234
folderAction.ValidateFolderPath(value);
235235
m_InputFolder = value;
236-
}else if (AppDomain.CurrentDomain.FriendlyName.Contains("SW360PackageCreator") ||
237-
AppDomain.CurrentDomain.FriendlyName.Contains("ArtifactoryUploader"))
238-
{
239-
_fileOperations.ValidateFilePath(value);
240-
m_InputFolder = value;
241236
}
242237
}
243238
}

0 commit comments

Comments
 (0)