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

Merge branch 'release/2.2'

This commit is contained in:
Brice Lambson 2018-08-20 11:32:00 -07:00
parent b621f5e9b3 2560815501
commit 33a3551e0e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/dependencies.props
View File

@ -126,6 +126,7 @@
<MoqPackageVersion>4.7.49</MoqPackageVersion> <MoqPackageVersion>4.7.49</MoqPackageVersion>
<NETStandard16PackageVersion>1.6.1</NETStandard16PackageVersion> <NETStandard16PackageVersion>1.6.1</NETStandard16PackageVersion>
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<NetTopologySuiteCorePackageVersion>1.15.0</NetTopologySuiteCorePackageVersion>
<NewtonsoftJsonBsonPackageVersion>1.0.1</NewtonsoftJsonBsonPackageVersion> <NewtonsoftJsonBsonPackageVersion>1.0.1</NewtonsoftJsonBsonPackageVersion>
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion> <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
<NuGetFrameworksPackageVersion>4.7.0</NuGetFrameworksPackageVersion> <NuGetFrameworksPackageVersion>4.7.0</NuGetFrameworksPackageVersion>

2
build/external-dependencies.props
View File

@ -117,6 +117,8 @@
<!-- netstandard2.0 --> <!-- netstandard2.0 -->
<ExternalDependency Include="NETStandard.Library" Version="$(NETStandardLibrary20PackageVersion)" VariableName="NETStandardLibrary20PackageVersion" /> <ExternalDependency Include="NETStandard.Library" Version="$(NETStandardLibrary20PackageVersion)" VariableName="NETStandardLibrary20PackageVersion" />
<ExternalDependency Include="NetTopologySuite.Core" Version="$(NetTopologySuiteCorePackageVersion)" />
<!-- This version should be used by runtime packages --> <!-- This version should be used by runtime packages -->
<ExternalDependency Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> <ExternalDependency Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
<!-- This version is required by MSBuild tasks or Visual Studio extensions. --> <!-- This version is required by MSBuild tasks or Visual Studio extensions. -->