Skip to content

Commit 493da14

Browse files
authored
Fixups to ensure benchmarks apps builds in the master branch (#18942)
* Fixups to ensure benchmarks apps builds in the master branch Fixes #18484
2 parents 6042fab + 9bd5279 commit 493da14

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

eng/Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<!-- Exclude the benchmarks because they use <PackageReference>. -->
4545
<ProjectToExclude Include="
46-
$(RepoRoot)src\Components\benchmarkapps\**\*.csproj;
46+
$(RepoRoot)src\Components\benchmarkapps\BlazingPizza.Server\**\*.csproj;
4747
$(RepoRoot)src\Mvc\benchmarkapps\**\*.csproj;
4848
$(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj;
4949
$(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;

src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!-- Intentionally pinned this to .NET Core 3.1 since that's the supported version in the docker image -->
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
7-
<UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
85
<OutputType>exe</OutputType>
96

7+
<HasReferenceAssembly>false</HasReferenceAssembly>
8+
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
9+
1010
<!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
1111
<SignAssembly>false</SignAssembly>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15+
<Reference Include="Microsoft.AspNetCore.Cors" />
1516
<Reference Include="Selenium.Support" />
1617
<Reference Include="Selenium.WebDriver" />
1718
<ProjectReference Include="..\..\..\Blazor\DevServer\src\Microsoft.AspNetCore.Blazor.DevServer.csproj" />

src/Components/benchmarkapps/Wasm.Performance/TestApp/Wasm.Performance.TestApp.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
5-
<ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
65
<RazorLangVersion>3.0</RazorLangVersion>
6+
7+
<HasReferenceAssembly>false</HasReferenceAssembly>
8+
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
9+
<ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
710
</PropertyGroup>
811

912
<ItemGroup>

src/Components/benchmarkapps/Wasm.Performance/dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ RUN git init \
2121
&& git reset --hard FETCH_HEAD \
2222
&& git submodule update --init
2323

24-
RUN dotnet publish -c Release -r linux-x64 -o /app ./src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
24+
RUN ./restore.sh
25+
RUN .dotnet/dotnet publish -c Release -r linux-x64 -o /app ./src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
2526
RUN chmod +x /app/Wasm.Performance.Driver
2627

2728
WORKDIR /app

0 commit comments

Comments
 (0)