Merge pull request #1361 from calumgrant/cs/roslyn-3.1

hvitved · web-flow · commit 8fe2bccbf89d · 2019-05-22T20:31:09.000+02:00
C#: Update to Roslyn 3.1
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs
@@ -139,16 +139,9 @@ public static void ExtractModifiers(Context cx, IEntity key, ISymbol symbol)
 
                 if (nt.TypeKind == TypeKind.Struct)
                 {
-                    // Sadly, these properties are internal so cannot be accessed directly.
-                    // This seems to be a deficiency in the model.
-                    var readonlyProperty = nt.GetType().GetProperty("IsReadOnly", BindingFlags.NonPublic | BindingFlags.Instance);
-
-                    bool isReadOnly = (bool)readonlyProperty.GetValue(nt);
-                    bool isByRefLikeType = nt.IsRefLikeType;
-
-                    if (isReadOnly)
+                    if (nt.IsReadOnly)
                         HasModifier(cx, key, "readonly");
-                    if (isByRefLikeType)
+                    if (nt.IsRefLikeType)
                         HasModifier(cx, key, "ref");
                 }
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj b/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.1.0" />
     <PackageReference Include="GitInfo" Version="2.0.18" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -139,16 +139,9 @@ public static void ExtractModifiers(Context cx, IEntity key, ISymbol symbol)`
`139`	`139`
`140`	`140`	`if (nt.TypeKind == TypeKind.Struct)`
`141`	`141`	`{`
`142`		`- // Sadly, these properties are internal so cannot be accessed directly.`
`143`		`- // This seems to be a deficiency in the model.`
`144`		`- var readonlyProperty = nt.GetType().GetProperty("IsReadOnly", BindingFlags.NonPublic \| BindingFlags.Instance);`
`145`		`-`
`146`		`- bool isReadOnly = (bool)readonlyProperty.GetValue(nt);`
`147`		`- bool isByRefLikeType = nt.IsRefLikeType;`
`148`		`-`
`149`		`- if (isReadOnly)`
	`142`	`+ if (nt.IsReadOnly)`
`150`	`143`	`HasModifier(cx, key, "readonly");`
`151`		`- if (isByRefLikeType)`
	`144`	`+ if (nt.IsRefLikeType)`
`152`	`145`	`HasModifier(cx, key, "ref");`
`153`	`146`	`}`
`154`	`147`	`}`