Bläddra i källkod

Merge branch 'release/2.1' into dev

Nate McMaster 8 år sedan
förälder
incheckning
44acd6e721
2 ändrade filer med 2 tillägg och 1 borttagningar
  1. 1 1
      build/dependencies.props
  2. 1 0
      dockerbuild.sh

+ 1 - 1
build/dependencies.props

@@ -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 - 0
dockerbuild.sh

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