diff --git a/.appveyor.yml b/.appveyor.yml
index 2ba3fb0..3927a86 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,12 +1,17 @@
 version: '{build}'
 pull_requests:
   do_not_increment_build_number: true
-image: Visual Studio 2017
+image: Visual Studio 2019
 nuget:
   disable_publish_on_pr: true
 build_script:
-  - ps: .\build.ps1
+  - cmd: dotnet build
+  - cmd: dotnet test .\test\Webenable.Logging.JavaScript.Tests
+  - cmd: dotnet pack .\src\Webenable.Logging.JavaScript -c Release -o .\artifacts
 test: off
+branches:
+  only:
+    - master
 init:
   - git config --global core.autocrlf input
 environment:
diff --git a/.travis.yml b/.travis.yml
index 7569b06..f89fa16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,17 @@
 language: csharp
 mono: none
-dotnet: 2.1.502
-dist: trusty
-os:
-  - linux
-  - osx
-osx_image: xcode8.3
-before_script:
-  - chmod +x ./build.sh
+dotnet: 2.1.701
+dist: xenial
+branches:
+  only:
+  - master
 script:
-  - ./build.sh
\ No newline at end of file
+    - dotnet build
+    - dotnet test test/Webenable.Logging.JavaScript.Tests
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+    - os: osx
+      dotnet: 2.1.701
+      osx_image: xcode10.1
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
deleted file mode 100644
index 7d4894c..0000000
--- a/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
deleted file mode 100644
index 4ee6c28..0000000
--- a/build.ps1
+++ /dev/null
@@ -1,4 +0,0 @@
-dotnet restore
-dotnet build
-dotnet test .\test\Webenable.Logging.JavaScript.Tests
-dotnet pack .\src\Webenable.Logging.JavaScript -c Release -o .\artifacts
\ No newline at end of file
diff --git a/build.sh b/build.sh
deleted file mode 100644
index 96425e4..0000000
--- a/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-dotnet build
\ No newline at end of file