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

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-03-21 09:01:32 -07:00
parent d3cb158f11 1ddea573bb
commit 44acd6e721
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -178,7 +178,7 @@
<NETStandard16PackageVersion>1.6.1</NETStandard16PackageVersion>
<NETStandardLibrary20PackageVersion>2.0.1</NETStandardLibrary20PackageVersion>
<NewtonsoftJsonBsonPackageVersion>1.0.1</NewtonsoftJsonBsonPackageVersion>
<NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
<NewtonsoftJsonPackageVersion>11.0.1</NewtonsoftJsonPackageVersion>
<OracleManagedDataAccessPackageVersion>12.2.1100</OracleManagedDataAccessPackageVersion>
<PollySignedPackageVersion>5.8.0</PollySignedPackageVersion>
<RemotionLinqPackageVersion>2.2.0</RemotionLinqPackageVersion>

1
dockerbuild.sh
View File

@ -108,6 +108,7 @@ docker run \
--rm \
-t \
-e CI \
-e TEAMCITY_VERSION \
-e DOTNET_CLI_TELEMETRY_OPTOUT \
-e Configuration \
-v "$DIR:/code/build" \