diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 919a4b51..c5db0fee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -71,8 +71,8 @@ stages: command: 'restore' projects: $(slnPath) restoreArguments: '--locked-mode' - feedsToUse: 'select' - vstsFeed: '399fb241-ecc7-4802-8697-dcdd01fbb832/423b576f-2263-43a1-93bd-69f4def19102' + feedsToUse: config + nugetConfigPath: 'omnisharp-dotnet/nuget.config' includeNuGetOrg: false - template: prepare-sq-analysis-steps.yml@commonTemplates diff --git a/its/pom.xml b/its/pom.xml index aa80bd0d..6a8de681 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -92,7 +92,7 @@ wget - https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/sonarlint/omnisharp/omnisharp-roslyn/1.39.6/omnisharp-roslyn-1.39.6-net472.zip + https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/sonarlint/omnisharp/omnisharp-roslyn/1.39.10/omnisharp-roslyn-1.39.10-net472.zip true ${project.build.directory}/omnisharp-win @@ -104,7 +104,7 @@ wget - https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/sonarlint/omnisharp/omnisharp-roslyn/1.39.6/omnisharp-roslyn-1.39.6-mono.zip + https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/sonarlint/omnisharp/omnisharp-roslyn/1.39.10/omnisharp-roslyn-1.39.10-mono.zip true ${project.build.directory}/omnisharp-mono @@ -116,7 +116,7 @@ wget - https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/sonarlint/omnisharp/omnisharp-roslyn/1.39.6/omnisharp-roslyn-1.39.6-net6.zip + https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/sonarlint/omnisharp/omnisharp-roslyn/1.39.10/omnisharp-roslyn-1.39.10-net6.zip true ${project.build.directory}/omnisharp-net6 @@ -161,4 +161,4 @@ - \ No newline at end of file + diff --git a/its/src/test/java/org/sonarsource/sonarlint/omnisharp/its/OmnisharpIntegrationTests.java b/its/src/test/java/org/sonarsource/sonarlint/omnisharp/its/OmnisharpIntegrationTests.java index af0a5b92..c51401eb 100644 --- a/its/src/test/java/org/sonarsource/sonarlint/omnisharp/its/OmnisharpIntegrationTests.java +++ b/its/src/test/java/org/sonarsource/sonarlint/omnisharp/its/OmnisharpIntegrationTests.java @@ -224,26 +224,40 @@ void analyzeNet7Solution(@TempDir Path tmpDir) throws Exception { @Test void analyzeNet8Solution(@TempDir Path tmpDir) throws Exception { Path baseDir = prepareTestSolutionAndRestore(tmpDir, "DotNet8Project"); - ClientInputFile inputFile = prepareInputFile(baseDir, "DotNet8Project/Program.cs", null, false); + ClientInputFile inputFile = prepareInputFile(baseDir, "DotNet8Project/Program.cs", + "namespace DotNet8Project;\n" + + "\n" + + "public static class Class1\n" + + "{\n" + + "\n" + + " public static void Method2()\n" + + " {\n" + + " Method([\"\", \"\"]);\n" + + " }\n" + + " static void Method(string[] list)\n" + + " {\n" + + " ;\n" + + " }\n" + + "}\n", + false); final List issues = new ArrayList<>(); StandaloneAnalysisConfiguration analysisConfiguration = StandaloneAnalysisConfiguration.builder() .setBaseDir(baseDir) .addInputFile(inputFile) .setModuleKey(SOLUTION1_MODULE_KEY) - .putExtraProperty("sonar.cs.internal.useNet8", "true") + .putExtraProperty("sonar.cs.internal.useNet6", "true") .putExtraProperty("sonar.cs.internal.solutionPath", baseDir.resolve("DotNet8Project.sln").toString()) .build(); sonarlintEngine.analyze(analysisConfiguration, issues::add, null, null); assertThat(issues) - .extracting(Issue::getRuleKey, Issue::getMessage, Issue::getStartLine, Issue::getStartLineOffset, - Issue::getEndLine, Issue::getEndLineOffset, i -> i.getInputFile().getPath(), Issue::getSeverity) + .extracting(Issue::getRuleKey, Issue::getMessage, Issue::getStartLine, Issue::getStartLineOffset, Issue::getEndLine, Issue::getEndLineOffset, i -> i.getInputFile().getPath(), + Issue::getSeverity) .containsOnly( - tuple("csharpsquid:S6561", "Avoid using \"DateTime.Now\" for benchmarking or timespan calculation operations.", 17, 22, 17, 42, inputFile.getPath(), MAJOR), - tuple("csharpsquid:S1155", "Use '.Any()' to test whether this 'IEnumerable' is empty or not.", 10, 19, 10, 24, inputFile.getPath(), MINOR), - tuple("csharpsquid:S1656", "Remove or correct this useless self-assignment.", 9, 4, 9, 11, inputFile.getPath(), MAJOR), - tuple("csharpsquid:S3241", "Change return type to 'void'; not a single caller uses the returned value.", 7, 0, 7, 4, inputFile.getPath(), MINOR)); + tuple("csharpsquid:S1116", "Remove this empty statement.", 12, 8, 12, 9, inputFile.getPath(), MINOR), + tuple("csharpsquid:S1172", "Remove this unused method parameter 'list'.", 10, 23, 10, 36, inputFile.getPath(), MAJOR) + ); } @Test diff --git a/its/src/test/projects/DotNet8Project/DotNet8Project.sln b/its/src/test/projects/DotNet8Project/DotNet8Project.sln index 8b7f5cf7..601e6f4e 100644 --- a/its/src/test/projects/DotNet8Project/DotNet8Project.sln +++ b/its/src/test/projects/DotNet8Project/DotNet8Project.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet8Project", "DotNet8Project\DotNet8Project.csproj", "{95A8DB40-57A1-4BAA-AEB5-EBF5E3FD6F15}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet8Project", "DotNet8Project\DotNet8Project.csproj", "{D426AF11-5650-4CEF-BE28-FBABCAFCB4DB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,9 +8,9 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {95A8DB40-57A1-4BAA-AEB5-EBF5E3FD6F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95A8DB40-57A1-4BAA-AEB5-EBF5E3FD6F15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95A8DB40-57A1-4BAA-AEB5-EBF5E3FD6F15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95A8DB40-57A1-4BAA-AEB5-EBF5E3FD6F15}.Release|Any CPU.Build.0 = Release|Any CPU + {D426AF11-5650-4CEF-BE28-FBABCAFCB4DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D426AF11-5650-4CEF-BE28-FBABCAFCB4DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D426AF11-5650-4CEF-BE28-FBABCAFCB4DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D426AF11-5650-4CEF-BE28-FBABCAFCB4DB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/its/src/test/projects/DotNet8Project/DotNet8Project/DotNet8Project.csproj b/its/src/test/projects/DotNet8Project/DotNet8Project/DotNet8Project.csproj index 2f4fc776..44344c20 100644 --- a/its/src/test/projects/DotNet8Project/DotNet8Project/DotNet8Project.csproj +++ b/its/src/test/projects/DotNet8Project/DotNet8Project/DotNet8Project.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/its/src/test/projects/DotNet8Project/DotNet8Project/Program.cs b/its/src/test/projects/DotNet8Project/DotNet8Project/Program.cs index 15083f57..2a25374d 100644 --- a/its/src/test/projects/DotNet8Project/DotNet8Project/Program.cs +++ b/its/src/test/projects/DotNet8Project/DotNet8Project/Program.cs @@ -1,17 +1,14 @@ -// simple method -void print() -{ - Console.WriteLine("Hello World"); -} +namespace DotNet8Project; -bool HasContent(IEnumerable strings) +public static class Class1 { - strings = strings; - return strings.Count() > 0; -} -// non-compliant example -var start = DateTime.Now; -print(); -HasContent(new List() { "a", "b" }); -Console.WriteLine($"{(DateTime.Now - start).TotalMilliseconds} ms"); + public static void Method2() + { + Method(["", ""]); + } + static void Method(string[] list) + { + ; + } +} diff --git a/omnisharp-dotnet/Directory.Build.props b/omnisharp-dotnet/Directory.Build.props index 34f57e21..704b1f83 100644 --- a/omnisharp-dotnet/Directory.Build.props +++ b/omnisharp-dotnet/Directory.Build.props @@ -27,7 +27,7 @@ - 1.39.0 + 1.39.10 $(MSBuildThisFileDirectory).omnisharp\$(OmniSharpVersion)\ $(OmniSharpLocalDownloadDir)\unzipped diff --git a/omnisharp-dotnet/nuget.config b/omnisharp-dotnet/nuget.config old mode 100644 new mode 100755 index a08cce39..1acef388 --- a/omnisharp-dotnet/nuget.config +++ b/omnisharp-dotnet/nuget.config @@ -12,7 +12,7 @@ - + diff --git a/omnisharp-dotnet/src/Services.UnitTests/DiagnosticWorker/OmniSharpWorkspaceHelper.cs b/omnisharp-dotnet/src/Services.UnitTests/DiagnosticWorker/OmniSharpWorkspaceHelper.cs index 43c7b364..35240c1b 100644 --- a/omnisharp-dotnet/src/Services.UnitTests/DiagnosticWorker/OmniSharpWorkspaceHelper.cs +++ b/omnisharp-dotnet/src/Services.UnitTests/DiagnosticWorker/OmniSharpWorkspaceHelper.cs @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -51,9 +52,8 @@ internal static class OmniSharpWorkspaceHelper public static OmniSharpWorkspace CreateOmnisharpWorkspaceWithDocument(string documentFileName, string documentContent) { var projectInfo = CreateProjectInfo(); - var textLoader = new InMemoryTextLoader(); + var textLoader = new InMemoryTextLoader(documentContent); var documentInfo = CreateDocumentInfo(projectInfo, textLoader, documentFileName); - textLoader.AddText(documentInfo.Id, documentContent); var workspace = CreateOmniSharpWorkspace(); workspace.AddProject(projectInfo); @@ -89,17 +89,16 @@ private static DocumentInfo CreateDocumentInfo(ProjectInfo projectInfo, TextLoad private class InMemoryTextLoader : TextLoader { - private readonly Dictionary documentsText = new(); - - public void AddText(DocumentId documentInfoId, string someText) + private readonly String _sourceText; + + public InMemoryTextLoader(String sourceText) { - documentsText.Add(documentInfoId, someText); + _sourceText = sourceText; } - public override async Task LoadTextAndVersionAsync(Workspace workspace, DocumentId documentId, CancellationToken cancellationToken) + public override Task LoadTextAndVersionAsync(LoadTextOptions options, CancellationToken token) { - var text = documentsText[documentId]; - return TextAndVersion.Create(SourceText.From(text), VersionStamp.Default); + return Task.FromResult(TextAndVersion.Create(SourceText.From(_sourceText), VersionStamp.Default)); } } } diff --git a/omnisharp-dotnet/src/Services.UnitTests/packages.lock.json b/omnisharp-dotnet/src/Services.UnitTests/packages.lock.json index 26f6c1df..8fd1e58d 100644 --- a/omnisharp-dotnet/src/Services.UnitTests/packages.lock.json +++ b/omnisharp-dotnet/src/Services.UnitTests/packages.lock.json @@ -90,16 +90,16 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", + "resolved": "7.0.0", + "contentHash": "3aeMZ1N0lJoSyzqiP03hqemtb1BijhsJADdobn/4nsMJ8V1H+CrpuduUe4hlRdx+ikBQju1VGjMD1GJ3Sk05Eg==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", - "resolved": "3.3.3", - "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" + "resolved": "3.3.4", + "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g==" }, "Microsoft.CodeAnalysis.AnalyzerUtilities": { "type": "Transitive", @@ -108,92 +108,92 @@ }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "gG3YyfXvle+kHbybYCG6a/aD1SeaLt99NNFl35RzJrYdQxWQDn/yGHruBBVIjoM1Ib1lLj6B+lMueYrFW3RdZg==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "nMbovGjCCSrbx9oJbLcwbGbtw/86ahbj5b76sDR59kJZw5qYdJyOMF3yrIhkwyWPWyM3x1ut0Xt/V30wvr02NQ==", "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "3.3.3", - "System.Collections.Immutable": "5.0.0", - "System.Memory": "4.5.4", - "System.Reflection.Metadata": "5.0.0", + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "System.Collections.Immutable": "7.0.0", + "System.Memory": "4.5.5", + "System.Reflection.Metadata": "7.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encoding.CodePages": "7.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.CodeAnalysis.CSharp": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "YSZa5KVYl3zzha6OPkRcJHCpkc61qH4R5nKeN4EU8xORpdfh46vSodQi4EkdEki7WIJ+J/6WCLLFWEzm4dLtMA==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "Enf4+mPof2C/1dEL73lzjJeEBsCvmU/aF/847aSkaBBaboGSftrfTB/CQLaSn5Z+zqccKlkn3B3faaAzy98VRw==", "dependencies": { - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.CodeAnalysis.CSharp.Features": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "9uhci5uCLrSXqwCiBQIFKogwbvSBSrnQsTZX4Fl8RIrl50JCZbiX6RbJeFF0B8OiqEw8iDxxFxGa0p3LXuCc5w==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "JuJYuQe/ECt8tfxhmzzQQUjibCAKoRilu0XfERzQBQ6mZK6UN3GmAZwZ03AfH6KewRu0zPHOJkBAPUjy2sp1gQ==", "dependencies": { "Humanizer.Core": "2.14.1", - "Microsoft.CodeAnalysis.CSharp": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Features": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.CSharp": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Features": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.CodeAnalysis.CSharp.Workspaces": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "wAZsNIPEOPxpva+1NADgS+y7FE0Y71trTXnivlxi3ENvJRGBk6yBV1Rlvd0f7t4FdUvpCDu/7gPipaZfbAts2Q==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "X7rAyGd4H/9bY2shNlxSlCxAAYW8sgTKu3RfYQVjC9dAIC2y9hoItewDdxK9by4ptVOnKDQNRxq3nQ2vsTQ13g==", "dependencies": { "Humanizer.Core": "2.14.1", - "Microsoft.CodeAnalysis.CSharp": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.CSharp": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.CodeAnalysis.Elfie": { "type": "Transitive", - "resolved": "1.0.0-rc14", - "contentHash": "X4AgSKH5aZZwQlEVvdF5kjLuiWiaJKOqV+mMn1MDvy+kiqFOiqiMZuOWK3CiaifhUKhJ139H2h7Lv6YD8EwsQA==", + "resolved": "1.0.0", + "contentHash": "r12elUp4MRjdnRfxEP+xqVSUUfG3yIJTBEJGwbfvF5oU4m0jb9HC0gFG28V/dAkYGMkRmHVi3qvrnBLQSw9X3Q==", "dependencies": { "System.Data.DataSetExtensions": "4.5.0" } }, "Microsoft.CodeAnalysis.Features": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "Wg4BT+w3GCQgKCabPOeOWCIryTZdF3aV56uUKOMTHt4cOYF1cQcHt2JKJ/QZzeHZCMbqKYMWqSwVb1BxhPT2oA==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "bukzSj0BIovD2a8boq9Eq2KzxkBO59XlGTFIC6OWBzjdwLimIJKsMEl6XpFmBHiuDFwWGxS7p0nkIeEGao2WgQ==", "dependencies": { "Microsoft.CodeAnalysis.AnalyzerUtilities": "3.3.0", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Elfie": "1.0.0-rc14", - "Microsoft.CodeAnalysis.Scripting.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.3.0-1.final]", - "Microsoft.DiaSymReader": "1.4.0", - "Microsoft.VisualStudio.RemoteControl": "16.3.44", - "System.Text.Json": "6.0.0", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Elfie": "1.0.0", + "Microsoft.CodeAnalysis.Scripting.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.9.0-1.23504.3]", + "Microsoft.DiaSymReader": "2.0.0", + "System.Text.Json": "7.0.3", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.CodeAnalysis.Scripting.Common": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "l0UoIutAw0Jx3clHDDlINEzOdAa2zKLCYRvEn2sKhyG/ZbsxVdpmTEa8awd76cTK6SlKjG2pnfH5o6q5iAQeng==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "xsnol9XPNUloXuDs06n02VuVMyjGJMhkRtyGgetoYQjU4M0IosYnDxAEPsthjIGq0WqckQOvjuVIUhCYkO2J3w==", "dependencies": { - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.CodeAnalysis.Workspaces.Common": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "TQAcZeKjp97LZ9Ti7ovg6gWxNJyA62Lhz9ajJs3rdArpQYPy1mxn/wwsmnS6S/yALWjY4rijA65JriiQIy15cA==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "F9jpgDnLEcIX/lNG5oXejuMZtHSOjFffh8ZU2gvsPKw+TI/mWzhc9Me17dU41L2nfGNjZf2KkoTHgnkVCyAljw==", "dependencies": { "Humanizer.Core": "2.14.1", - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "System.Composition": "6.0.0", - "System.IO.Pipelines": "6.0.1" + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "System.Composition": "7.0.0", + "System.IO.Pipelines": "7.0.0", + "System.Threading.Channels": "7.0.0" } }, "Microsoft.CodeCoverage": { @@ -203,87 +203,73 @@ }, "Microsoft.DiaSymReader": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "iLtWq5/W5ePzSraavAFeXAbasE6REDByizTz6M8yQO3e4jf+6pRqPLdNCSvnSfKRVqsF7y/lTVWhqlf89ttweg==" + "resolved": "2.0.0", + "contentHash": "QcZrCETsBJqy/vQpFtJc+jSXQ0K5sucQ6NUFbTNVHD4vfZZOwjZ/3sBzczkC4DityhD3AVO/+K/+9ioLs1AgRA==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "7.0.0", + "contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==", + "resolved": "7.0.0", + "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0", + "resolved": "7.0.0", + "contentHash": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.Extensions.DependencyInjection": "7.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Logging.Abstractions": "7.0.0", + "Microsoft.Extensions.Options": "7.0.0", + "System.Diagnostics.DiagnosticSource": "7.0.0", "System.ValueTuple": "4.5.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==", + "resolved": "7.0.0", + "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" + "System.Memory": "4.5.5" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "7.0.0", + "contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Primitives": "7.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "resolved": "7.0.0", + "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.VisualStudio.RemoteControl": { - "type": "Transitive", - "resolved": "16.3.44", - "contentHash": "hbc2FxReEyotRXM1dtQSZxt2ccNMBgPbcX6MylKp9UDbHsTPJ0dk5CEuZAqoqOFKUzFtorZL6A7BcRAjP9HU1g==", - "dependencies": { - "Microsoft.VisualStudio.Utilities.Internal": "16.3.36" - } - }, - "Microsoft.VisualStudio.Utilities.Internal": { - "type": "Transitive", - "resolved": "16.3.36", - "contentHash": "tVOE9DJbd4PETSgBW+9448jvRdhm/hNHJFaGyCq6Gtlg+ElELBmfMFxgp2rsrqzUkLjehwnrw6uX4Yj9krOfJQ==" - }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + "resolved": "13.0.3", + "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, "System.Buffers": { "type": "Transitive", @@ -292,59 +278,59 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", + "resolved": "7.0.0", + "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Composition": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "d7wMuKQtfsxUa7S13tITC8n1cQzewuhD5iDjZtK2prwFfKVzdYtgrTHgjaV03Zq7feGQ5gkP85tJJntXwInsJA==", + "resolved": "7.0.0", + "contentHash": "tRwgcAkDd85O8Aq6zHDANzQaq380cek9lbMg5Qma46u5BZXq/G+XvIYmu+UI+BIIZ9zssXLYrkTykEqxxvhcmg==", "dependencies": { - "System.Composition.AttributedModel": "6.0.0", - "System.Composition.Convention": "6.0.0", - "System.Composition.Hosting": "6.0.0", - "System.Composition.Runtime": "6.0.0", - "System.Composition.TypedParts": "6.0.0" + "System.Composition.AttributedModel": "7.0.0", + "System.Composition.Convention": "7.0.0", + "System.Composition.Hosting": "7.0.0", + "System.Composition.Runtime": "7.0.0", + "System.Composition.TypedParts": "7.0.0" } }, "System.Composition.AttributedModel": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "WK1nSDLByK/4VoC7fkNiFuTVEiperuCN/Hyn+VN30R+W2ijO1d0Z2Qm0ScEl9xkSn1G2MyapJi8xpf4R8WRa/w==" + "resolved": "7.0.0", + "contentHash": "2QzClqjElKxgI1jK1Jztnq44/8DmSuTSGGahXqQ4TdEV0h9s2KikQZIgcEqVzR7OuWDFPGLHIprBJGQEPr8fAQ==" }, "System.Composition.Convention": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "XYi4lPRdu5bM4JVJ3/UIHAiG6V6lWWUlkhB9ab4IOq0FrRsp0F4wTyV4Dj+Ds+efoXJ3qbLqlvaUozDO7OLeXA==", + "resolved": "7.0.0", + "contentHash": "IMhTlpCs4HmlD8B+J8/kWfwX7vrBBOs6xyjSTzBlYSs7W4OET4tlkR/Sg9NG8jkdJH9Mymq0qGdYS1VPqRTBnQ==", "dependencies": { - "System.Composition.AttributedModel": "6.0.0" + "System.Composition.AttributedModel": "7.0.0" } }, "System.Composition.Hosting": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "w/wXjj7kvxuHPLdzZ0PAUt++qJl03t7lENmb2Oev0n3zbxyNULbWBlnd5J5WUMMv15kg5o+/TCZFb6lSwfaUUQ==", + "resolved": "7.0.0", + "contentHash": "eB6gwN9S+54jCTBJ5bpwMOVerKeUfGGTYCzz3QgDr1P55Gg/Wb27ShfPIhLMjmZ3MoAKu8uUSv6fcCdYJTN7Bg==", "dependencies": { - "System.Composition.Runtime": "6.0.0" + "System.Composition.Runtime": "7.0.0" } }, "System.Composition.Runtime": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qkRH/YBaMPTnzxrS5RDk1juvqed4A6HOD/CwRcDGyPpYps1J27waBddiiq1y93jk2ZZ9wuA/kynM+NO0kb3PKg==" + "resolved": "7.0.0", + "contentHash": "aZJ1Zr5Txe925rbo4742XifEyW0MIni1eiUebmcrP3HwLXZ3IbXUj4MFMUH/RmnJOAQiS401leg/2Sz1MkApDw==" }, "System.Composition.TypedParts": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "iUR1eHrL8Cwd82neQCJ00MpwNIBs4NZgXzrPqx8NJf/k4+mwBO0XCRmHYJT4OLSwDDqh5nBLJWkz5cROnrGhRA==", + "resolved": "7.0.0", + "contentHash": "ZK0KNPfbtxVceTwh+oHNGUOYV2WNOHReX2AXipuvkURC7s/jPwoWfsu3SnDBDgofqbiWr96geofdQ2erm/KTHg==", "dependencies": { - "System.Composition.AttributedModel": "6.0.0", - "System.Composition.Hosting": "6.0.0", - "System.Composition.Runtime": "6.0.0" + "System.Composition.AttributedModel": "7.0.0", + "System.Composition.Hosting": "7.0.0", + "System.Composition.Runtime": "7.0.0" } }, "System.Data.DataSetExtensions": { @@ -354,27 +340,27 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "resolved": "7.0.0", + "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "1j1pZX1ICzEyjafyssU3BzWVxUsaN3zq0wEmGKj3bxINC6NkmS30eEVuZ7k/QX2UKYNCaUch6g46taYKxcpFtw==", + "resolved": "7.0.0", + "contentHash": "jRn6JYnNPW6xgQazROBLSfpdoczRw694vO5kKvMcNnpXuolEixUyw6IBuBs2Y2mlSX/LdLvyyWmfXhaI3ND1Yg==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Threading.Tasks.Extensions": "4.5.4" } }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { "System.Buffers": "4.5.1", "System.Numerics.Vectors": "4.5.0", @@ -388,19 +374,19 @@ }, "System.Reactive": { "type": "Transitive", - "resolved": "4.4.1", - "contentHash": "iSTPeWR9HJhGoNV4WhVlvofuiTjpok1i4E3LPgMdbMqf3jKhFlT9HAlO32lb52NLppWC/4dZQFfUzTytvyXBmw==", + "resolved": "6.0.0", + "contentHash": "31kfaW4ZupZzPsI5PVe77VhnvFF55qgma7KZr/E0iFTs6fmdhhG8j0mgEx620iLTey1EynOkEfnyTjtNEpJzGw==", "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" + "System.Threading.Tasks.Extensions": "4.5.4" } }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", + "resolved": "7.0.0", + "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==", "dependencies": { - "System.Collections.Immutable": "5.0.0" + "System.Collections.Immutable": "7.0.0", + "System.Memory": "4.5.5" } }, "System.Runtime.CompilerServices.Unsafe": { @@ -410,38 +396,46 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", + "resolved": "7.0.0", + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "resolved": "7.0.0", + "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "7.0.3", + "contentHash": "AyjhwXN1zTFeIibHimfJn6eAsZ7rTBib79JQpzg8WAuR/HKDu9JGNHTuu3nbbXQ/bgI+U4z6HtZmCHNXB1QXrQ==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Numerics.Vectors": "4.5.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "6.0.0", + "System.Text.Encodings.Web": "7.0.0", "System.Threading.Tasks.Extensions": "4.5.4", "System.ValueTuple": "4.5.0" } }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", @@ -458,13 +452,13 @@ "sonarlint.omnisharp.dotnet.services": { "type": "Project", "dependencies": { - "Microsoft.CodeAnalysis.CSharp.Features": "[4.3.0-1.final, )", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.3.0-1.final, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.Collections.Immutable": "[6.0.0, )", - "System.Composition.AttributedModel": "[6.0.0, )", - "System.Reactive": "[4.4.1, )" + "Microsoft.CodeAnalysis.CSharp.Features": "[4.9.0-1.23504.3, )", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.9.0-1.23504.3, )", + "Microsoft.Extensions.Logging": "[7.0.0, )", + "Newtonsoft.Json": "[13.0.3, )", + "System.Collections.Immutable": "[7.0.0, )", + "System.Composition.AttributedModel": "[7.0.0, )", + "System.Reactive": "[6.0.0, )" } } } diff --git a/omnisharp-dotnet/src/Services/DiagnosticWorker/OmniSharp/CopiedCSharpDiagnosticWorker.cs b/omnisharp-dotnet/src/Services/DiagnosticWorker/OmniSharp/CopiedCSharpDiagnosticWorker.cs index c8a5df79..0fa7e76a 100644 --- a/omnisharp-dotnet/src/Services/DiagnosticWorker/OmniSharp/CopiedCSharpDiagnosticWorker.cs +++ b/omnisharp-dotnet/src/Services/DiagnosticWorker/OmniSharp/CopiedCSharpDiagnosticWorker.cs @@ -42,12 +42,13 @@ public class CopiedCSharpDiagnosticWorker: ICsDiagnosticWorker, IDisposable private readonly IObserver _openDocuments; private readonly IDisposable _disposable; - public CopiedCSharpDiagnosticWorker(OmniSharpWorkspace workspace, DiagnosticEventForwarder forwarder, ILoggerFactory loggerFactory, OmniSharpOptions options) + public CopiedCSharpDiagnosticWorker(OmniSharpWorkspace workspace, DiagnosticEventForwarder forwarder, ILoggerFactory loggerFactory, OmniSharpOptions options, bool enableAnalyzers = true) { _workspace = workspace; _forwarder = forwarder; _logger = loggerFactory.CreateLogger(); _options = options; + AnalyzersEnabled = enableAnalyzers; var openDocumentsSubject = new Subject(); _openDocuments = openDocumentsSubject; @@ -227,6 +228,17 @@ public ImmutableArray QueueDocumentsForDiagnostics(ImmutableArray x.Id).ToImmutableArray(); } + public ImmutableArray QueueDocumentsForDiagnostics(IEnumerable documents, AnalyzerWorkType workType) + { + QueueForDiagnosis(documents.Select(document => document.FilePath).ToImmutableArray()); + return documents.Select(document => document.Id).ToImmutableArray(); + } + + public bool AnalyzersEnabled + { + get; + } + public Task> GetAllDiagnosticsAsync() { var documents = _workspace.CurrentSolution.Projects.SelectMany(x => x.Documents).Select(x => x.FilePath).ToImmutableArray(); diff --git a/omnisharp-dotnet/src/Services/SonarLint.OmniSharp.DotNet.Services.csproj b/omnisharp-dotnet/src/Services/SonarLint.OmniSharp.DotNet.Services.csproj index ee632b75..d8769592 100644 --- a/omnisharp-dotnet/src/Services/SonarLint.OmniSharp.DotNet.Services.csproj +++ b/omnisharp-dotnet/src/Services/SonarLint.OmniSharp.DotNet.Services.csproj @@ -13,13 +13,13 @@ Referencing a different version of NewtonSoft.Json doesn't seem to cause a problem, but we're targeting the same version to be on the safe side. --> - - - - - - - + + + + + + + diff --git a/omnisharp-dotnet/src/Services/packages.lock.json b/omnisharp-dotnet/src/Services/packages.lock.json index 8a1d8eca..6dcc9060 100644 --- a/omnisharp-dotnet/src/Services/packages.lock.json +++ b/omnisharp-dotnet/src/Services/packages.lock.json @@ -4,42 +4,42 @@ ".NETStandard,Version=v2.0": { "Microsoft.CodeAnalysis.CSharp.Features": { "type": "Direct", - "requested": "[4.3.0-1.final, )", - "resolved": "4.3.0-1.final", - "contentHash": "9uhci5uCLrSXqwCiBQIFKogwbvSBSrnQsTZX4Fl8RIrl50JCZbiX6RbJeFF0B8OiqEw8iDxxFxGa0p3LXuCc5w==", + "requested": "[4.9.0-1.23504.3, )", + "resolved": "4.9.0-1.23504.3", + "contentHash": "JuJYuQe/ECt8tfxhmzzQQUjibCAKoRilu0XfERzQBQ6mZK6UN3GmAZwZ03AfH6KewRu0zPHOJkBAPUjy2sp1gQ==", "dependencies": { "Humanizer.Core": "2.14.1", - "Microsoft.CodeAnalysis.CSharp": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Features": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.CSharp": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Features": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.CodeAnalysis.CSharp.Workspaces": { "type": "Direct", - "requested": "[4.3.0-1.final, )", - "resolved": "4.3.0-1.final", - "contentHash": "wAZsNIPEOPxpva+1NADgS+y7FE0Y71trTXnivlxi3ENvJRGBk6yBV1Rlvd0f7t4FdUvpCDu/7gPipaZfbAts2Q==", + "requested": "[4.9.0-1.23504.3, )", + "resolved": "4.9.0-1.23504.3", + "contentHash": "X7rAyGd4H/9bY2shNlxSlCxAAYW8sgTKu3RfYQVjC9dAIC2y9hoItewDdxK9by4ptVOnKDQNRxq3nQ2vsTQ13g==", "dependencies": { "Humanizer.Core": "2.14.1", - "Microsoft.CodeAnalysis.CSharp": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.CSharp": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.Extensions.Logging": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.Extensions.DependencyInjection": "7.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Logging.Abstractions": "7.0.0", + "Microsoft.Extensions.Options": "7.0.0", + "System.Diagnostics.DiagnosticSource": "7.0.0" } }, "NETStandard.Library": { @@ -53,33 +53,32 @@ }, "Newtonsoft.Json": { "type": "Direct", - "requested": "[13.0.1, )", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + "requested": "[13.0.3, )", + "resolved": "13.0.3", + "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, "System.Collections.Immutable": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Composition.AttributedModel": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "WK1nSDLByK/4VoC7fkNiFuTVEiperuCN/Hyn+VN30R+W2ijO1d0Z2Qm0ScEl9xkSn1G2MyapJi8xpf4R8WRa/w==" + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "2QzClqjElKxgI1jK1Jztnq44/8DmSuTSGGahXqQ4TdEV0h9s2KikQZIgcEqVzR7OuWDFPGLHIprBJGQEPr8fAQ==" }, "System.Reactive": { "type": "Direct", - "requested": "[4.4.1, )", - "resolved": "4.4.1", - "contentHash": "iSTPeWR9HJhGoNV4WhVlvofuiTjpok1i4E3LPgMdbMqf3jKhFlT9HAlO32lb52NLppWC/4dZQFfUzTytvyXBmw==", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "31kfaW4ZupZzPsI5PVe77VhnvFF55qgma7KZr/E0iFTs6fmdhhG8j0mgEx620iLTey1EynOkEfnyTjtNEpJzGw==", "dependencies": { - "System.Runtime.InteropServices.WindowsRuntime": "4.3.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, @@ -90,16 +89,16 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", + "resolved": "7.0.0", + "contentHash": "3aeMZ1N0lJoSyzqiP03hqemtb1BijhsJADdobn/4nsMJ8V1H+CrpuduUe4hlRdx+ikBQju1VGjMD1GJ3Sk05Eg==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", - "resolved": "3.3.3", - "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" + "resolved": "3.3.4", + "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g==" }, "Microsoft.CodeAnalysis.AnalyzerUtilities": { "type": "Transitive", @@ -108,30 +107,30 @@ }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "gG3YyfXvle+kHbybYCG6a/aD1SeaLt99NNFl35RzJrYdQxWQDn/yGHruBBVIjoM1Ib1lLj6B+lMueYrFW3RdZg==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "nMbovGjCCSrbx9oJbLcwbGbtw/86ahbj5b76sDR59kJZw5qYdJyOMF3yrIhkwyWPWyM3x1ut0Xt/V30wvr02NQ==", "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "3.3.3", - "System.Collections.Immutable": "5.0.0", - "System.Memory": "4.5.4", - "System.Reflection.Metadata": "5.0.0", + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "System.Collections.Immutable": "7.0.0", + "System.Memory": "4.5.5", + "System.Reflection.Metadata": "7.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encoding.CodePages": "7.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.CodeAnalysis.CSharp": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "YSZa5KVYl3zzha6OPkRcJHCpkc61qH4R5nKeN4EU8xORpdfh46vSodQi4EkdEki7WIJ+J/6WCLLFWEzm4dLtMA==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "Enf4+mPof2C/1dEL73lzjJeEBsCvmU/aF/847aSkaBBaboGSftrfTB/CQLaSn5Z+zqccKlkn3B3faaAzy98VRw==", "dependencies": { - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.CodeAnalysis.Elfie": { "type": "Transitive", - "resolved": "1.0.0-rc14", - "contentHash": "X4AgSKH5aZZwQlEVvdF5kjLuiWiaJKOqV+mMn1MDvy+kiqFOiqiMZuOWK3CiaifhUKhJ139H2h7Lv6YD8EwsQA==", + "resolved": "1.0.0", + "contentHash": "r12elUp4MRjdnRfxEP+xqVSUUfG3yIJTBEJGwbfvF5oU4m0jb9HC0gFG28V/dAkYGMkRmHVi3qvrnBLQSw9X3Q==", "dependencies": { "System.Configuration.ConfigurationManager": "4.5.0", "System.Data.DataSetExtensions": "4.5.0" @@ -139,93 +138,89 @@ }, "Microsoft.CodeAnalysis.Features": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "Wg4BT+w3GCQgKCabPOeOWCIryTZdF3aV56uUKOMTHt4cOYF1cQcHt2JKJ/QZzeHZCMbqKYMWqSwVb1BxhPT2oA==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "bukzSj0BIovD2a8boq9Eq2KzxkBO59XlGTFIC6OWBzjdwLimIJKsMEl6XpFmBHiuDFwWGxS7p0nkIeEGao2WgQ==", "dependencies": { "Microsoft.CodeAnalysis.AnalyzerUtilities": "3.3.0", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Elfie": "1.0.0-rc14", - "Microsoft.CodeAnalysis.Scripting.Common": "[4.3.0-1.final]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.3.0-1.final]", - "Microsoft.DiaSymReader": "1.4.0", - "Microsoft.VisualStudio.RemoteControl": "16.3.44", - "System.Text.Json": "6.0.0", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Elfie": "1.0.0", + "Microsoft.CodeAnalysis.Scripting.Common": "[4.9.0-1.23504.3]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.9.0-1.23504.3]", + "Microsoft.DiaSymReader": "2.0.0", + "System.Text.Json": "7.0.3", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.CodeAnalysis.Scripting.Common": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "l0UoIutAw0Jx3clHDDlINEzOdAa2zKLCYRvEn2sKhyG/ZbsxVdpmTEa8awd76cTK6SlKjG2pnfH5o6q5iAQeng==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "xsnol9XPNUloXuDs06n02VuVMyjGJMhkRtyGgetoYQjU4M0IosYnDxAEPsthjIGq0WqckQOvjuVIUhCYkO2J3w==", "dependencies": { - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]" + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]" } }, "Microsoft.CodeAnalysis.Workspaces.Common": { "type": "Transitive", - "resolved": "4.3.0-1.final", - "contentHash": "TQAcZeKjp97LZ9Ti7ovg6gWxNJyA62Lhz9ajJs3rdArpQYPy1mxn/wwsmnS6S/yALWjY4rijA65JriiQIy15cA==", + "resolved": "4.9.0-1.23504.3", + "contentHash": "F9jpgDnLEcIX/lNG5oXejuMZtHSOjFffh8ZU2gvsPKw+TI/mWzhc9Me17dU41L2nfGNjZf2KkoTHgnkVCyAljw==", "dependencies": { "Humanizer.Core": "2.14.1", - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "Microsoft.CodeAnalysis.Common": "[4.3.0-1.final]", - "System.Composition": "6.0.0", - "System.IO.Pipelines": "6.0.1" + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.CodeAnalysis.Common": "[4.9.0-1.23504.3]", + "System.Composition": "7.0.0", + "System.IO.Pipelines": "7.0.0", + "System.Threading.Channels": "7.0.0" } }, "Microsoft.DiaSymReader": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "iLtWq5/W5ePzSraavAFeXAbasE6REDByizTz6M8yQO3e4jf+6pRqPLdNCSvnSfKRVqsF7y/lTVWhqlf89ttweg==", - "dependencies": { - "NETStandard.Library": "1.6.1" - } + "resolved": "2.0.0", + "contentHash": "QcZrCETsBJqy/vQpFtJc+jSXQ0K5sucQ6NUFbTNVHD4vfZZOwjZ/3sBzczkC4DityhD3AVO/+K/+9ioLs1AgRA==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "7.0.0", + "contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==", + "resolved": "7.0.0", + "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==", + "resolved": "7.0.0", + "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" + "System.Memory": "4.5.5" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "7.0.0", + "contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Primitives": "7.0.0", "System.ComponentModel.Annotations": "5.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "resolved": "7.0.0", + "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, @@ -234,40 +229,6 @@ "resolved": "1.1.0", "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, - "Microsoft.VisualStudio.RemoteControl": { - "type": "Transitive", - "resolved": "16.3.44", - "contentHash": "hbc2FxReEyotRXM1dtQSZxt2ccNMBgPbcX6MylKp9UDbHsTPJ0dk5CEuZAqoqOFKUzFtorZL6A7BcRAjP9HU1g==", - "dependencies": { - "Microsoft.VisualStudio.Utilities.Internal": "16.3.36", - "System.Configuration.ConfigurationManager": "4.5.0", - "System.IO.FileSystem.AccessControl": "4.5.0" - } - }, - "Microsoft.VisualStudio.Utilities.Internal": { - "type": "Transitive", - "resolved": "16.3.36", - "contentHash": "tVOE9DJbd4PETSgBW+9448jvRdhm/hNHJFaGyCq6Gtlg+ElELBmfMFxgp2rsrqzUkLjehwnrw6uX4Yj9krOfJQ==", - "dependencies": { - "Microsoft.Win32.Registry": "4.5.0" - } - }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "+FWlwd//+Tt56316p00hVePBCouXyEzT86Jb3+AuRotTND0IYn0OO3obs1gnQEs/txEnt+rF2JBGLItTG+Be6A==", - "dependencies": { - "System.Buffers": "4.4.0", - "System.Memory": "4.5.0", - "System.Security.AccessControl": "4.5.0", - "System.Security.Principal.Windows": "4.5.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -280,45 +241,45 @@ }, "System.Composition": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "d7wMuKQtfsxUa7S13tITC8n1cQzewuhD5iDjZtK2prwFfKVzdYtgrTHgjaV03Zq7feGQ5gkP85tJJntXwInsJA==", + "resolved": "7.0.0", + "contentHash": "tRwgcAkDd85O8Aq6zHDANzQaq380cek9lbMg5Qma46u5BZXq/G+XvIYmu+UI+BIIZ9zssXLYrkTykEqxxvhcmg==", "dependencies": { - "System.Composition.AttributedModel": "6.0.0", - "System.Composition.Convention": "6.0.0", - "System.Composition.Hosting": "6.0.0", - "System.Composition.Runtime": "6.0.0", - "System.Composition.TypedParts": "6.0.0" + "System.Composition.AttributedModel": "7.0.0", + "System.Composition.Convention": "7.0.0", + "System.Composition.Hosting": "7.0.0", + "System.Composition.Runtime": "7.0.0", + "System.Composition.TypedParts": "7.0.0" } }, "System.Composition.Convention": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "XYi4lPRdu5bM4JVJ3/UIHAiG6V6lWWUlkhB9ab4IOq0FrRsp0F4wTyV4Dj+Ds+efoXJ3qbLqlvaUozDO7OLeXA==", + "resolved": "7.0.0", + "contentHash": "IMhTlpCs4HmlD8B+J8/kWfwX7vrBBOs6xyjSTzBlYSs7W4OET4tlkR/Sg9NG8jkdJH9Mymq0qGdYS1VPqRTBnQ==", "dependencies": { - "System.Composition.AttributedModel": "6.0.0" + "System.Composition.AttributedModel": "7.0.0" } }, "System.Composition.Hosting": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "w/wXjj7kvxuHPLdzZ0PAUt++qJl03t7lENmb2Oev0n3zbxyNULbWBlnd5J5WUMMv15kg5o+/TCZFb6lSwfaUUQ==", + "resolved": "7.0.0", + "contentHash": "eB6gwN9S+54jCTBJ5bpwMOVerKeUfGGTYCzz3QgDr1P55Gg/Wb27ShfPIhLMjmZ3MoAKu8uUSv6fcCdYJTN7Bg==", "dependencies": { - "System.Composition.Runtime": "6.0.0" + "System.Composition.Runtime": "7.0.0" } }, "System.Composition.Runtime": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qkRH/YBaMPTnzxrS5RDk1juvqed4A6HOD/CwRcDGyPpYps1J27waBddiiq1y93jk2ZZ9wuA/kynM+NO0kb3PKg==" + "resolved": "7.0.0", + "contentHash": "aZJ1Zr5Txe925rbo4742XifEyW0MIni1eiUebmcrP3HwLXZ3IbXUj4MFMUH/RmnJOAQiS401leg/2Sz1MkApDw==" }, "System.Composition.TypedParts": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "iUR1eHrL8Cwd82neQCJ00MpwNIBs4NZgXzrPqx8NJf/k4+mwBO0XCRmHYJT4OLSwDDqh5nBLJWkz5cROnrGhRA==", + "resolved": "7.0.0", + "contentHash": "ZK0KNPfbtxVceTwh+oHNGUOYV2WNOHReX2AXipuvkURC7s/jPwoWfsu3SnDBDgofqbiWr96geofdQ2erm/KTHg==", "dependencies": { - "System.Composition.AttributedModel": "6.0.0", - "System.Composition.Hosting": "6.0.0", - "System.Composition.Runtime": "6.0.0" + "System.Composition.AttributedModel": "7.0.0", + "System.Composition.Hosting": "7.0.0", + "System.Composition.Runtime": "7.0.0" } }, "System.Configuration.ConfigurationManager": { @@ -337,36 +298,27 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "resolved": "7.0.0", + "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "TYe6xstoqT5MlTly0OtPU6u9zWuNScLVMEx6sTCjjx+Hqdp0wCXoG6fnzMpTPMQACXQzi9pd2N5Tloow+5jQdQ==", - "dependencies": { - "System.Security.AccessControl": "4.5.0", - "System.Security.Principal.Windows": "4.5.0" - } - }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "1j1pZX1ICzEyjafyssU3BzWVxUsaN3zq0wEmGKj3bxINC6NkmS30eEVuZ7k/QX2UKYNCaUch6g46taYKxcpFtw==", + "resolved": "7.0.0", + "contentHash": "jRn6JYnNPW6xgQazROBLSfpdoczRw694vO5kKvMcNnpXuolEixUyw6IBuBs2Y2mlSX/LdLvyyWmfXhaI3ND1Yg==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Threading.Tasks.Extensions": "4.5.4" } }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { "System.Buffers": "4.5.1", "System.Numerics.Vectors": "4.4.0", @@ -380,19 +332,11 @@ }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", - "dependencies": { - "System.Collections.Immutable": "5.0.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "resolved": "7.0.0", + "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "System.Collections.Immutable": "7.0.0", + "System.Memory": "4.5.5" } }, "System.Runtime.CompilerServices.Unsafe": { @@ -400,14 +344,6 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Runtime.InteropServices.WindowsRuntime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J4GUi3xZQLUBasNwZnjrffN8i5wpHrBtZoLG+OhRyGo/+YunMRWWtwoMDlUAIdmX0uRfpHIBDSV6zyr3yf00TA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, "System.Security.AccessControl": { "type": "Transitive", "resolved": "4.5.0", @@ -439,34 +375,42 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", + "resolved": "7.0.0", + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "resolved": "7.0.0", + "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "7.0.3", + "contentHash": "AyjhwXN1zTFeIibHimfJn6eAsZ7rTBib79JQpzg8WAuR/HKDu9JGNHTuu3nbbXQ/bgI+U4z6HtZmCHNXB1QXrQ==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Numerics.Vectors": "4.5.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "6.0.0", + "System.Text.Encodings.Web": "7.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA==", + "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } },