Merge branch 'main' into users/shaopeng-gh/useuuidpr

microsoft · Nov 2, 2022 · ebaff74 · ebaff74
2 parents aa68481 + 1ca20ca
commit ebaff74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Sarif/FileRegionsCache.cs b/src/Sarif/FileRegionsCache.cs
@@ -361,14 +361,12 @@ private NewLineIndex GetNewLineIndex(Uri uri, string fileText = null)
             {
                 newLineIndex = new NewLineIndex(fileText);
 
-                _cache[path] =
-                    new Tuple<string, NewLineIndex>(item1: path, item2: newLineIndex);
+                _cache[path] = new Tuple<string, NewLineIndex>(item1: path,
+                                                               item2: newLineIndex);
             }
             else
             {
-                Tuple<string, NewLineIndex> entry = _cache[path];
-
-                newLineIndex = entry.Item2;
+                newLineIndex = _cache[path].Item2;
             }
 
             return newLineIndex;

diff --git a/src/Shared/CommonAssemblyInfo.cs b/src/Shared/CommonAssemblyInfo.cs
@@ -27,4 +27,5 @@
 [assembly: InternalsVisibleTo("Test.UnitTests.Sarif.WorkItems, PublicKey=0024000004800000940000000602000000240000525341310004000001000100433fbf156abe9718142bdbd48a440e779a1b708fd21486ee0ae536f4c548edf8a7185c1e3ac89ceef76c15b8cc2497906798779a59402f9b9e27281fb15e7111566cdc9a9f8326301d45320623c5222089cf4d0013f365ae729fb0a9c9d15138042825cd511a0f3d4887a7b92f4c2749f81b410813d297b73244cf64995effb1")]
 [assembly: InternalsVisibleTo("Test.Utilities.Sarif, PublicKey=0024000004800000940000000602000000240000525341310004000001000100433fbf156abe9718142bdbd48a440e779a1b708fd21486ee0ae536f4c548edf8a7185c1e3ac89ceef76c15b8cc2497906798779a59402f9b9e27281fb15e7111566cdc9a9f8326301d45320623c5222089cf4d0013f365ae729fb0a9c9d15138042825cd511a0f3d4887a7b92f4c2749f81b410813d297b73244cf64995effb1")]
 [assembly: InternalsVisibleTo("Test.UnitTests.WorkItems, PublicKey=0024000004800000940000000602000000240000525341310004000001000100433fbf156abe9718142bdbd48a440e779a1b708fd21486ee0ae536f4c548edf8a7185c1e3ac89ceef76c15b8cc2497906798779a59402f9b9e27281fb15e7111566cdc9a9f8326301d45320623c5222089cf4d0013f365ae729fb0a9c9d15138042825cd511a0f3d4887a7b92f4c2749f81b410813d297b73244cf64995effb1")]
+[assembly: InternalsVisibleTo("Test.UnitTests.Sarif.PatternMatcher, PublicKey=0024000004800000940000000602000000240000525341310004000001000100433fbf156abe9718142bdbd48a440e779a1b708fd21486ee0ae536f4c548edf8a7185c1e3ac89ceef76c15b8cc2497906798779a59402f9b9e27281fb15e7111566cdc9a9f8326301d45320623c5222089cf4d0013f365ae729fb0a9c9d15138042825cd511a0f3d4887a7b92f4c2749f81b410813d297b73244cf64995effb1")]