Skip tests and rectify expectation

Author: Julien Couvreur

src/Compilers/CSharp/Test/Symbol/Symbols/Source/NullablePublicAPITests.cs

@@ -2185,20 +2185,22 @@ void M(object o1, object? o2)
 
             var declarations = root.DescendantNodes().OfType<ForEachStatementSyntax>().ToList();
 
-            assertAnnotation(declarations[0], PublicNullableAnnotation.Annotated);
-            assertAnnotation(declarations[1], PublicNullableAnnotation.Annotated);
-            assertAnnotation(declarations[2], PublicNullableAnnotation.Annotated);
-            assertAnnotation(declarations[3], PublicNullableAnnotation.Annotated);
+            assertAnnotation(declarations[0]);
+            assertAnnotation(declarations[1]);
+            assertAnnotation(declarations[2]);
+            assertAnnotation(declarations[3]);
 
-            void assertAnnotation(ForEachStatementSyntax foreachStatement, PublicNullableAnnotation expectedAnnotation)
+            void assertAnnotation(ForEachStatementSyntax foreachStatement)
             {
                 var symbol = model.GetDeclaredSymbol(foreachStatement);
-                Assert.Equal(expectedAnnotation, symbol.NullableAnnotation);
-                Assert.Equal(expectedAnnotation, symbol.Type.NullableAnnotation);
+                Assert.Equal(PublicNullableAnnotation.Annotated, symbol.NullableAnnotation);
+                Assert.Equal(PublicNullableAnnotation.Annotated, symbol.Type.NullableAnnotation);
 
                 var typeInfo = model.GetTypeInfo(foreachStatement.Type);
-                Assert.Equal(expectedAnnotation, typeInfo.Nullability.Annotation);
-                Assert.Equal(expectedAnnotation, typeInfo.ConvertedNullability.Annotation);
+                Assert.Equal(PublicNullableAnnotation.Annotated, typeInfo.Nullability.Annotation);
+                Assert.Equal(PublicNullableAnnotation.Annotated, typeInfo.ConvertedNullability.Annotation);
+                Assert.Equal(PublicNullableAnnotation.Annotated, typeInfo.Type.NullableAnnotation);
+                Assert.Equal(PublicNullableAnnotation.Annotated, typeInfo.ConvertedType.NullableAnnotation);
             }
         }
 

src/EditorFeatures/CSharpTest/Diagnostics/UseImplicitOrExplicitType/UseExplicitTypeTests.cs

@@ -670,7 +670,7 @@ class Program
 {
     void Method(Program? x, Program2 x2)
     {
-        (Program y1, Program2 y2) = (x, x2);
+        (Program? y1, Program2? y2) = (x, x2);
     }
 }";
             // The type is not intrinsic and not apparent
@@ -895,7 +895,7 @@ void Method(System.Collections.Generic.IEnumerable<Program> x)
             await TestInRegularAndScriptAsync(before, after, options: ExplicitTypeExceptWhereApparent());
         }
 
-        [WpfFact, Trait(Traits.Feature, Traits.Features.CodeActionsUseExplicitType)]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/37491"), Trait(Traits.Feature, Traits.Features.CodeActionsUseExplicitType)]
         [WorkItem(40477, "https://github.com/dotnet/roslyn/issues/40477")]
         public async Task NotNullableType_ForeachVarDeconstruction()
         {
@@ -913,14 +913,13 @@ void Method(System.Collections.Generic.IEnumerable<(Program, Program)> x)
         }
     }
 }";
-            // UNDONE: should be `foreach ((Program? y1, Program? y2) in x)`
             var after = @"
 class Program
 {
     void Method(System.Collections.Generic.IEnumerable<(Program, Program)> x)
     {
 #nullable enable
-        foreach ((Program y1, Program y2) in x)
+        foreach ((Program? y1, Program? y2) in x)
         {
         }
     }