Update MSBuild Converter regex to support more MSBuild log variants #2579
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System; | ||
| using System.IO; | ||
|
|
||
| using FluentAssertions; | ||
|
|
||
| using Microsoft.CodeAnalysis.Sarif.Writers; | ||
|
|
||
| using Xunit; | ||
|
|
||
| namespace Microsoft.CodeAnalysis.Sarif.Converters | ||
| { | ||
| public class MSBuildConverterTests : ConverterTestsBase<MSBuildConverter> | ||
| { | ||
| [Fact] | ||
| public void Converter_RequiresInputStream() | ||
| { | ||
| var converter = new MSBuildConverter(); | ||
| Action action = () => converter.Convert(input: null, output: new ResultLogObjectWriter(), dataToInsert: OptionallyEmittedData.None); | ||
| action.Should().Throw<ArgumentNullException>(); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Converter_RequiresResultLogWriter() | ||
| { | ||
| var converter = new MSBuildConverter(); | ||
| Action action = () => converter.Convert(input: new MemoryStream(), output: null, dataToInsert: OptionallyEmittedData.None); | ||
| action.Should().Throw<ArgumentNullException>(); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Converter_WhenInputIsEmpty_ReturnsNoResults() | ||
| { | ||
| string input = s_extractor.GetResourceInputText("Empty.ERR"); | ||
| string expectedOutput = s_extractor.GetResourceExpectedOutputsText("NoResults.sarif"); | ||
| RunTestCase(input, expectedOutput); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Converter_WhenResultRowIsInvalid_ReturnsNoResults() | ||
| { | ||
| string input = s_extractor.GetResourceInputText("InvalidResult.ERR"); | ||
| string expectedOutput = s_extractor.GetResourceExpectedOutputsText("NoResults.sarif"); | ||
| RunTestCase(input, expectedOutput); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Converter_WhenInputContainsValidResults_ReturnsExpectedOutput() | ||
| { | ||
| string input = s_extractor.GetResourceInputText("ValidResults.ERR"); | ||
| string expectedOutput = s_extractor.GetResourceExpectedOutputsText("ValidResults.sarif"); | ||
| RunTestCase(input, expectedOutput); | ||
| } | ||
|
|
||
| private static readonly TestAssetResourceExtractor s_extractor = new TestAssetResourceExtractor(typeof(MSBuildConverterTests)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.6.json", | ||
| "version": "2.1.0", | ||
| "runs": [ | ||
| { | ||
| "results": [], | ||
| "tool": { | ||
| "driver": { | ||
| "name": "MSBuild" | ||
| } | ||
| }, | ||
| "columnKind": "utf16CodeUnits" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| { | ||
| "$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.6.json", | ||
| "version": "2.1.0", | ||
| "runs": [ | ||
| { | ||
| "results": [ | ||
| { | ||
| "ruleId": "MSB1003", | ||
| "level": "error", | ||
| "message": { | ||
| "text": "Specify a project or solution file. The current working directory does not contain a project or solution file." | ||
| } | ||
| }, | ||
| { | ||
| "ruleId": "MSB1001", | ||
| "level": "error", | ||
| "message": { | ||
| "text": "Unknown switch, Switch: /maxcpucount." | ||
| } | ||
| }, | ||
| { | ||
| "ruleId": "PV1002", | ||
|
|
||
| "level": "error", | ||
| "message": { | ||
| "text": "Package sense1ds[1.1000.1] is missing the content manifest. For more information, see https://osgwiki.com/wiki/PackageValidator#PV1002" | ||
| } | ||
| }, | ||
| { | ||
| "ruleId": "PV1000", | ||
| "level": "note", | ||
| "message": { | ||
| "text": "Package diagtrackservice.vb_release.x86[0.0.0] is missing provenance data. For more information, see https://osgwiki.com/wiki/PackageValidator#PV1000" | ||
| } | ||
| }, | ||
| { | ||
| "ruleId": "PV1004", | ||
| "message": { | ||
| "text": "Package microsoft.timetraveldebugging.test.x86[0.0.25] is missing the manifest catalog. For more information, see https://osgwiki.com/wiki/PackageValidator#PV1004" | ||
| } | ||
| } | ||
| ], | ||
| "tool": { | ||
| "driver": { | ||
| "name": "MSBuild" | ||
| } | ||
| }, | ||
| "columnKind": "utf16CodeUnits" | ||
| } | ||
| ] | ||
| } | ||
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| ----- Catalog construction errors ----- | ||
| Error #1 | ||
| Microsoft.VisualStudio.Composition.PartDiscoveryException: ReflectionTypeLoadException while enumerating types in assembly "C:\PROGRAM FILES (X86)\MICROSOFT VISUAL STUDIO\2019\ENTERPRISE\COMMON7\IDE\EXTENSIONS\MICROSOFT\GRAPHICS\DEBUGGER\VsGraphicsDebuggerPkg.dll". Results will be incomplete. ---> System.Reflection.ReflectionTypeLoadException: Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information. | ||
| at System.Reflection.RuntimeModule.GetTypes(RuntimeModule module) | ||
| at System.Reflection.RuntimeModule.GetTypes() | ||
| at System.Reflection.Assembly.GetTypes() | ||
| at Microsoft.VisualStudio.Composition.PartDiscovery.CombinedPartDiscovery.GetTypes(Assembly assembly) | ||
| at Microsoft.VisualStudio.Composition.PartDiscovery.<>c__DisplayClass32_0.<CreateAssemblyDiscoveryBlockChain>b__0(Assembly a) | ||
| --- End of inner exception stack trace --- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| ----- non msbuild error ----- | ||
| System.IO.FileNotFoundException: Could not load file or assembly 'Microsoft.UniversalApps.Deployment, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies. The system cannot find the file specified. | ||
| File name: 'Microsoft.UniversalApps.Deployment, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' | ||
|
|
||
| ----- VS msbuild error ----- | ||
| msbuild : err MSB1003: Specify a project or solution file. The current working directory does not contain a project or solution file. | ||
| msbuild : error MSB1001: Unknown switch, Switch: /maxcpucount. | ||
|
|
||
| ----- Package Validator build error ----- | ||
| %object_root%\amcore\wcd\source\communicator\sense1ds\dll\$(o)\vpack : ERROR: PV1002: Package sense1ds[1.1000.1] is missing the content manifest. For more information, see https://osgwiki.com/wiki/PackageValidator#PV1002 | ||
| %object_root%\onecore\base\telemetry\utc\tests\functionaltests\vpacks\diagtrackservice.vb_release\$(o)\vpack : NOTE: PV1000: Package diagtrackservice.vb_release.x86[0.0.0] is missing provenance data. For more information, see https://osgwiki.com/wiki/PackageValidator#PV1000 | ||
| %object_root%\onecore\sdktools\debuggers\ttd\undocked\testbinaries\$(o)\vpack : WRN: PV1004: Package microsoft.timetraveldebugging.test.x86[0.0.25] is missing the manifest catalog. For more information, see https://osgwiki.com/wiki/PackageValidator#PV1004 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
may need some lang update make it more clear that
accepts case insensitive keywordsis the the bug fixed but after fix, e.g.now accepts#Resolved