diff --git a/.appveyor.yml b/.appveyor.yml
index 6ee7cf4664..bc0f3e7285 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,10 +2,8 @@ init:
   - git config --global core.autocrlf true
 branches:
   only:
-    - master
-    - release
-    - /^rel\/.*/
     - dev
+    - /^release\/.*/
     - /^(.*\/)?ci-.*$/
 build_script:
   - ps: .\run.ps1 default-build
diff --git a/.travis.yml b/.travis.yml
index fb3f3a84c2..e8c0bc04ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,8 @@ addons:
       - libunwind8
 branches:
   only:
-    - master
-    - release
     - dev
-    - /^rel\/.*/
+    - /^release\/.*/
     - /^(.*\/)?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
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index b471106339..f0c02acf43 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -15,18 +15,18 @@
         ],
         "Exclusions": {
           "WRONG_PUBLICKEYTOKEN": {
-            "tools/netcoreapp2.1/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg."
           },
           "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": {
-            "tools/netcoreapp2.1/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg."
           }
         }
       },
@@ -36,28 +36,28 @@
         ],
         "Exclusions": {
           "NEUTRAL_RESOURCES_LANGUAGE": {
-            "tools/netcoreapp2.1/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
           },
           "SERVICING_ATTRIBUTE": {
-            "tools/netcoreapp2.1/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg."
           },
           "VERSION_INFORMATIONALVERSION": {
-            "tools/netcoreapp2.1/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg."
           },
           "WRONG_PUBLICKEYTOKEN": {
-            "tools/netcoreapp2.1/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
           },
           "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": {
-            "tools/netcoreapp2.1/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.1/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
+            "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
           },
           "ASSEMBLY_FILE_VERSION_MISMATCH": {
-            "tools/netcoreapp2.1/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
           },
           "ASSEMBLY_VERSION_MISMATCH": {
-            "tools/netcoreapp2.1/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
+            "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
           }
         }
       },
diff --git a/README.md b/README.md
index 7e245fe013..65998d0c54 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,10 @@ For stable, released versions of the tools, see [these instructions](https://git
 Install tools using the .NET Core command-line.
 
 ```
-dotnet install tool dotnet-watch
-dotnet install tool dotnet-user-secrets
-dotnet install tool dotnet-dev-certs
-dotnet install tool dotnet-sql-cache
+dotnet install tool --global dotnet-watch
+dotnet install tool --global dotnet-user-secrets
+dotnet install tool --global dotnet-dev-certs
+dotnet install tool --global dotnet-sql-cache
 ```
 
 ## Usage
diff --git a/build/dependencies.props b/build/dependencies.props
index bc74981c7b..07ad0f4023 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,7 +3,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15651</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15681</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.1.0-preview1-27997</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
     <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-27997</MicrosoftAspNetCoreTestingPackageVersion>
     <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.0-preview1-27997</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
@@ -11,6 +11,7 @@
     <MicrosoftExtensionsProcessSourcesPackageVersion>2.1.0-preview1-27997</MicrosoftExtensionsProcessSourcesPackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26102-01</MicrosoftNETCoreApp21PackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview1-26102-01</MicrosoftNETCorePlatformsPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
     <SystemDataSqlClientPackageVersion>4.5.0-preview1-26102-01</SystemDataSqlClientPackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>4.5.0-preview1-26102-01</SystemSecurityCryptographyCngPackageVersion>
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index db31b63687..ad4b437219 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15670
-commithash:49176144e03c3015d83b21e3f1d0ce093c05ecc3
+version:2.1.0-preview1-15681
+commithash:409cab8f55191829e70f2f8e307196fd6a427b4c
diff --git a/src/DotnetTool.props b/src/DotnetTool.props
index 04fc17a28b..75eca8d65f 100644
--- a/src/DotnetTool.props
+++ b/src/DotnetTool.props
@@ -11,6 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <SignedPackageFile Include="$(TargetPath)" PackagePath="tools/$(TargetFramework)/any/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="$(TargetPath)" PackagePath="tools/any/any/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
   </ItemGroup>
 </Project>
diff --git a/src/PackGlobalTool.targets b/src/PackGlobalTool.targets
index 5f498664c8..ed75c775b7 100644
--- a/src/PackGlobalTool.targets
+++ b/src/PackGlobalTool.targets
@@ -12,6 +12,7 @@
         description=$(Description);
         repositoryUrl=$(RepositoryUrl);
         targetframework=$(TargetFramework);
+        MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion);
       </NuspecProperties>
     </PropertyGroup>
   </Target>
diff --git a/src/dotnet-dev-certs/README.md b/src/dotnet-dev-certs/README.md
new file mode 100644
index 0000000000..4e8aaea714
--- /dev/null
+++ b/src/dotnet-dev-certs/README.md
@@ -0,0 +1,16 @@
+dotnet-dev-certs
+================
+
+`dotnet-dev-certs` is a command line tool to generate certificates used in ASP.NET Core during development.
+
+### How To Install
+
+From the command-line, execute:
+
+```
+dotnet install tool --global dotnet-dev-certs
+```
+
+### How To Use
+
+Run `dotnet dev-certs --help` for more information about usage.
diff --git a/src/dotnet-dev-certs/dotnet-dev-certs.nuspec b/src/dotnet-dev-certs/dotnet-dev-certs.nuspec
index 7c063e6e29..e8dce16395 100644
--- a/src/dotnet-dev-certs/dotnet-dev-certs.nuspec
+++ b/src/dotnet-dev-certs/dotnet-dev-certs.nuspec
@@ -17,10 +17,13 @@
       <packageType name="DotnetTool" />
     </packageTypes>
     <repository type="git" url="$repositoryUrl$" />
-    <dependencies />
+    <dependencies>
+      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
+      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
+    </dependencies>
   </metadata>
   <files>
-    <file src="$publishdir$" target="tools/$targetframework$/any/" />
-    <file src="DotnetToolSettings.xml" target="tools/DotnetToolSettings.xml" />
+    <file src="$publishdir$" target="tools/any/any/" />
+    <file src="DotnetToolSettings.xml" target="tools/any/any/DotnetToolSettings.xml" />
   </files>
 </package>
diff --git a/src/dotnet-sql-cache/README.md b/src/dotnet-sql-cache/README.md
index 05f7153882..9c8ca25653 100644
--- a/src/dotnet-sql-cache/README.md
+++ b/src/dotnet-sql-cache/README.md
@@ -8,7 +8,7 @@ dotnet-sql-cache
 From the command-line, execute:
 
 ```
-dotnet install tool dotnet-sql-cache
+dotnet install tool --global dotnet-sql-cache
 ```
 
 ### How To Use
diff --git a/src/dotnet-sql-cache/dotnet-sql-cache.csproj b/src/dotnet-sql-cache/dotnet-sql-cache.csproj
index 1bd0904ab5..8b7a58f538 100644
--- a/src/dotnet-sql-cache/dotnet-sql-cache.csproj
+++ b/src/dotnet-sql-cache/dotnet-sql-cache.csproj
@@ -5,7 +5,7 @@
     <OutputType>exe</OutputType>
     <Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description>
     <PackageType>DotnetTool</PackageType>
-    <PackageBasePath>tools/$(TargetFramework)/any/</PackageBasePath>
+    <PackageBasePath>tools/any/any/</PackageBasePath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/dotnet-sql-cache/dotnet-sql-cache.nuspec b/src/dotnet-sql-cache/dotnet-sql-cache.nuspec
index 3c198fc163..a2498a00d2 100644
--- a/src/dotnet-sql-cache/dotnet-sql-cache.nuspec
+++ b/src/dotnet-sql-cache/dotnet-sql-cache.nuspec
@@ -17,10 +17,13 @@
       <packageType name="DotnetTool" />
     </packageTypes>
     <repository type="git" url="$repositoryUrl$" />
-    <dependencies />
+    <dependencies>
+      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
+      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
+    </dependencies>
   </metadata>
   <files>
-    <file src="$publishdir$" target="tools/$targetframework$/any/" />
-    <file src="DotnetToolSettings.xml" target="tools/DotnetToolSettings.xml" />
+    <file src="$publishdir$" target="tools/any/any/" />
+    <file src="DotnetToolSettings.xml" target="tools/any/any/DotnetToolSettings.xml" />
   </files>
 </package>
diff --git a/src/dotnet-user-secrets/README.md b/src/dotnet-user-secrets/README.md
index 33d9e0cae0..50e4fbdb06 100644
--- a/src/dotnet-user-secrets/README.md
+++ b/src/dotnet-user-secrets/README.md
@@ -8,7 +8,7 @@ dotnet-user-secrets
 From the command-line, execute:
 
 ```
-dotnet install tool dotnet-user-secrets
+dotnet install tool --global dotnet-user-secrets
 ```
 
 ### How To Use
diff --git a/src/dotnet-user-secrets/dotnet-user-secrets.csproj b/src/dotnet-user-secrets/dotnet-user-secrets.csproj
index d979f1a355..9f578a0c36 100644
--- a/src/dotnet-user-secrets/dotnet-user-secrets.csproj
+++ b/src/dotnet-user-secrets/dotnet-user-secrets.csproj
@@ -7,7 +7,7 @@
     <PackageType>DotnetTool</PackageType>
     <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
     <RootNamespace>Microsoft.Extensions.SecretManager.Tools</RootNamespace>
-    <PackageBasePath>tools/$(TargetFramework)/any/</PackageBasePath>
+    <PackageBasePath>tools/any/any/</PackageBasePath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/dotnet-user-secrets/dotnet-user-secrets.nuspec b/src/dotnet-user-secrets/dotnet-user-secrets.nuspec
index 145ec4233b..fdd3fb95d5 100644
--- a/src/dotnet-user-secrets/dotnet-user-secrets.nuspec
+++ b/src/dotnet-user-secrets/dotnet-user-secrets.nuspec
@@ -17,10 +17,13 @@
       <packageType name="DotnetTool" />
     </packageTypes>
     <repository type="git" url="$repositoryUrl$" />
-    <dependencies />
+    <dependencies>
+      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
+      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
+    </dependencies>
   </metadata>
   <files>
-    <file src="$publishdir$" target="tools/$targetframework$/any/" />
-    <file src="DotnetToolSettings.xml" target="tools/DotnetToolSettings.xml" />
+    <file src="$publishdir$" target="tools/any/any/" />
+    <file src="DotnetToolSettings.xml" target="tools/any/any/DotnetToolSettings.xml" />
   </files>
 </package>
diff --git a/src/dotnet-watch/README.md b/src/dotnet-watch/README.md
index 8fb0db78db..37725d97d4 100644
--- a/src/dotnet-watch/README.md
+++ b/src/dotnet-watch/README.md
@@ -7,7 +7,7 @@ dotnet-watch
 From the command-line, execute:
 
 ```
-dotnet install tool dotnet-watch
+dotnet install tool --global dotnet-watch
 ```
 
 ### How To Use
diff --git a/src/dotnet-watch/dotnet-watch.nuspec b/src/dotnet-watch/dotnet-watch.nuspec
index 53c4447f94..5a748260c1 100644
--- a/src/dotnet-watch/dotnet-watch.nuspec
+++ b/src/dotnet-watch/dotnet-watch.nuspec
@@ -17,10 +17,13 @@
       <packageType name="DotnetTool" />
     </packageTypes>
     <repository type="git" url="$repositoryUrl$" />
-    <dependencies />
+    <dependencies>
+      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
+      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
+    </dependencies>
   </metadata>
   <files>
-    <file src="$publishdir$" target="tools/$targetframework$/any/" />
-    <file src="DotnetToolSettings.xml" target="tools/DotnetToolSettings.xml" />
+    <file src="$publishdir$" target="tools/any/any/" />
+    <file src="DotnetToolSettings.xml" target="tools/any/any/DotnetToolSettings.xml" />
   </files>
 </package>