Merge 8b04c36b458620a14ffd7e899cb348d5ca28b663 into 87c6e1177627274101056947ed58ce11ef42d658

.github/msbuild.json

@@ -0,0 +1,17 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "msbuild",
+            "pattern": [
+                {
+                    "regexp": "^([^\\s].*)\\s+:\\s+(error|warning)\\s+([a-zA-Z]+(?<!MSB)\\d+):\\s*(.*?)\\s+\\[(.*?)\\]$",
+                    "file": 1,
+                    "severity": 2,
+                    "code": 3,
+                    "message": 4,
+                    "fromPath": 5
+                }
+            ]
+        }
+    ]
+}

__tests__/msbuild.test.ts

@@ -0,0 +1,46 @@
+import msbuildFile from '../.github/msbuild.json';
+describe('msbuild tests', () => {
+  test('regular expression in msbuild.json is valid', async () => {
+    const regexPattern =
+      msbuildFile['problemMatcher'][0]['pattern'][0]['regexp'];
+    const regexResultsMap = msbuildFile['problemMatcher'][0]['pattern'][0];
+
+    const regex = new RegExp(regexPattern);
+
+    const stringsToMatch = [
+      "/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj : warning NU1904: Package 'System.Text.Encodings.Web' 4.7.0 has a known critical severity vulnerability, https://github.com/advisories/GHSA-ghhp-997w-qr28 [/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj]",
+      "/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj : error NU1904: Package 'System.Text.Encodings.Web' 4.7.0 has a known critical severity vulnerability, https://github.com/advisories/GHSA-ghhp-997w-qr28 [/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj]"
+    ];
+    // Expected results are calculated according to the msbuild matcher located in msbuild.json file
+    const expectedResults = [
+      {
+        file: '/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj',
+        severity: 'warning',
+        code: 'NU1904',
+        message:
+          "Package 'System.Text.Encodings.Web' 4.7.0 has a known critical severity vulnerability, https://github.com/advisories/GHSA-ghhp-997w-qr28",
+        fromPath:
+          '/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj'
+      },
+      {
+        file: '/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj',
+        severity: 'error',
+        code: 'NU1904',
+        message:
+          "Package 'System.Text.Encodings.Web' 4.7.0 has a known critical severity vulnerability, https://github.com/advisories/GHSA-ghhp-997w-qr28",
+        fromPath:
+          '/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj'
+      }
+    ];
+
+    stringsToMatch.map((string, index) => {
+      const matchedResultsArray = string.match(regex);
+      for (const propName in expectedResults[index]) {
+        const propertyIndex = regexResultsMap[propName];
+        const expectedPropValue = expectedResults[index][propName];
+        const matchedPropValue = matchedResultsArray![propertyIndex];
+        expect(matchedPropValue).toEqual(expectedPropValue);
+      }
+    });
+  }, 10000);
+});

dist/setup/index.js

@@ -100848,6 +100848,7 @@ function run() {
             }
             const matchersPath = path_1.default.join(__dirname, '..', '..', '.github');
             core.info(`##[add-matcher]${path_1.default.join(matchersPath, 'csc.json')}`);
+            core.info(`##[add-matcher]${path_1.default.join(matchersPath, 'msbuild.json')}`);
         }
         catch (error) {
             core.setFailed(error.message);

src/setup-dotnet.ts

@@ -91,6 +91,7 @@ export async function run() {
 
     const matchersPath = path.join(__dirname, '..', '..', '.github');
     core.info(`##[add-matcher]${path.join(matchersPath, 'csc.json')}`);
+    core.info(`##[add-matcher]${path.join(matchersPath, 'msbuild.json')}`);
   } catch (error) {
     core.setFailed(error.message);
   }