diff --git a/.gitignore b/.gitignore index eab1f67..c19d760 100644 --- a/.gitignore +++ b/.gitignore @@ -331,10 +331,11 @@ ASALocalRun/ ## ## Visual Studio Code ## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json +*/!.vscode/extensions.json +*/!.vscode/launch.json +*/!.vscode/settings.json +*/!.vscode/tasks.json +*/.vscode/* +*/.vscode/ReportGenerator/* *.lnk diff --git a/Adaptation/.config/dotnet-tools.json b/Adaptation/.config/dotnet-tools.json new file mode 100644 index 0000000..cd368e1 --- /dev/null +++ b/Adaptation/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-reportgenerator-globaltool": { + "version": "5.1.15", + "commands": [ + "reportgenerator" + ] + } + } +} \ No newline at end of file diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json index cf354c7..7d0fc82 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -21,6 +21,7 @@ "Villach", "Vrng" ], + "coverage-gutters.coverageBaseDir": "../../../../MET08RESIMAPCDE/05_TestResults/TestResults/**", "workbench.colorCustomizations": { "activityBar.activeBackground": "#9885b1", "activityBar.activeBorder": "#dacec5", diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index 33711e3..aa4469c 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -112,10 +112,40 @@ public class FileRead : Shared.FileRead, IFileRead internal static string GetLines(Logistics logistics, List descriptions) { - StringBuilder result = new(logistics.MesEntity); - if (descriptions is null) - { } - return result.ToString(); + StringBuilder results = new(); + txt.Description x = descriptions[0]; + char del = x.MesEntity == x.Reactor ? '\t' : '~'; + _ = results.Append(x.UniqueId).Append(del). + Append(x.Run).Append(del). + Append(x.Date).Append(del). + Append(x.Lot).Append(del). + Append(x.Recipe).Append(del). + Append(x.Reactor).Append(del). + Append(x.RDS).Append(del). + Append(x.PSN).Append(del). + Append(x.Layer).Append(del). + Append(x.Zone).Append(del). + Append(logistics.MesEntity).Append(del). + Append(x.Employee).Append(del). + Append(x.Engineer).Append(del). + Append(x.DLRatio).Append(del). + Append(x.Temp).Append(del). + Append(x.AutoOptimizeGain).Append(del). + Append(x.AutoProbeHeightSet).Append(del). + Append(x.DataReject).Append(del). + Append(x.FileName).Append(del). + Append(x.Avg).Append(del). + Append(x.StdDev).Append(del). + Append(x.SemiRadial).Append(del); + foreach (txt.Description description in descriptions) + { + _ = results.Append(description.Pt).Append(del). + Append(description.R).Append(del). + Append(description.T).Append(del). + Append(description.Rs).Append(del). + Append(description.Merit).Append(del); + }; + return results.ToString(); } private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List descriptions, Test[] tests) diff --git a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs index a16d396..755bdfc 100644 --- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs +++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs @@ -49,7 +49,7 @@ public class FromIQS .Append(" and pd.f_name = '").Append(description.PSN).AppendLine("' ") .AppendLine(" and jd.f_name in ('CDE1', 'CDE2', 'CDE3', 'CDE4', 'CDE5', 'CDE6') ") .Append(" and jd.f_name = '").Append(logistics.MesEntity).AppendLine("' ") - .Append(" and pl.f_name = '").Append(description.RDS).AppendLine("' ") + .Append(" and pl.f_name = '").Append(string.IsNullOrEmpty(description.RDS) ? "" : description.RDS).AppendLine("' ") .Append(" and dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgtm), '19700101'))) = '").Append(dateTime).AppendLine("' ") .AppendLine(" for json path "); return result.ToString(); diff --git a/Adaptation/MET08RESIMAPCDE-Development.yml b/Adaptation/MET08RESIMAPCDE-Development.yml index fc4dc4b..e228b76 100644 --- a/Adaptation/MET08RESIMAPCDE-Development.yml +++ b/Adaptation/MET08RESIMAPCDE-Development.yml @@ -66,15 +66,15 @@ steps: displayName: "Safe storage of app secrets - Adaptation" - task: CopyFiles@2 - displayName: 'Copy Files to: - GhostPCL' + displayName: "Copy Files to: - GhostPCL" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64 ' + SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true enabled: false - task: CopyFiles@2 - displayName: 'Copy Files to: - LincPDFC' + displayName: "Copy Files to: - LincPDFC" inputs: SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' @@ -82,7 +82,7 @@ steps: enabled: false - task: CopyFiles@2 - displayName: 'Copy Files to: - PDF-Text-Stripper' + displayName: "Copy Files to: - PDF-Text-Stripper" inputs: SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' @@ -92,39 +92,63 @@ steps: - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)' workingDirectory: Adaptation displayName: "Core Build - Adaptation" + + - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse } + workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)" + displayName: 'PowerShell Script' - script: "dotnet test --configuration $(Configuration)" - workingDirectory: Tests + workingDirectory: Adaptation displayName: "Core Test" + - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)' + displayName: "Move Results" + - script: '"C:\program files\dotnet\dotnet.exe" tool restore' workingDirectory: Adaptation displayName: "Tool Restore" enabled: false - - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark' + - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark' workingDirectory: Adaptation displayName: "Report Generator" enabled: false + - task: PublishTestResults@2 + displayName: "Publish Test Results **/*.trx" + inputs: + testResultsFormat: VSTest + testResultsFiles: "**/*.trx" + searchFolder: "$(System.DefaultWorkingDirectory)" + + - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1 + displayName: "Create work item" + inputs: + teamProject: "Mesa_FI" + workItemType: Bug + title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration) + assignedTo: "$(Build.RequestedForId)" + enabled: false + - script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o $(Build.ArtifactStagingDirectory)\Adaptation --source $(NugetSource)' workingDirectory: Adaptation displayName: "Core Publish" + enabled: false - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)' - displayName: 'MSBuild Restore' + displayName: "MSBuild Restore" - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8' displayName: MSBuild - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt' - displayName: 'Commit Id' + displayName: "Commit Id" - task: CopyFiles@2 displayName: 'Copy Files to: D:\Framework4.8' inputs: SourceFolder: 'bin\$(Configuration)' - Contents: '*$(Build.Repository.Name)*' + Contents: "*$(Build.Repository.Name)*" TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)' OverWrite: true enabled: false @@ -133,14 +157,14 @@ steps: displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository' inputs: SourceFolder: 'bin\$(Configuration)' - Contents: '*$(Build.Repository.Name)*' + Contents: "*$(Build.Repository.Name)*" TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)' OverWrite: true enabled: false - script: | "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration) - workingDirectory: Tests + workingDirectory: Adaptation displayName: "Core Clean - Tests" - script: | @@ -149,5 +173,5 @@ steps: displayName: "Core Clean - Adaptation" - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt' - displayName: 'Force Fail' + displayName: "Force Fail" enabled: false diff --git a/Adaptation/MET08RESIMAPCDE.Tests.csproj b/Adaptation/MET08RESIMAPCDE.Tests.csproj index b19f18c..6ddbe66 100644 --- a/Adaptation/MET08RESIMAPCDE.Tests.csproj +++ b/Adaptation/MET08RESIMAPCDE.Tests.csproj @@ -33,6 +33,16 @@ Linux + + + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + @@ -45,46 +55,29 @@ - - - - - - + + + NU1701 + - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + NU1701 NU1701 NU1701 NU1701 - - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - Always diff --git a/Adaptation/MET08RESIMAPCDE.yml b/Adaptation/MET08RESIMAPCDE.yml index 0aa2fb7..16b08da 100644 --- a/Adaptation/MET08RESIMAPCDE.yml +++ b/Adaptation/MET08RESIMAPCDE.yml @@ -66,21 +66,21 @@ steps: displayName: "Safe storage of app secrets - Adaptation" - task: CopyFiles@2 - displayName: 'Copy Files to: - GhostPCL' + displayName: "Copy Files to: - GhostPCL" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64 ' + SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true - task: CopyFiles@2 - displayName: 'Copy Files to: - LincPDFC' + displayName: "Copy Files to: - LincPDFC" inputs: SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true - task: CopyFiles@2 - displayName: 'Copy Files to: - PDF-Text-Stripper' + displayName: "Copy Files to: - PDF-Text-Stripper" inputs: SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' @@ -89,39 +89,63 @@ steps: - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)' workingDirectory: Adaptation displayName: "Core Build - Adaptation" + + - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse } + workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)" + displayName: 'PowerShell Script' - script: "dotnet test --configuration $(Configuration)" - workingDirectory: Tests + workingDirectory: Adaptation displayName: "Core Test" + - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)' + displayName: "Move Results" + - script: '"C:\program files\dotnet\dotnet.exe" tool restore' workingDirectory: Adaptation displayName: "Tool Restore" enabled: false - - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark' + - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark' workingDirectory: Adaptation displayName: "Report Generator" enabled: false + - task: PublishTestResults@2 + displayName: "Publish Test Results **/*.trx" + inputs: + testResultsFormat: VSTest + testResultsFiles: "**/*.trx" + searchFolder: "$(System.DefaultWorkingDirectory)" + + - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1 + displayName: "Create work item" + inputs: + teamProject: "Mesa_FI" + workItemType: Bug + title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration) + assignedTo: "$(Build.RequestedForId)" + enabled: false + - script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o $(Build.ArtifactStagingDirectory)\Adaptation --source $(NugetSource)' workingDirectory: Adaptation displayName: "Core Publish" + enabled: false - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)' - displayName: 'MSBuild Restore' + displayName: "MSBuild Restore" - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8' displayName: MSBuild - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt' - displayName: 'Commit Id' + displayName: "Commit Id" - task: CopyFiles@2 displayName: 'Copy Files to: D:\Framework4.8' inputs: SourceFolder: 'bin\$(Configuration)' - Contents: '*$(Build.Repository.Name)*' + Contents: "*$(Build.Repository.Name)*" TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)' OverWrite: true @@ -129,13 +153,13 @@ steps: displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository' inputs: SourceFolder: 'bin\$(Configuration)' - Contents: '*$(Build.Repository.Name)*' + Contents: "*$(Build.Repository.Name)*" TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)' OverWrite: true - script: | "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration) - workingDirectory: Tests + workingDirectory: Adaptation displayName: "Core Clean - Tests" - script: | @@ -144,5 +168,5 @@ steps: displayName: "Core Clean - Adaptation" - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt' - displayName: 'Force Fail' + displayName: "Force Fail" enabled: false diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs index 72becc7..64384f7 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs @@ -85,6 +85,21 @@ public class MET08RESIMAPCDE _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638116271690000000__IqsSql() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight(); + string[] variables = _MET08RESIMAPCDE.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); + IFileRead fileRead = _MET08RESIMAPCDE.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); + } + #if DEBUG [Ignore] #endif diff --git a/MET08RESIMAPCDE.csproj b/MET08RESIMAPCDE.csproj index cd42895..9d69ee0 100644 --- a/MET08RESIMAPCDE.csproj +++ b/MET08RESIMAPCDE.csproj @@ -11,7 +11,8 @@ MET08RESIMAPCDE MET08RESIMAPCDE v4.8 - win-x86 + win-x64 + win 512