Merge branch 'master' into dev

Author: FabianTerhorst

.travis.yml

@@ -44,9 +44,6 @@ deploy:
       repo: FabianTerhorst/coreclr-module
       condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS false
       tags: true
-      branches:
-        only:
-        - master
   - provider: releases
     skip_cleanup: true
     api_key:
@@ -56,9 +53,6 @@ deploy:
       repo: FabianTerhorst/coreclr-module
       condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS false
       tags: true
-      branches:
-        only:
-        - master
   - provider: releases
     skip_cleanup: true
     prerelease: true
@@ -69,9 +63,6 @@ deploy:
       repo: FabianTerhorst/coreclr-module
       condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS true
       tags: true
-      branches:
-        only:
-        - dev
   - provider: releases
     skip_cleanup: true
     prerelease: true
@@ -82,29 +73,20 @@ deploy:
       repo: FabianTerhorst/coreclr-module
       condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS true
       tags: true
-      branches:
-        only:
-        - dev
   - provider: script
     skip_cleanup: true
     script: cd .. && cd .. && cd .. && cd .. && scs3-win.exe upload .\runtime\build\src\Release\csharp-module.dll coreclr-module/stable/x64_win32/csharp-module.dll
     on:
       repo: FabianTerhorst/coreclr-module
       condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS false
       tags: true
-      branches:
-        only:
-        - master
   - provider: script
     skip_cleanup: true
     script: cd .. && cd .. && cd .. && chmod +x ./scs3-linux && ./scs3-linux upload ./runtime/build/src/libcsharp-module.so coreclr-module/stable/x64_linux/libcsharp-module.so
     on:
       repo: FabianTerhorst/coreclr-module
       condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS false
       tags: true
-      branches:
-        only:
-        - master
   - provider: script
     skip_cleanup: true
     prerelease: true
@@ -113,9 +95,6 @@ deploy:
       repo: FabianTerhorst/coreclr-module
       condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS true
       tags: true
-      branches:
-        only:
-        - dev
   - provider: script
     skip_cleanup: true
     prerelease: true
@@ -124,6 +103,3 @@ deploy:
       repo: FabianTerhorst/coreclr-module
       condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS true
       tags: true
-      branches:
-        only:
-        - dev