RuntimeIdentifiers

2023-01-30 17:50:52 -07:00 · 2023-01-30 17:50:52 -07:00 · f60b102d58
commit f60b102d58
parent cb6ab8b67e
7 changed files with 90 additions and 29 deletions
--- 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
--- a/Adaptation/.config/dotnet-tools.json
+++ b/Adaptation/.config/dotnet-tools.json
@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-reportgenerator-globaltool": {
+      "version": "5.1.15",
+      "commands": [
+        "reportgenerator"
+      ]
+    }
+  }
+}
--- a/Adaptation/.vscode/settings.json
+++ b/Adaptation/.vscode/settings.json
@ -21,6 +21,7 @@
        "Rhosl",
        "Villach"
    ],
+    "coverage-gutters.coverageBaseDir": "../../../../MET08RESIHGCV/05_TestResults/TestResults/**",
    "workbench.colorCustomizations": {
        "activityBar.activeBackground": "#79b2e4",
        "activityBar.activeBorder": "#d42b85",
--- a/Adaptation/MET08RESIHGCV-Development.yml
+++ b/Adaptation/MET08RESIHGCV-Development.yml
@ -66,7 +66,7 @@ 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'
      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
@ -74,7 +74,7 @@ steps:
    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'
@ -97,34 +97,59 @@ steps:
    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: DeleteFiles@1
+    displayName: "Delete TestResults files"
+    inputs:
+      Contents: "TestResults/**/*"
+
+  - 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,7 +158,7 @@ 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
@ -149,5 +174,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
--- a/Adaptation/MET08RESIHGCV.Tests.csproj
+++ b/Adaptation/MET08RESIHGCV.Tests.csproj
@ -10,7 +10,7 @@
        <IsPackable>false</IsPackable>
        <LangVersion>10.0</LangVersion>
        <Nullable>disable</Nullable>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
        <TargetFramework>net6.0</TargetFramework>
    </PropertyGroup>
    <PropertyGroup>
@ -61,10 +61,7 @@
        <PackageReference Include="System.Text.Json" Version="7.0.1" />
    </ItemGroup>
    <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.2.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.2.0" />
        <PackageReference Include="FFMpegCore" Version="4.8.0" />
        <PackageReference Include="Instances" Version="2.0.0" />
        <PackageReference Include="RoboSharp" Version="1.2.8" />
--- a/Adaptation/MET08RESIHGCV.yml
+++ b/Adaptation/MET08RESIHGCV.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'
      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'
@ -94,34 +94,59 @@ steps:
    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: DeleteFiles@1
+    displayName: "Delete TestResults files"
+    inputs:
+      Contents: "TestResults/**/*"
+
+  - 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,7 +154,7 @@ 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

@ -144,5 +169,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
--- a/MET08RESIHGCV.csproj
+++ b/MET08RESIHGCV.csproj
@ -11,7 +11,7 @@
    <RootNamespace>MET08RESIHGCV</RootNamespace>
    <AssemblyName>MET08RESIHGCV</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
    <FileAlignment>512</FileAlignment>
  </PropertyGroup>
  <PropertyGroup>