github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merge/release/2.2-to-master'

Browse Source
This commit is contained in:
Ryan Brandenburg
2018-09-06 15:21:29 -07:00
parent cfd3a19279 c2f15f4199
commit f0e66325c3
5 changed files with 543 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@@ -25,6 +25,6 @@
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>4.10.0-preview1-26831-06</SystemThreadingTasksDataflowPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Package Versions: Pinned" />
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
<PropertyGroup Label="Package Versions: Pinned" />
</Project>