Merge branch 'release/2.1' into dev

.appveyor.yml

@@ -1,17 +1,17 @@
 init:
-  - git config --global core.autocrlf true
+- git config --global core.autocrlf true
 branches:
   only:
-    - dev
+  - dev
-    - /^release\/.*/
+  - /^release\/.*$/
-    - /^(.*\/)?ci-.*$/
+  - /^(.*\/)?ci-.*$/
 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,23 +3,25 @@ sudo: false
 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
 mono: none
 os:
-  - linux
+- linux
-  - osx
+- osx
 osx_image: xcode8.2
 addons:
   apt:
     packages:
-      - libunwind8
+    - libunwind8
 branches:
   only:
-    - dev
+  - dev
-    - /^release\/.*/
+  - /^release\/.*$/
-    - /^(.*\/)?ci-.*$/
+  - /^(.*\/)?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

src/Directory.Build.targets

@@ -3,4 +3,8 @@
 
   <Import Project="..\Directory.Build.targets" />
   <Import Project="PackGlobalTool.targets" />
+
+  <Target Name="CleanPublishDir" AfterTargets="CoreClean">
+    <RemoveDir Directories="$(PublishDir)" />
+  </Target>
 </Project>