Merge branch 'release/2.1' into dev

.appveyor.yml

@@ -1,19 +1,17 @@
 init:
-  - git config --global core.autocrlf true
+- git config --global core.autocrlf true
 branches:
   only:
-    - master
+  - dev
-    - release
+  - /^release\/.*$/
-    - dev
+  - /^(.*\/)?ci-.*$/
-    - /^(.*\/)?ci-.*$/
-    - /^rel\/.*/
 build_script:
-  - ps: .\run.ps1 default-build
+- ps: .\run.ps1 default-build
 clone_depth: 1
 environment:
   global:
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     DOTNET_CLI_TELEMETRY_OPTOUT: 1
-test: off
+test: 'off'
-deploy: off
+deploy: 'off'
 os: Visual Studio 2017

.travis.yml

@@ -3,25 +3,25 @@ sudo: required
 dist: trusty
 env:
   global:
-    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  - DOTNET_CLI_TELEMETRY_OPTOUT: 1
 addons:
   apt:
     packages:
-      - libunwind8
+    - libunwind8
 mono: none
 os:
-  - linux
+- linux
-  - osx
+- osx
 osx_image: xcode8.2
 branches:
   only:
-    - master
+  - dev
-    - release
+  - /^release\/.*$/
-    - dev
+  - /^(.*\/)?ci-.*$/
-    - /^rel\/.*$/
-    - /^(.*\/)?ci-.*$/
 before_install:
-  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
+- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
+  /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
+  /usr/local/lib/; fi
 script:
-  - ./build.sh
+- ./build.sh

build/dependencies.props

@@ -38,6 +38,7 @@
     <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.0-preview2-30187</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
     <MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.1.0-preview2-30187</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
     <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.0-preview2-30187</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>2.1.0-preview2-30187</MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.0-preview2-30187</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftExtensionsConfigurationBinderPackageVersion>2.1.0-preview2-30187</MicrosoftExtensionsConfigurationBinderPackageVersion>
     <MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.0-preview2-30187</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
@@ -71,4 +72,4 @@
     <XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-</Project>
+</Project>

korebuild.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
+  "channel": "dev"
+}

samples/DynamicSchemes/DynamicSchemes.csproj

@@ -21,6 +21,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.1.0-preview1-27644" />
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion)" />
   </ItemGroup>
 </Project>

samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj

@@ -27,6 +27,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.1.0-preview1-27644" />
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion)" />
   </ItemGroup>
 </Project>