Use 2.9.0 source code, commit hash 958f2354c4d83dbb0e7723d0a8079a0dfb…

…c33f25
markfelt · Sep 20, 2018 · 3c27c68 · 3c27c68
1 parent 370333e
commit 3c27c68
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CSharp/CSharpExpressionCompiler/Symbols/DisplayClassInstance.cs b/CSharp/CSharpExpressionCompiler/Symbols/DisplayClassInstance.cs
@@ -77,7 +77,7 @@ internal DisplayClassInstanceFromParameter(ParameterSymbol parameter)
         {
             Debug.Assert((object)parameter != null);
             Debug.Assert(parameter.Name.EndsWith("this", StringComparison.Ordinal) ||
-                parameter.Name.Equals("", StringComparison.Ordinal) || // unnamed
+                parameter.Name.Length == 0 || // unnamed
                 parameter.Name.Equals("value", StringComparison.Ordinal) || // display class instance passed to local function as parameter
                 GeneratedNames.GetKind(parameter.Name) == GeneratedNameKind.TransparentIdentifier);
             this.Parameter = parameter;

diff --git a/CSharp/CSharpExpressionCompiler/Symbols/EETypeParameterSymbol.cs b/CSharp/CSharpExpressionCompiler/Symbols/EETypeParameterSymbol.cs
@@ -124,7 +124,7 @@ internal override NamedTypeSymbol GetEffectiveBaseClass(ConsList<TypeParameterSy
         internal override ImmutableArray<NamedTypeSymbol> GetInterfaces(ConsList<TypeParameterSymbol> inProgress)
         {
             var interfaces = _sourceTypeParameter.GetInterfaces(inProgress);
-            return this.TypeMap.SubstituteNamedTypes(InterfacesNoUseSiteDiagnostics()); // It looks like there is a bug on this line https://github.com/dotnet/roslyn/issues/23886
+            return this.TypeMap.SubstituteNamedTypes(interfaces);
         }
 
         private TypeMap TypeMap

diff --git a/Core/ExpressionCompiler/PDB/MethodDebugInfo.Native.cs b/Core/ExpressionCompiler/PDB/MethodDebugInfo.Native.cs
@@ -288,7 +288,7 @@ private static void ReadCSharpNativeImportsInfo(
 
             var importStringGroups = CustomDebugInfoReader.GetCSharpGroupedImportStrings(
                 methodToken,
-                KeyValuePair.Create(reader, methodVersion),
+                KeyValuePairUtil.Create(reader, methodVersion),
                 getMethodCustomDebugInfo: (token, arg) => GetCustomDebugInfoBytes(arg.Key, token, arg.Value),
                 getMethodImportStrings: (token, arg) => GetImportStrings(arg.Key, token, arg.Value),
                 externAliasStrings: out externAliasStrings);
@@ -532,7 +532,7 @@ private static void ReadVisualBasicImportsDebugInfo(
 
             var importStrings = CustomDebugInfoReader.GetVisualBasicImportStrings(
                 methodToken,  
-                KeyValuePair.Create(reader, methodVersion),
+                KeyValuePairUtil.Create(reader, methodVersion),
                 (token, arg) => GetImportStrings(arg.Key, token, arg.Value));
 
             if (importStrings.IsDefault)

diff --git a/VisualBasic/BasicExpressionCompiler/Binders/SuppressDiagnosticsBinder.vb b/VisualBasic/BasicExpressionCompiler/Binders/SuppressDiagnosticsBinder.vb
@@ -2,14 +2,14 @@
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
 
-#Disable Warning RS0010
+#Disable Warning CA1200 ' Avoid using cref tags with a prefix
     ''' <summary>
     ''' Causes all diagnostics related to <see cref="ObsoleteAttribute"/>
     ''' and <see cref="T:Windows.Foundation.MetadataDeprecatedAttribute"/> 
     ''' to be suppressed.
     ''' </summary>
     Friend NotInheritable Class SuppressDiagnosticsBinder
-#Enable Warning RS0010
+#Enable Warning CA1200 ' Avoid using cref tags with a prefix
         Inherits Binder
 
         Public Sub New(containingBinder As Binder)

diff --git a/VisualBasic/BasicExpressionCompiler/Symbols/EEMethodSymbol.vb b/VisualBasic/BasicExpressionCompiler/Symbols/EEMethodSymbol.vb
@@ -439,14 +439,14 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
             End Get
         End Property
 
-#Disable Warning RS0010
+#Disable Warning CA1200 ' Avoid using cref tags with a prefix
         ''' <remarks>
         ''' The corresponding C# method, 
         ''' <see cref="M:Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.EEMethodSymbol.GenerateMethodBody(Microsoft.CodeAnalysis.CSharp.TypeCompilationState,Microsoft.CodeAnalysis.DiagnosticBag)"/>, 
         ''' invokes the <see cref="LocalRewriter"/> and the <see cref="LambdaRewriter"/> explicitly.
         ''' In VB, the caller (of this method) does that.
         ''' </remarks>
-#Enable Warning RS0010
+#Enable Warning CA1200 ' Avoid using cref tags with a prefix
         Friend Overrides Function GetBoundMethodBody(compilationState As TypeCompilationState, diagnostics As DiagnosticBag, <Out> ByRef Optional methodBodyBinder As Binder = Nothing) As BoundBlock
             Dim body = _generateMethodBody(Me, diagnostics, _lazyResultProperties)
             Debug.Assert(body IsNot Nothing)