yml 6

nsacyber · Jan 6, 2025 · 1415e28 · 1415e28
1 parent 9a9ca05
commit 1415e28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/dotnet-build-componentclassregistry.yml b/.github/workflows/dotnet-build-componentclassregistry.yml
@@ -66,7 +66,7 @@ jobs:
     - name: Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: testArtifacts
+        name: testArtifacts.${{ matrix.os }}
         retention-days: 1
         if-no-files-found: error
         path: |

diff --git a/dotnet/ComponentClassRegistry/Pcie/src/Pcie.cs b/dotnet/ComponentClassRegistry/Pcie/src/Pcie.cs
@@ -56,6 +56,7 @@ private static bool CollectPcieWindows(IDictionary<int, IList<PcieDevice>> devic
                 case "0D11":
                     // Ask NetAdapter for the permanent address.
                     Task<Tuple<int, string, string>> task = Task.Run(() => PowershellMAC(pciDeviceInstanceId));
+                    task.Wait(5000);
                     bool foundMac = ParseMacAddressFromResults(out string mac, task);
                     if (foundMac) {
                         device.NetworkMac = Convert.FromHexString(mac);
@@ -120,6 +121,7 @@ private static bool CollectPcieLinux(IDictionary<int, IList<PcieDevice>> devices
                         case "0D11":
                             // Ask ethtool for the permanent address.
                             Task<Tuple<int, string, string>> task = Task.Run(() => EthtoolP(interfaceName));
+                            task.Wait(5000);
                             bool foundMac = ParseMacAddressFromResults(out string mac, task);
                             if (foundMac) {
                                 device.NetworkMac = Convert.FromHexString(mac);
@@ -142,8 +144,6 @@ private static bool ParseMacAddressFromResults(out string mac, Task<Tuple<int, s
         mac = "";
         bool result = false;
 
-        task.Wait(5000);
-
         if (task.IsCompletedSuccessfully) {
             Tuple<int, string, string> results = task.Result;
             mac = results.Item3;