diff --git a/Directory.Build.props b/Directory.Build.props
index 8523d008..29ab3472 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -43,7 +43,7 @@
-
+
diff --git a/test/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj b/test/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj
index e1b6a7ee..f0766fc2 100644
--- a/test/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj
+++ b/test/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj
@@ -30,9 +30,9 @@
-
+
-
+
diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
index 6ee820cc..507e86ea 100644
--- a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
+++ b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
@@ -206,20 +206,20 @@ public void TemplateProvidedMembersMatchVisibilityWithContainingType_OtherMember
this.CollectGeneratedCode(this.generator);
this.AssertNoDiagnostics();
- StructDeclarationSyntax? pcstrType = (StructDeclarationSyntax?)this.FindGeneratedType("PCSTR").Single();
+ StructDeclarationSyntax pcstrType = (StructDeclarationSyntax)this.FindGeneratedType("PCSTR").Single();
SyntaxKind expectedVisibility = generatePublic ? SyntaxKind.PublicKeyword : SyntaxKind.InternalKeyword;
// Assert fields
- Assert.Contains(pcstrType?.Members.OfType(), f => f.Declaration.Variables.Any(v => v.Identifier.ValueText == "Value") && f.Modifiers.Any(expectedVisibility));
+ Assert.Contains(pcstrType.Members.OfType(), f => f.Declaration.Variables.Any(v => v.Identifier.ValueText == "Value") && f.Modifiers.Any(expectedVisibility));
// Assert properties
- Assert.Contains(pcstrType?.Members.OfType(), p => p.Identifier.ValueText == "Length" && p.Modifiers.Any(expectedVisibility));
+ Assert.Contains(pcstrType.Members.OfType(), p => p.Identifier.ValueText == "Length" && p.Modifiers.Any(expectedVisibility));
// Assert constructors
- Assert.All(pcstrType?.Members.OfType(), c => c.Modifiers.Any(expectedVisibility));
+ Assert.All(pcstrType.Members.OfType(), c => c.Modifiers.Any(expectedVisibility));
// Assert that private members remain private.
- Assert.Contains(pcstrType?.Members.OfType(), p => p.Identifier.ValueText == "DebuggerDisplay" && p.Modifiers.Any(SyntaxKind.PrivateKeyword));
+ Assert.Contains(pcstrType.Members.OfType(), p => p.Identifier.ValueText == "DebuggerDisplay" && p.Modifiers.Any(SyntaxKind.PrivateKeyword));
}
[Fact]
@@ -523,8 +523,8 @@ public void WinRTInterfaceWithWinRTOutObjectUsesMarshaler()
AttributeSyntax marshalAsAttr = Assert.Single(FindAttribute(lastParam.AttributeLists, "MarshalAs"));
Assert.True(marshalAsAttr.ArgumentList?.Arguments[0].ToString() == "UnmanagedType.CustomMarshaler");
- Assert.Single(marshalAsAttr.ArgumentList?.Arguments.Where(arg => arg.ToString() == $"MarshalCookie = \"{WinRTClassName}\""));
- Assert.Single(marshalAsAttr.ArgumentList?.Arguments.Where(arg => arg.ToString() == $"MarshalType = \"{WinRTCustomMarshalerFullName}\""));
+ Assert.Single(marshalAsAttr.ArgumentList.Arguments.Where(arg => arg.ToString() == $"MarshalCookie = \"{WinRTClassName}\""));
+ Assert.Single(marshalAsAttr.ArgumentList.Arguments.Where(arg => arg.ToString() == $"MarshalType = \"{WinRTCustomMarshalerFullName}\""));
// Make sure the WinRT marshaler was brought in
Assert.Single(this.FindGeneratedType(WinRTCustomMarshalerClass));
diff --git a/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj b/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj
index 9cdfee39..6a0bc18b 100644
--- a/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj
+++ b/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj
@@ -42,11 +42,11 @@
-
+
-
+