MET08DDUPSFS6420 - v2.39.0 - Update references

Adaptation/FileHandlers/Dummy/FileRead.cs

@@ -220,61 +220,47 @@ public class FileRead : Shared.FileRead, IFileRead
     {
         try
         {
-            string pathSegment;
+            string sourceParentDirectory;
-            string monARessource;
+            string targetParentDirectory;
             DateTime dateTime = DateTime.Now;
-            if (!_FileConnectorConfiguration.TargetFileLocation.Contains(_FileConnectorConfiguration.SourceFileLocation))
+            if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.SourceFileLocation)))
-                throw new Exception("Target must start with source");
+                sourceParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation);
+            else
+                sourceParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation));
+            if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.TargetFileLocation)))
+                targetParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation);
+            else
+                targetParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation));
+            if (sourceParentDirectory != targetParentDirectory)
+                throw new Exception("Target and source must have the same parent for Si Dummy FileConnectorConfiguration!");
             bool check = dateTime.Hour > 7 && dateTime.Hour < 18 && dateTime.DayOfWeek != DayOfWeek.Sunday && dateTime.DayOfWeek != DayOfWeek.Saturday;
             if (!_IsEAFHosted || check)
             {
-                string checkSegment;
+                string monARessource;
-                string checkDirectory;
                 string sourceFileFilter;
                 string sourceArchiveFile;
-                string sourceFileLocation;
                 string weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
                 string traceDummyDirectory = Path.Combine(Path.GetPathRoot(_TracePath), "TracesDummy", _CellInstanceName, "Source", $"{dateTime:yyyy}___Week_{weekOfYear}");
                 if (!Directory.Exists(traceDummyDirectory))
                     _ = Directory.CreateDirectory(traceDummyDirectory);
                 string traceDummyFile = Path.Combine(traceDummyDirectory, $"{dateTime.Ticks} - {_CellInstanceName}.txt");
                 File.AppendAllText(traceDummyFile, string.Empty);
-                if (_FileConnectorConfiguration.SourceFileLocation.EndsWith("\\"))
-                    sourceFileLocation = _FileConnectorConfiguration.SourceFileLocation;
-                else
-                    sourceFileLocation = string.Concat(_FileConnectorConfiguration.SourceFileLocation, '\\');
                 for (int i = 0; i < _FileConnectorConfiguration.SourceFileFilters.Count; i++)
                 {
                     _LastDummyRunIndex += 1;
                     if (_LastDummyRunIndex >= _FileConnectorConfiguration.SourceFileFilters.Count)
                         _LastDummyRunIndex = 0;
                     sourceFileFilter = _FileConnectorConfiguration.SourceFileFilters[_LastDummyRunIndex];
-                    sourceArchiveFile = Path.GetFullPath(string.Concat(sourceFileLocation, sourceFileFilter));
+                    sourceArchiveFile = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, sourceFileFilter);
                     if (File.Exists(sourceArchiveFile))
                     {
-                        checkSegment = _FileConnectorConfiguration.TargetFileLocation.Substring(sourceFileLocation.Length);
-                        checkDirectory = Path.GetDirectoryName(sourceArchiveFile);
-                        for (int z = 0; z < int.MaxValue; z++)
-                        {
-                            if (checkDirectory.Length < sourceFileLocation.Length || !checkDirectory.StartsWith(sourceFileLocation))
-                                break;
-                            checkDirectory = Path.GetDirectoryName(checkDirectory);
-                            if (Directory.Exists(Path.Combine(checkDirectory, checkSegment)))
-                            {
-                                checkDirectory = Path.Combine(checkDirectory, checkSegment);
-                                break;
-                            }
-                        }
-                        if (!checkDirectory.EndsWith(checkSegment))
-                            throw new Exception("Could not determine dummy target directory for extract!");
                         if (!long.TryParse(Path.GetFileNameWithoutExtension(sourceArchiveFile).Replace("x", string.Empty), out long sequence))
                             throw new Exception("Invalid file name for source archive file!");
-                        pathSegment = checkDirectory.Substring(sourceFileLocation.Length);
+                        monARessource = GetCellName(sourceArchiveFile);
-                        monARessource = GetCellName(pathSegment);
                         if (string.IsNullOrEmpty(monARessource))
                             throw new Exception("Could not determine which cell archive file is associated with!");
                         if (_IsEAFHosted)
-                            CallbackFileExists(sourceArchiveFile, traceDummyFile, checkDirectory, monARessource, sequence);
+                            CallbackFileExists(sourceArchiveFile, traceDummyFile, _FileConnectorConfiguration.TargetFileLocation, monARessource, sequence);
                         break;
                     }
                 }

Adaptation/FileHandlers/pcl/FileRead.cs

@@ -20,7 +20,7 @@ public class FileRead : Shared.FileRead, IFileRead
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted)
     {
-        _MinFileLength = 10;
+        _MinFileLength = 15;
         _NullData = string.Empty;
         _Logistics = new Logistics(this);
         if (_FileParameter is null)

Adaptation/MET08DDUPSFS6420.Tests.csproj

@@ -6,6 +6,10 @@
         <SccLocalPath>SAK</SccLocalPath>
     </PropertyGroup>
     <PropertyGroup>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <LangVersion>10.0</LangVersion>
+        <Nullable>disable</Nullable>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

MET08DDUPSFS6420.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MET08DDUPSFS6420</RootNamespace>
     <AssemblyName>MET08DDUPSFS6420</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
@@ -147,14 +147,11 @@
     <Compile Include="Shared\Mapper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="External.Infineon.Yoda">
-      <Version>5.2.1</Version>
-    </PackageReference>
     <PackageReference Include="IKVM.AWT.WinForms">
       <Version>7.2.4630.5</Version>
     </PackageReference>
     <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.36.0</Version>
+      <Version>2.39.0</Version>
     </PackageReference>
     <PackageReference Include="Pdfbox">
       <Version>1.1.1</Version>