Merge branch 'release/2.1' into dev

.appveyor.yml

@@ -1,26 +1,24 @@
 image: Visual Studio 2017
 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
 on_finish:
-  - ps: "7z a testlogs.zip testlogs"
+- ps: 7z a testlogs.zip testlogs
-  - ps: "Push-AppveyorArtifact testlogs.zip"
+- ps: Push-AppveyorArtifact testlogs.zip
 install:
-  - ps: Install-Product node 8
+- ps: Install-Product node 8
 clone_depth: 1
 environment:
   global:
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     DOTNET_CLI_TELEMETRY_OPTOUT: 1
-    ASPNETCORE_TEST_LOG_DIR: "$(APPVEYOR_BUILD_FOLDER)\\testlogs"
+    ASPNETCORE_TEST_LOG_DIR: $(APPVEYOR_BUILD_FOLDER)\testlogs
-test: off
+test: 'off'
-deploy: off
+deploy: 'off'
 os: Visual Studio 2017

.travis.yml

@@ -2,32 +2,29 @@ language: csharp
 sudo: required
 dist: trusty
 services:
-  - docker
+- docker
 env:
   global:
-    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  - DOTNET_CLI_TELEMETRY_OPTOUT: 1
-    - SIGNALR_TESTS_VERBOSE: 1
+  - SIGNALR_TESTS_VERBOSE: 1
-    - TRAVIS_NODE_VERSION: 8.9.3
+  - TRAVIS_NODE_VERSION: 8.9.3
 mono: none
 os:
-  - linux
+- linux
-  - osx
+- osx
 osx_image: xcode8.2
 addons:
   apt:
     packages:
-      - libunwind8
+    - libunwind8
 branches:
   only:
-    - master
+  - dev
-    - /release\/.*/
+  - /^release\/.*$/
-    - dev
+  - /^(.*\/)?ci-.*$/
-    - /^(.*\/)?ci-.*$/
-    - /^rel\/.*/
 before_install:
-  - nvm install $TRAVIS_NODE_VERSION
+- nvm install $TRAVIS_NODE_VERSION
-  # Pull redis docker image so when test creates container it doesn't time out
+- if test "$TRAVIS_OS_NAME" == "linux"; then docker pull redis; fi
-  - if test "$TRAVIS_OS_NAME" == "linux"; then docker pull redis; fi
 script:
-  - ./build.sh
+- ./build.sh

samples/ChatSample/ChatSample.csproj

@@ -5,6 +5,8 @@
     <UserSecretsId>aspnet-ChatSample-f11cf018-e0a8-49fa-b749-4c0eb5c9150b</UserSecretsId>
     <!-- Don't create a NuGet package -->
     <IsPackable>false</IsPackable>
+    <!-- Ensures the minification only runs on one target framework - avoids race in MSBuild. -->
+    <RunBundleMinify Condition=" '$(TargetFramework)' == 'net461' OR '$(CI)' == 'true' ">false</RunBundleMinify>
   </PropertyGroup>
 
   <ItemGroup>