Skip to content

Commit 2eac889

Browse files
authored
Merge pull request #21893 from michaelnebel/cshar/updateroslyn
C#: Update Roslyn and other pinned depenencies.
2 parents 34d4e9a + d4c7b5b commit 2eac889

6 files changed

Lines changed: 70 additions & 76 deletions

File tree

csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ public static bool IsCompilerGeneratedExtensionMethod(this IMethodSymbol method)
664664
// Find the (possibly unbound) original extension method that maps to this implementation (if any).
665665
var unboundDeclaration = extensions.SelectMany(e => e.GetMembers())
666666
.OfType<IMethodSymbol>()
667-
.FirstOrDefault(m => SymbolEqualityComparer.Default.Equals(m.AssociatedExtensionImplementation, method.ConstructedFrom));
667+
.FirstOrDefault(m => SymbolEqualityComparer.Default.Equals(m.AssociatedExtensionImplementation?.ConstructedFrom, method.ConstructedFrom));
668668

669669
var isFullyConstructed = method.IsBoundGenericMethod();
670670
if (isFullyConstructed && unboundDeclaration?.ContainingType is INamedTypeSymbol extensionType)

csharp/paket.dependencies

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ source https://api.nuget.org/v3/index.json
44
# behave like nuget in choosing transitive dependency versions
55
strategy: max
66

7-
nuget Basic.CompilerLog.Util 0.9.25
7+
nuget Basic.CompilerLog.Util 0.9.39
88
nuget Mono.Posix.NETStandard
99
nuget Newtonsoft.Json
1010
nuget NuGet.Versioning
1111
nuget xunit
1212
nuget xunit.runner.visualstudio
1313
nuget xunit.runner.utility
1414
nuget Microsoft.NET.Test.Sdk
15-
nuget Microsoft.CodeAnalysis.CSharp 5.0.0
16-
nuget Microsoft.CodeAnalysis 5.0.0
17-
nuget Microsoft.Build 18.0.2
15+
nuget Microsoft.CodeAnalysis.CSharp 5.3.0
16+
nuget Microsoft.CodeAnalysis 5.3.0
17+
nuget Microsoft.Build 18.6.3
1818
nuget Microsoft.VisualStudio.SolutionPersistence

csharp/paket.lock

Lines changed: 48 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)