Skip to content

Commit 583df77

Browse files
Update tooling benchmarks to use resources from Test.Common.Tooling
Now that MS.ANC.Razor.Benchmarks has a dependency on MS.ANC.Razor.Test.Common.Tooling, it doesn't need to embed its own resource.
1 parent cad956d commit 583df77

File tree

6 files changed

+12
-89
lines changed

6 files changed

+12
-89
lines changed

Razor.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,6 @@ Global
593593
EndGlobalSection
594594
GlobalSection(SharedMSBuildProjectFiles) = preSolution
595595
src\Shared\Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems*{078aef36-f319-4ce2-baa2-5b58a6536b46}*SharedItemsImports = 5
596-
src\Shared\Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems*{6205467f-e381-4c42-aeec-763bd62b3d5e}*SharedItemsImports = 5
597596
src\Shared\Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems*{7b1c5668-b4bc-45d9-ae4c-9c2382fc47a9}*SharedItemsImports = 5
598597
src\Shared\Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems*{cd6913f3-ec47-4470-9c45-f5f898615e9d}*SharedItemsImports = 13
599598
src\Shared\Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems*{e5d92db7-5cbf-410a-9685-ff76f71ec96f}*SharedItemsImports = 5

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/CommonResources.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44
using System.Collections.Immutable;
55
using Microsoft.AspNetCore.Razor.Language;
66
using Microsoft.AspNetCore.Razor.Serialization.Json;
7+
using Microsoft.AspNetCore.Razor.Test.Common;
78
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
89

910
namespace Microsoft.AspNetCore.Razor.Microbenchmarks;
1011

1112
internal static class CommonResources
1213
{
13-
public static readonly byte[] LegacyTagHelperJsonBytes = Resources.GetResourceBytes("taghelpers.json");
14+
public static readonly byte[] LegacyTagHelperJsonBytes = RazorTestResources.GetResourceBytes("taghelpers.json");
1415
public static readonly ImmutableArray<TagHelperDescriptor> LegacyTagHelpers = LoadTagHelpers(LegacyTagHelperJsonBytes);
1516

16-
public static readonly byte[] LegacyProjectInfoJsonBytes = Resources.GetResourceBytes("project.razor.json");
17+
public static readonly byte[] LegacyProjectInfoJsonBytes = RazorTestResources.GetResourceBytes("project.razor.json");
1718
public static readonly RazorProjectInfo LegacyProjectInfo = LoadProjectInfo(LegacyProjectInfoJsonBytes);
1819

19-
public static readonly byte[] TelerikTagHelperJsonBytes = Resources.GetResourceBytes("Kendo.Mvc.Examples.taghelpers.json", folder: "Telerik");
20+
public static readonly byte[] TelerikTagHelperJsonBytes = RazorTestResources.GetResourceBytes("Kendo.Mvc.Examples.taghelpers.json", folder: "Telerik");
2021
public static readonly ImmutableArray<TagHelperDescriptor> TelerikTagHelpers = LoadTagHelpers(TelerikTagHelperJsonBytes);
2122

22-
public static readonly byte[] TelerikProjectInfoJsonBytes = Resources.GetResourceBytes("Kendo.Mvc.Examples.project.razor.json", folder: "Telerik");
23+
public static readonly byte[] TelerikProjectInfoJsonBytes = RazorTestResources.GetResourceBytes("Kendo.Mvc.Examples.project.razor.json", folder: "Telerik");
2324
public static readonly RazorProjectInfo TelerikProjectInfo = LoadProjectInfo(TelerikProjectInfoJsonBytes);
2425

2526
private static ImmutableArray<TagHelperDescriptor> LoadTagHelpers(byte[] bytes)

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,15 @@
2424
<None Remove="BenchmarkDotNet.Artifacts\**" />
2525

2626
<Compile Include="..\..\src\Microsoft.AspNetCore.Razor.LanguageServer\GlobalUsings.cs" Link="GlobalUsings.cs" />
27-
28-
<Compile Remove="Resources\**\*.*" />
29-
<None Remove="Resources\**\*.*" />
30-
31-
<EmbeddedResource Include="Resources\**\*.*" />
32-
<EmbeddedResource Include="$(SharedFilesRoot)\Tooling\**\*.*" Link="Resources\%(RecursiveDir)%(Filename)%(Extension)" />
33-
<EmbeddedResource Include="$(SharedFilesRoot)\Compiler\MSN.cshtml" Link="Resources\%(FileName)%(Extension)" />
3427
</ItemGroup>
3528

3629
<ItemGroup>
3730
<PackageReference Include="BenchmarkDotNet" />
38-
<PackageReference Include="Moq" />
3931
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
40-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
41-
<PackageReference Include="Microsoft.DiaSymReader" />
4232
</ItemGroup>
4333

44-
<Import Project="..\..\..\Shared\Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems" Label="Shared" />
34+
<!-- We only import JSON serialization on NetFx.
35+
For .NET Core, we rely on the JSON serialization compiled into Microsoft.AspNetCore.Razor.Test.Common.Tooling. -->
36+
<Import Condition="'$(TargetFramework)' == '$(NetFxVS)'" Project="$(SharedSourceRoot)Microsoft.AspNetCore.Razor.Serialization.Json\Microsoft.AspNetCore.Razor.Serialization.Json.projitems" Label="Shared" />
4537

4638
</Project>

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Resources.cs

Lines changed: 0 additions & 72 deletions
This file was deleted.

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/TextDifferencing/SourceTextDifferBenchmark.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Linq;
66
using BenchmarkDotNet.Attributes;
77
using Microsoft.AspNetCore.Razor.PooledObjects;
8+
using Microsoft.AspNetCore.Razor.Test.Common;
89
using Microsoft.CodeAnalysis.Razor.TextDifferencing;
910
using Microsoft.CodeAnalysis.Text;
1011

@@ -19,7 +20,7 @@ public class SourceTextDifferBenchmark
1920
[GlobalSetup]
2021
public void GlobalSetup()
2122
{
22-
var largeFileText = Resources.GetResourceText("MSN.cshtml");
23+
var largeFileText = RazorTestResources.GetResourceText("MSN.cshtml");
2324

2425
_largeFileOriginal = SourceText.From(largeFileText);
2526

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
<EmbeddedResource Include="Resources\**\*.*" />
2323
<EmbeddedResource Include="$(SharedFilesRoot)\Tooling\**\*.*" Link="Resources\%(RecursiveDir)%(Filename)%(Extension)" />
24+
<EmbeddedResource Include="$(SharedFilesRoot)\Compiler\MSN.cshtml" Link="Resources\%(FileName)%(Extension)" />
2425
</ItemGroup>
2526

2627
<ItemGroup>
@@ -74,6 +75,7 @@
7475
<ItemGroup>
7576
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
7677
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.LanguageServer.Test" Key="$(RazorKey)" />
78+
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Microbenchmarks" Key="$(RazorKey)" />
7779
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Razor.Workspaces.Test" Key="$(RazorKey)" />
7880
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Razor" Key="$(RazorKey)" />
7981
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Razor.Test" Key="$(RazorKey)" />

0 commit comments

Comments
 (0)