Skip to content

Commit bb0358a

Browse files
DustinCampbellDustinCampbell
authored
Unify tooling test utilities (#9581)
This is a fairly large change that is mostly contained to the Razor tooling tests. Here is a summary of the changes: * All of the "*.Test.Common" projects have been merged into the Test.Common.Tooling project. * Utilities that are only needed by .NET Framework layers are compiled only under net472. * "LanguageServer.Test" no longer targets net7.0-windows and net8.0-windows. Instead, it multi-targets net70, net80, and net472. This allows many of the language server tests to be run on non-Windows platforms. * Any dependencies between test projects have been removed. * The LegacyDispatcher has been removed from tests. * Razor's copies of `UIFactAttribute` have been removed. In order to push all test utilities into Test.Common.Tooling, it _temporarily_ compiles to a different assembly name. This is because ExternalAccess.Razor in Roslyn doesn't yet provide IVT to Test.Common.Tooling. Eventually, this will be removed. @dotnet/razor-compiler: This change really doesn't have much impact on the compiler, but you're welcome to take a look.
2 parents 8315288 + 468ae54 commit bb0358a

File tree

268 files changed

+2656
-3147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+2656
-3147
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<PropertyGroup>
7878
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
7979
<DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework);net7.0</DefaultNetCoreTargetFrameworks>
80-
<DefaultNetCoreWindowsTargetFrameworks>net8.0-windows;net7.0-windows</DefaultNetCoreWindowsTargetFrameworks>
8180
</PropertyGroup>
8281
</Otherwise>
8382
</Choose>

‎Razor.Slim.slnf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838
"src\\Razor\\test\\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj",
3939
"src\\Razor\\test\\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj",
4040
"src\\Razor\\test\\Microsoft.AspNetCore.Razor.Test.MvcShim\\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj",
41-
"src\\Razor\\test\\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj",
41+
"src\\Razor\\test\\Microsoft.AspNetCore.Razor.LanguageServer.Test\\Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj",
4242
"src\\Razor\\test\\Microsoft.CodeAnalysis.Razor.Workspaces.Test\\Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj",
4343
"src\\Razor\\test\\Microsoft.CodeAnalysis.Remote.Razor.Test\\Microsoft.CodeAnalysis.Remote.Razor.Test.csproj",
44-
"src\\Razor\\test\\Microsoft.VisualStudio.Editor.Razor.Test.Common\\Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj",
4544
"src\\Razor\\test\\Microsoft.VisualStudio.Editor.Razor.Test\\Microsoft.VisualStudio.Editor.Razor.Test.csproj",
46-
"src\\Razor\\test\\Microsoft.VisualStudio.LanguageServer.ContainedLanguage.Test.Common\\Microsoft.VisualStudio.LanguageServer.ContainedLanguage.Test.Common.csproj",
4745
"src\\Razor\\test\\Microsoft.VisualStudio.LanguageServer.ContainedLanguage.Test\\Microsoft.VisualStudio.LanguageServer.ContainedLanguage.Test.csproj",
4846
"src\\Razor\\test\\Microsoft.VisualStudio.LanguageServices.Razor.Test\\Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj",
4947
"src\\Razor\\test\\Microsoft.VisualStudio.LiveShare.Razor.Test\\Microsoft.VisualStudio.LiveShare.Razor.Test.csproj",

‎Razor.sln‎

Lines changed: 18 additions & 59 deletions
Large diffs are not rendered by default.

‎SpellingExclusions.dic‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
csharp
22
Blazor
33
csproj
4-
cshtml
4+
cshtml
5+
microsoft

‎eng/Versions.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<Tooling_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</Tooling_MicrosoftVisualStudioLanguageServicesPackageVersion>
154154
<XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
155155
<XunitCombinatorialPackageVersion>1.4.1</XunitCombinatorialPackageVersion>
156+
<XunitStaFactVersion>1.1.11</XunitStaFactVersion>
156157
<XunitVersion>2.4.2</XunitVersion>
157158
<XunitExtensibilityExecutionPackageVersion>$(XunitVersion)</XunitExtensibilityExecutionPackageVersion>
158159
<!-- Temporary hack to workaround package restrictions for dev17 -->

‎src/Compiler/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1212
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1313
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
14+
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1415
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.ProjectEngineHost, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1516
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common.Tooling, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1617
[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServerClient.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

‎src/Razor/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
ReferenceOutputAssembly="false"
1414
OutputItemType="Analyzer" />
1515
</ItemGroup>
16-
16+
1717
</Project>

‎src/Razor/Directory.Build.targets‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<!-- Only include .NET Framework files when building for .NET Framework -->
4+
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
5+
<Compile Remove="**\*.NetFx.cs" />
6+
<Compile Remove="**\NetFx\**\*.*" />
7+
<Compile Remove="**\*_NetFx\**\*.*" />
8+
9+
<None Include="**\*.NetFx.cs" />
10+
<None Include="**\NetFx\**\*.*" />
11+
<None Include="**\*_NetFx\**\*.*" />
12+
</ItemGroup>
13+
14+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
15+
</Project>

‎src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestServices.cs">
35+
<Compile Include="..\..\test\Microsoft.AspNetCore.Razor.Test.Common.Tooling\Workspaces\TestServices.cs">
3636
<Link>TestServices\%(FileName)%(Extension)</Link>
3737
</Compile>
38-
<Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestWorkspace.cs">
38+
<Compile Include="..\..\test\Microsoft.AspNetCore.Razor.Test.Common.Tooling\Workspaces\TestWorkspace.cs">
3939
<Link>TestServices\%(FileName)%(Extension)</Link>
4040
</Compile>
41-
<Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestLanguageServices.cs">
41+
<Compile Include="..\..\test\Microsoft.AspNetCore.Razor.Test.Common.Tooling\Workspaces\TestLanguageServices.cs">
4242
<Link>TestServices\%(FileName)%(Extension)</Link>
4343
</Compile>
44-
<Compile Include="..\..\test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common\TestWorkspaceServices.cs">
44+
<Compile Include="..\..\test\Microsoft.AspNetCore.Razor.Test.Common.Tooling\Workspaces\TestWorkspaceServices.cs">
4545
<Link>TestServices\%(FileName)%(Extension)</Link>
4646
</Compile>
4747

‎src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.IO;
77
using Microsoft.AspNetCore.Razor.Language;
88
using Microsoft.AspNetCore.Razor.PooledObjects;
9+
using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
910
using Microsoft.CodeAnalysis;
1011
using Microsoft.CodeAnalysis.Host;
1112
using Microsoft.CodeAnalysis.Razor.ProjectSystem;

0 commit comments

Comments
 (0)