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

Fixups to ensure benchmarks apps builds in the master branch (#18942) 

* 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-11 11:18:31 -08:00 committed by GitHub
parent 6042fab581 9bd5279472
commit 493da142f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 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>. -->
<ProjectToExclude Include="
$(RepoRoot)src\Components\benchmarkapps\**\*.csproj;
$(RepoRoot)src\Components\benchmarkapps\BlazingPizza.Server\**\*.csproj;
$(RepoRoot)src\Mvc\benchmarkapps\**\*.csproj;
$(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj;
$(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;

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

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

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

@ -2,8 +2,11 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
<RazorLangVersion>3.0</RazorLangVersion>
<HasReferenceAssembly>false</HasReferenceAssembly>
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
<ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
</PropertyGroup>
<ItemGroup>

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

@ -21,7 +21,8 @@ RUN git init \
&& git reset --hard FETCH_HEAD \
&& 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
WORKDIR /app