huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixups to ensure benchmarks apps builds in the master branch 

Fixes https://github.com/dotnet/aspnetcore/issues/18484
This commit is contained in:
Pranav K 2020-02-10 14:22:14 -08:00
parent 6b7442b248
commit 4201799425
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/Build.props
View File

@ -43,7 +43,7 @@
<!-- Exclude the benchmarks because they use <PackageReference>. --> <!-- Exclude the benchmarks because they use <PackageReference>. -->
<ProjectToExclude Include=" <ProjectToExclude Include="
$(RepoRoot)src\Components\benchmarkapps\**\*.csproj; $(RepoRoot)src\Components\benchmarkapps\BlazingPizza.Server\**\*.csproj;
$(RepoRoot)src\Mvc\benchmarkapps\**\*.csproj; $(RepoRoot)src\Mvc\benchmarkapps\**\*.csproj;
$(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj; $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj;
$(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;

5
src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
View File

@ -1,10 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<!-- Intentionally pinned this to .NET Core 3.1 since that's the supported version in the docker image --> <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
<OutputType>exe</OutputType> <OutputType>exe</OutputType>
<!-- WebDriver is not strong-named, so this test project cannot be strong named either. --> <!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
@ -12,6 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.AspNetCore.Cors" />
<Reference Include="Selenium.Support" /> <Reference Include="Selenium.Support" />
<Reference Include="Selenium.WebDriver" /> <Reference Include="Selenium.WebDriver" />
<ProjectReference Include="..\..\..\Blazor\DevServer\src\Microsoft.AspNetCore.Blazor.DevServer.csproj" /> <ProjectReference Include="..\..\..\Blazor\DevServer\src\Microsoft.AspNetCore.Blazor.DevServer.csproj" />

3
src/Components/benchmarkapps/Wasm.Performance/dockerfile
View File

@ -21,7 +21,8 @@ RUN git init \
&& git reset --hard FETCH_HEAD \ && git reset --hard FETCH_HEAD \
&& git submodule update --init && git submodule update --init
RUN dotnet publish -c Release -r linux-x64 -o /app ./src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj RUN ./restore.sh
RUN .dotnet/dotnet publish -c Release -r linux-x64 -o /app ./src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
RUN chmod +x /app/Wasm.Performance.Driver RUN chmod +x /app/Wasm.Performance.Driver
WORKDIR /app WORKDIR /app