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

Merge remote-tracking branch 'origin/rel/2.0.0' into dev

This commit is contained in:
Mike Harder 2017-07-12 17:26:35 -07:00
parent 641bff9e50 693d116481
commit 068c91dbec
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor.yml
View File

@ -6,6 +6,7 @@ branches:
- release - release
- dev - dev
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
- /^rel\/.*/
build_script: build_script:
- ps: .\build.ps1 - ps: .\build.ps1
clone_depth: 1 clone_depth: 1

2
build/dependencies.props
View File

@ -12,7 +12,7 @@
<MoqVersion>4.7.49</MoqVersion> <MoqVersion>4.7.49</MoqVersion>
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion> <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
<RoslynVersion>2.3.0-beta4-*</RoslynVersion> <RoslynVersion>2.3.0</RoslynVersion>
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion> <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
<TestSdkVersion>15.3.0-*</TestSdkVersion> <TestSdkVersion>15.3.0-*</TestSdkVersion>
<WebApiClientVersion>5.2.2</WebApiClientVersion> <WebApiClientVersion>5.2.2</WebApiClientVersion>