Depend on roslyn test utilities, use their diagnostic verification.

Author: 333fred

eng/Version.Details.xml

@@ -87,9 +87,9 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>419ee237406466eebd6bdfbf932a31e26971ec4c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.7.0-3.23314.5">
+    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.7.0-3.23326.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
+      <Sha>419ee237406466eebd6bdfbf932a31e26971ec4c</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -67,6 +67,7 @@
     <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.7.0-3.23326.2</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
     <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.7.0-3.23326.2</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
     <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.7.0-3.23326.2</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
+    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.7.0-3.23326.2</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
     <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.7.0-3.23326.2</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
     <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.7.0-3.23326.2</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
     <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.7.0-3.23326.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>

src/Compiler/test/Microsoft.AspNetCore.Razor.Test.Common/ErrorCode.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.CodeAnalysis;
+
+/// <summary>
+/// Keep names and codes in sync with Roslyn's ErrorCode.cs. Add as necessary.
+/// </summary>
+public enum ErrorCode
+{
+    ERR_SingleTypeNameNotFound = 246,
+    WRN_AsyncLacksAwaits = 1998,
+    WRN_UninitializedNonNullableField = 8618,
+}

src/Compiler/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs

@@ -112,7 +112,12 @@ protected IntegrationTestBase(bool? generateBaselines = null, string? projectDir
     // Used by the test framework to set the 'base' name for test files.
     public static string FileName
     {
-        get { return _fileName.Value; }
+        get
+        {
+            var value = _fileName.Value;
+            Assert.NotNull(value);
+            return value;
+        }
         set { _fileName.Value = value; }
     }
 
@@ -140,6 +145,7 @@ private RazorProjectItem CreateProjectItemFromText(string text, string filePath,
     {
         // Consider the file path to be relative to the 'FileName' of the test.
         var workingDirectory = Path.GetDirectoryName(FileName);
+        Assert.NotNull(workingDirectory);
 
         // Since these paths are used in baselines, we normalize them to windows style. We
         // use "" as the base path by convention to avoid baking in an actual file system

src/Compiler/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.Compiler.csproj

@@ -4,13 +4,10 @@
     <!-- To generate baselines, run tests with /p:GenerateBaselines=true -->
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
-    <TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\..\Razor\test\Microsoft.AspNetCore.Razor.Test.Common\WorkItemAttribute.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.Compiler.csproj" />
 
@@ -24,6 +21,7 @@
     <PackageReference Include="xunit.assert" PrivateAssets="all" />
     <PackageVersion Include="xunit.assert" Version="$(XunitAssertVersion)" />
     <PackageReference Include="xunit.extensibility.execution" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Test.Utilities" />
   </ItemGroup>
 
 </Project>

src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/GlobalUsings.cs

@@ -0,0 +1,4 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+global using static Roslyn.Test.Utilities.TestHelpers;

src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorComponentTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Test.Common;
+using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.NET.Sdk.Razor.SourceGenerators;
@@ -23,7 +23,7 @@ public async Task PartialClass()
                 """,
             ["Shared/Component2.razor"] = """
                 @inherits ComponentBase
-                
+
                 Value: @(Param + 1)
 
                 @code {

src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTagHelperTests.cs

@@ -5,8 +5,8 @@
 
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.CSharp;
+using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.NET.Sdk.Razor.SourceGenerators;
@@ -275,21 +275,21 @@ public async Task Form_Employee()
             ["Views/Home/Index.cshtml"] = """
                 @model TestProject.Models.Employee
                 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-                
+
                 @{
                     Html.Html5DateRenderingMode = Html5DateRenderingMode.Rfc3339;
                 }
-                
+
                 <!DOCTYPE html>
                 <html>
                 <head>
                     <meta name="viewport" content="width=device-width" />
                     <title>Create</title>
                 </head>
                 <body>
-                
+
                     <form asp-antiforgery="false">
-                
+
                         <div class="form-horizontal">
                             <h4>Employee</h4>
                             <hr />
@@ -339,7 +339,7 @@ @model TestProject.Models.Employee
                                     <span asp-validation-for="Salary"></span>
                                 </div>
                             </div>
-                
+
                             <div class="form-group">
                                 <div class="col-md-offset-2 col-md-10">
                                     <input type="submit" value="Create" class="btn btn-default" />
@@ -1087,7 +1087,7 @@ public async Task ViewImports(string name)
                 <nested>some-content</nested>
                 """,
             ["Views/RemoveInheritedTagHelpers/_ViewStart.cshtml"] = """
-                @{ 
+                @{
                     Layout = "~/Views/Shared/_LayoutWithRootTagHelper.cshtml";
                 }
                 """,
@@ -1100,7 +1100,7 @@ public async Task ViewImports(string name)
                 <nested>some-content</nested>
                 """,
             ["Views/InheritedTagHelperPrefix/_ViewStart.cshtml"] = """
-                @{ 
+                @{
                     Layout = "~/Views/Shared/_LayoutWithRootTagHelper.cshtml";
                 }
                 """,