Infineon.EAF.Runtime 2.49.3
Directory Trigger for OI Viewer support tasks.json kanbn initialize WSRequest alignment
This commit is contained in:
parent
047e457905
commit
04039ec664
12
.gitignore
vendored
12
.gitignore
vendored
@ -331,11 +331,11 @@ ASALocalRun/
|
|||||||
##
|
##
|
||||||
## Visual Studio Code
|
## Visual Studio Code
|
||||||
##
|
##
|
||||||
*/!.vscode/extensions.json
|
**/.vscode/*
|
||||||
*/!.vscode/launch.json
|
!**/.vscode/extensions.json
|
||||||
*/!.vscode/settings.json
|
!**/.vscode/format-report.json
|
||||||
*/!.vscode/tasks.json
|
!**/.vscode/launch.json
|
||||||
*/.vscode/*
|
!**/.vscode/settings.json
|
||||||
*/.vscode/ReportGenerator/*
|
!**/.vscode/tasks.json
|
||||||
|
|
||||||
*.lnk
|
*.lnk
|
||||||
|
7
Adaptation/.kanbn/board.css
Normal file
7
Adaptation/.kanbn/board.css
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
.kanbn-task-data-workload {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.kanbn-task-data-relation {
|
||||||
|
display: block;
|
||||||
|
color: #198038;
|
||||||
|
}
|
21
Adaptation/.kanbn/index.md
Normal file
21
Adaptation/.kanbn/index.md
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
type: "kanbn"
|
||||||
|
created: 2023-07-07T15:37:56.040Z
|
||||||
|
updated: 2023-07-18T19:52:59.668Z
|
||||||
|
startedColumns:
|
||||||
|
- 'In Progress'
|
||||||
|
completedColumns:
|
||||||
|
- Done
|
||||||
|
dateFormat: mm/dd
|
||||||
|
taskTemplate: '^+^_${overdue ? ''^R'' : ''''}${name}^: ${relations ? (''\n^-^/^g'' + relations.reduce((accumulator, currentValue) => accumulator.task + currentValue.task + '' '', '''')) : ''''}'
|
||||||
|
---
|
||||||
|
|
||||||
|
# MET08RESISRP2100
|
||||||
|
|
||||||
|
## Backlog
|
||||||
|
|
||||||
|
## Todo
|
||||||
|
|
||||||
|
## In Progress
|
||||||
|
|
||||||
|
## Done
|
1
Adaptation/.vscode/format-report.json
vendored
Normal file
1
Adaptation/.vscode/format-report.json
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
[]
|
10
Adaptation/.vscode/launch.json
vendored
Normal file
10
Adaptation/.vscode/launch.json
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": ".NET Core Attach",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "attach",
|
||||||
|
"processId": 23636
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
49
Adaptation/.vscode/settings.json
vendored
Normal file
49
Adaptation/.vscode/settings.json
vendored
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
{
|
||||||
|
"[markdown]": {
|
||||||
|
"editor.wordWrap": "off"
|
||||||
|
},
|
||||||
|
"cSpell.words": [
|
||||||
|
"Argb",
|
||||||
|
"CICN",
|
||||||
|
"Consolas",
|
||||||
|
"datauniqueid",
|
||||||
|
"EQPT",
|
||||||
|
"headerid",
|
||||||
|
"Hmmssffff",
|
||||||
|
"ipdsf",
|
||||||
|
"ISMTP",
|
||||||
|
"messa",
|
||||||
|
"ntities",
|
||||||
|
"PDSF",
|
||||||
|
"Phares",
|
||||||
|
"RAWDATA",
|
||||||
|
"RESISRP",
|
||||||
|
"SRP2100",
|
||||||
|
"srpx",
|
||||||
|
"Tahoma",
|
||||||
|
"THFTIRQS",
|
||||||
|
"uctor"
|
||||||
|
],
|
||||||
|
"coverage-gutters.coverageBaseDir": "../../../../MET08THFTIRQS408M/05_TestResults/TestResults/**",
|
||||||
|
"workbench.colorCustomizations": {
|
||||||
|
"activityBar.activeBackground": "#158369",
|
||||||
|
"activityBar.activeBorder": "#51b0ce",
|
||||||
|
"activityBar.background": "#158369",
|
||||||
|
"activityBar.foreground": "#e7e7e7",
|
||||||
|
"activityBar.inactiveForeground": "#e7e7e799",
|
||||||
|
"activityBarBadge.background": "#d891ed",
|
||||||
|
"activityBarBadge.foreground": "#15202b",
|
||||||
|
"sash.hoverBorder": "#158369",
|
||||||
|
"statusBar.background": "#0e5746",
|
||||||
|
"statusBar.foreground": "#e7e7e7",
|
||||||
|
"statusBarItem.hoverBackground": "#158369",
|
||||||
|
"statusBarItem.remoteBackground": "#0e5746",
|
||||||
|
"statusBarItem.remoteForeground": "#e7e7e7",
|
||||||
|
"titleBar.activeBackground": "#0e5746",
|
||||||
|
"titleBar.activeForeground": "#e7e7e7",
|
||||||
|
"titleBar.inactiveBackground": "#0e574699",
|
||||||
|
"titleBar.inactiveForeground": "#e7e7e799",
|
||||||
|
"commandCenter.border": "#e7e7e799"
|
||||||
|
},
|
||||||
|
"peacock.color": "#0e5746"
|
||||||
|
}
|
82
Adaptation/.vscode/tasks.json
vendored
Normal file
82
Adaptation/.vscode/tasks.json
vendored
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"label": "Build",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"build",
|
||||||
|
"/property:GenerateFullPaths=true",
|
||||||
|
"/consoleloggerparameters:NoSummary"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Format",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"format",
|
||||||
|
"--report",
|
||||||
|
".vscode",
|
||||||
|
"--verbosity",
|
||||||
|
"detailed",
|
||||||
|
"--severity",
|
||||||
|
"warn"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Nuget Clear",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"nuget",
|
||||||
|
"locals",
|
||||||
|
"all",
|
||||||
|
"--clear"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "MSBuild for EAF Deployment Packages",
|
||||||
|
"command": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"/target:Build",
|
||||||
|
"/restore:True",
|
||||||
|
"/p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://localhost/v3/index.json",
|
||||||
|
"/detailedsummary",
|
||||||
|
"/consoleloggerparameters:PerformanceSummary;ErrorsOnly;",
|
||||||
|
"/property:Configuration=Debug;TargetFrameworkVersion=v4.8",
|
||||||
|
"../MET08RESISRP2100.csproj"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "File-Folder-Helper AOT s M .Kanbn Tasks",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "& L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net7.0/win-x64/publish/File-Folder-Helper.exe s M T:/MET08RESISRP2100/06_SourceCode/MET08RESISRP2100/Adaptation -s T:/MET08RESISRP2100/06_SourceCode/MET08RESISRP2100/Adaptation/.kanbn/tasks",
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Kanbn Console",
|
||||||
|
"type": "npm",
|
||||||
|
"script": "kanbn.board",
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Kanbn Write Boad",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "& kanbn board -j | L:/Git/kanbn2md/kanbn2md.exe >.kanbn/board.md",
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Kanbn Write json",
|
||||||
|
"type": "npm",
|
||||||
|
"script": "kanbn.board.json",
|
||||||
|
"problemMatcher": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -135,13 +135,19 @@ public class FileRead : Shared.FileRead, IFileRead
|
|||||||
{
|
{
|
||||||
bool isDummyRun = false;
|
bool isDummyRun = false;
|
||||||
List<(Shared.Properties.IScopeInfo, string)> collection = new();
|
List<(Shared.Properties.IScopeInfo, string)> collection = new();
|
||||||
|
string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
|
||||||
|
if (!Directory.Exists(duplicateDirectory))
|
||||||
|
_ = Directory.CreateDirectory(duplicateDirectory);
|
||||||
string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
|
string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
|
||||||
|
if (!Directory.Exists(Path.Combine(duplicateDirectory, "1")))
|
||||||
|
{
|
||||||
string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
|
string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
|
||||||
if (parentParent.Contains(_CellInstanceName))
|
if (parentParent.Contains(_CellInstanceName))
|
||||||
parentParent = Path.GetDirectoryName(parentParent);
|
parentParent = Path.GetDirectoryName(parentParent);
|
||||||
string duplicateDirectory = Path.Combine(parentParent, "Data");
|
duplicateDirectory = Path.Combine(parentParent, "Data");
|
||||||
if (!Directory.Exists(duplicateDirectory))
|
if (!Directory.Exists(duplicateDirectory))
|
||||||
_ = Directory.CreateDirectory(duplicateDirectory);
|
_ = Directory.CreateDirectory(duplicateDirectory);
|
||||||
|
}
|
||||||
string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
|
string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
|
||||||
if (descriptions.Any() && tests.Any())
|
if (descriptions.Any() && tests.Any())
|
||||||
{
|
{
|
||||||
|
@ -14,7 +14,7 @@ public class WSRequest
|
|||||||
public bool SentToMetrology { get; set; }
|
public bool SentToMetrology { get; set; }
|
||||||
public bool SentToSPC { get; set; }
|
public bool SentToSPC { get; set; }
|
||||||
//
|
//
|
||||||
public long Id { get; set; }
|
public int Id { get; set; }
|
||||||
public string CellName { get; set; }
|
public string CellName { get; set; }
|
||||||
public string Date { get; set; }
|
public string Date { get; set; }
|
||||||
public string FilePath { get; set; }
|
public string FilePath { get; set; }
|
||||||
@ -39,7 +39,7 @@ public class WSRequest
|
|||||||
#pragma warning restore IDE0060
|
#pragma warning restore IDE0060
|
||||||
{
|
{
|
||||||
ProcessDataStandardFormat = processDataStandardFormat;
|
ProcessDataStandardFormat = processDataStandardFormat;
|
||||||
Id = 0;
|
Id = -1;
|
||||||
FilePath = string.Empty;
|
FilePath = string.Empty;
|
||||||
CellName = logistics.MesEntity;
|
CellName = logistics.MesEntity;
|
||||||
if (descriptions[0] is not json.Description x)
|
if (descriptions[0] is not json.Description x)
|
||||||
|
@ -260,10 +260,11 @@ public class FileRead : Properties.IFileRead
|
|||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory) where T : Properties.IDescription
|
protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory, string duplicateFile) where T : Properties.IDescription
|
||||||
{
|
{
|
||||||
string result;
|
string result;
|
||||||
string rds;
|
string rds;
|
||||||
|
string fileName;
|
||||||
string dateValue;
|
string dateValue;
|
||||||
string rdsPlaceholder = "%RDS%";
|
string rdsPlaceholder = "%RDS%";
|
||||||
string mesEntityPlaceholder = "%MesEntity%";
|
string mesEntityPlaceholder = "%MesEntity%";
|
||||||
@ -285,7 +286,11 @@ public class FileRead : Properties.IFileRead
|
|||||||
continue;
|
continue;
|
||||||
datePlaceholder = string.Concat('%', segment, '%');
|
datePlaceholder = string.Concat('%', segment, '%');
|
||||||
}
|
}
|
||||||
result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity).Replace(datePlaceholder, dateValue));
|
fileName = scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity).Replace(datePlaceholder, dateValue);
|
||||||
|
if (!duplicateFile.Contains("Viewer"))
|
||||||
|
result = Path.Combine(duplicateDirectory, fileName);
|
||||||
|
else
|
||||||
|
result = Path.Combine(duplicateDirectory, $"Viewer_{fileName}");
|
||||||
}
|
}
|
||||||
if (result.Contains('%'))
|
if (result.Contains('%'))
|
||||||
throw new Exception("Placeholder exists!");
|
throw new Exception("Placeholder exists!");
|
||||||
@ -318,7 +323,7 @@ public class FileRead : Properties.IFileRead
|
|||||||
else if (!scopeInfo.FileName.Contains('%'))
|
else if (!scopeInfo.FileName.Contains('%'))
|
||||||
tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc");
|
tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc");
|
||||||
else
|
else
|
||||||
tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory);
|
tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory, duplicateFile);
|
||||||
tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0];
|
tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0];
|
||||||
duplicateFiles.Add(tupleFile);
|
duplicateFiles.Add(tupleFile);
|
||||||
if (_IsEAFHosted)
|
if (_IsEAFHosted)
|
||||||
|
@ -10,14 +10,8 @@
|
|||||||
"HA-Extract.Staging.v2_47_1-SRP2100-Staging__v2_47_1__SRP2100__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~SRP2100 & Name~Staging__v2_47_1__SRP2100__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
|
"HA-Extract.Staging.v2_47_1-SRP2100-Staging__v2_47_1__SRP2100__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~SRP2100 & Name~Staging__v2_47_1__SRP2100__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
|
||||||
"HB-Extract.Staging.v2_47_1-MET08RESISRP2100-Staging__v2_47_1__MET08RESISRP2100__OpenInsight638042558563679143__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESISRP2100 & Name~Staging__v2_47_1__MET08RESISRP2100__OpenInsight638042558563679143__IqsSql\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
|
"HB-Extract.Staging.v2_47_1-MET08RESISRP2100-Staging__v2_47_1__MET08RESISRP2100__OpenInsight638042558563679143__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESISRP2100 & Name~Staging__v2_47_1__MET08RESISRP2100__OpenInsight638042558563679143__IqsSql\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
|
||||||
"Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
|
"Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
|
||||||
"nuget-clear": "dotnet nuget locals all --clear",
|
"kanbn.board": "kanbn board",
|
||||||
"build": "dotnet build --runtime win-x64 --self-contained",
|
"kanbn.board.json": "kanbn board -j > .kanbn/board.json",
|
||||||
"build-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://packagemanagement.eu.infineon.com:4430/api/v2/",
|
|
||||||
"build-nuget-And-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/",
|
|
||||||
"build-All-Sources": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/ --source https://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json --source http://192.168.0.73:5002/v3/index.json",
|
|
||||||
"dotnet-format": "dotnet format --report .vscode --verbosity detailed --severity warn",
|
|
||||||
"MSBuild": "\"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe\" /target:Build /restore:True /p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=Debug;TargetFrameworkVersion=v4.8 ../MET08RESISRP2100.csproj",
|
|
||||||
"pull": "git pull",
|
|
||||||
"garbage-collect": "git gc"
|
"garbage-collect": "git gc"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -198,7 +198,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Infineon.EAF.Runtime">
|
<PackageReference Include="Infineon.EAF.Runtime">
|
||||||
<Version>2.49.2</Version>
|
<Version>2.49.3</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="System.Text.Json">
|
<PackageReference Include="System.Text.Json">
|
||||||
<Version>6.0.3</Version>
|
<Version>6.0.3</Version>
|
||||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("2.49.2.0")]
|
[assembly: AssemblyVersion("2.49.3.0")]
|
||||||
[assembly: AssemblyFileVersion("2.49.2.0")]
|
[assembly: AssemblyFileVersion("2.49.3.0")]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user