Skip to content

Commit 149ad05

Browse files
committed
Fix benchmarks
1 parent 4b8c35d commit 149ad05

5 files changed

Lines changed: 10 additions & 3 deletions

File tree

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136

137137
<!-- Arcade features -->
138138
<PropertyGroup>
139+
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
139140
<UsingToolVSSDK Condition="$([MSBuild]::IsOSPlatform('Windows'))">true</UsingToolVSSDK>
140141
<UsingToolPdbConverter>false</UsingToolPdbConverter>
141142
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>

src/Razor/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
baseJob = baseJob
2222
.WithIterationCount(1)
2323
.RunOncePerIteration()
24-
.WithToolchain(new BenchmarkDotNet.Toolchains.InProcess.Emit.InProcessEmitToolchain(TimeSpan.FromHours(1.0), logOutput: true));
24+
.WithToolchain(BenchmarkDotNet.Toolchains.InProcess.Emit.InProcessEmitToolchain.Default);
2525
#endif
2626

2727
var config = ManualConfig.CreateMinimumViable()
@@ -32,7 +32,7 @@
3232
config = validate
3333
? config.AddJob(Job.Dry
3434
.WithId("Validation")
35-
.WithToolchain(InProcessNoEmitToolchain.Instance))
35+
.WithToolchain(InProcessNoEmitToolchain.Default))
3636
: config
3737
.AddJob(baseJob.WithCustomBuildConfiguration("Release").WithId("Current"))
3838
.AddJob(baseJob.WithCustomBuildConfiguration("Release_Nuget").WithId("Baseline").WithBaseline(true));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<DefineConstants>$(DefineConstants);ROSLYN_NO_INDEXRANGE</DefineConstants>
45
<NoWarn>$(NoWarn);RS0016;RS0017;RS0018;RS0022;RS0026;RS0027</NoWarn>
56
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
67
<TargetFrameworks>$(NetVS);$(NetFxVS)</TargetFrameworks>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private static IConfig GetConfig(bool getDiffableDisasm, bool validate)
6767
if (validate)
6868
{
6969
return config.AddJob(Job.Dry
70-
.WithToolchain(InProcessNoEmitToolchain.Instance)
70+
.WithToolchain(InProcessNoEmitToolchain.Default)
7171
.DontEnforcePowerPlan());
7272
}
7373

src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<PackageReference Include="Microsoft.VisualStudio.Cache" />
2929
</ItemGroup>
3030

31+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
32+
<!-- Exclude the Index and Range implementations since we inherit ones from M.CA.Workspace -->
33+
<PackageReference Include="Microsoft.Bcl.Memory" ExcludeAssets="compile" />
34+
</ItemGroup>
35+
3136
<ItemGroup>
3237
<ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
3338
<ProjectReference Include="..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />

0 commit comments

Comments
 (0)