Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add reference assemblies #627

Closed
wants to merge 4 commits into from
Closed

Add reference assemblies #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f463d3
Add reference to Microsoft.NETFramework.ReferenceAssemblies
billwert Jul 11, 2019
5f50118
Use a static file instead
billwert Jul 11, 2019
530dc77
re-add yml change
billwert Jul 11, 2019
69e8ebf
readme change
billwert Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ This project has adopted the code of conduct defined by the Contributor Covenant
[micro_windows_RS4_x64_netcoreapp2.2_icon]: https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/performance/performance-ci?branchName=master&jobName=windows%20RS4%20x64%20micro&configuration=windows%20RS4%20x64%20micro%20netcoreapp2.2
[micro_windows_RS4_x64_netcoreapp2.1_status]: https://dev.azure.com/dnceng/public/_build/latest?definitionId=271&branchName=master&jobName=windows%20RS4%20x64%20micro&configuration=windows%20RS4%20x64%20micro%20netcoreapp2.1
[micro_windows_RS4_x64_netcoreapp2.1_icon]: https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/performance/performance-ci?branchName=master&jobName=windows%20RS4%20x64%20micro&configuration=windows%20RS4%20x64%20micro%20netcoreapp2.1
[micro_windows_RS4_x64_net461_status]: https://dev.azure.com/dnceng/public/_build/latest?definitionId=271&branchName=master&jobName=windows%20RS4%20x64%20micro_net461
[micro_windows_RS4_x64_net461_icon]: https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/performance/performance-ci?branchName=master&jobName=windows%20RS4%20x64%20micro_net461
[micro_windows_RS4_x64_net461_status]: https://dev.azure.com/dnceng/public/_build/latest?definitionId=271&branchName=master&jobName=windows%20RS4%20x64%20net461
[micro_windows_RS4_x64_net461_icon]: https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/performance/performance-ci?branchName=master&jobName=windows%20RS4%20x64%20net461


[//]: # (These are the windows x86 links)
Expand Down
16 changes: 1 addition & 15 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,7 @@ jobs:
- netcoreapp3.0
- netcoreapp2.2
- netcoreapp2.1

# Windows x64 micro benchmarks net461, public correctness job
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- template: /eng/performance/benchmark_jobs.yml
parameters:
osName: windows
osVersion: RS4
kind: micro_net461
architecture: x64
pool: Hosted VS2017
queue: Windows.10.Amd64.ClientRS4.DevEx.15.8.Open
csproj: src\benchmarks\micro\MicroBenchmarks.csproj
runCategories: 'coreclr corefx'
frameworks: # for public jobs we want to make sure that the PRs don't break any of the supported frameworks
- net461
- net461

# Windows x86 micro benchmarks, public correctness job
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
Expand Down
7 changes: 7 additions & 0 deletions src/benchmarks/micro/MicroBenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<PackageReference Include="Jil" Version="2.17.0" />
<PackageReference Include="MessagePack" Version="1.7.3.7" />
<PackageReference Include="MessagePackAnalyzer" Version="1.7.3.7" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="protobuf-net" Version="2.4.0" />
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
Expand Down Expand Up @@ -56,6 +60,9 @@
<None Update="corefx\System.Text.RegularExpressions\content\200_000.in">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="support\Directory.build.props" Link="\%(Filename)%(Extension)" Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
9 changes: 9 additions & 0 deletions src/benchmarks/micro/support/Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
</Project>