From 2ecbf138cb0f0eb52ca31ec4708eb8f76571f32e Mon Sep 17 00:00:00 2001
From: tijcolem <tjc.coleman@gmail.com>
Date: Fri, 5 Jun 2020 11:05:27 -0600
Subject: [PATCH 1/3] Updating OpenStudio to 3.0.1-rc1

---
 .travis.yml                                 | 2 +-
 Dockerfile                                  | 2 +-
 appveyor.yml                                | 6 +++---
 server/app/lib/openstudio_server/version.rb | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dcfe44e89..a7293d415 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ language: minimal
 env:
   global:
     - USE_TESTING_TIMEOUTS: "true"
-    - OPENSTUDIO_VERSION=3.0.0 OPENSTUDIO_VERSION_SHA=1c9617fa4e OPENSTUDIO_VERSION_EXT=""
+    - OPENSTUDIO_VERSION=3.0.1 OPENSTUDIO_VERSION_SHA=13374833e2 OPENSTUDIO_VERSION_EXT="-rc1"
     - DOCKER_COMPOSE_VERSION=1.21.1
     - BUNDLE_WITHOUT=native_ext
 
diff --git a/Dockerfile b/Dockerfile
index fb2549ef0..6f3f394cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # NOTES:            Currently this is one big dockerfile and non-optimal.
 
 #may include suffix
-ARG OPENSTUDIO_VERSION=3.0.0
+ARG OPENSTUDIO_VERSION=3.0.1
 FROM nrel/openstudio:$OPENSTUDIO_VERSION as base
 MAINTAINER Nicholas Long nicholas.long@nrel.gov
 
diff --git a/appveyor.yml b/appveyor.yml
index 65769cedf..f20c9d517 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,9 +2,9 @@ version: 1.0.{build}-{branch}
 
 environment:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.0.0
-  OPENSTUDIO_VERSION_SHA: 1c9617fa4e
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.0.1
+  OPENSTUDIO_VERSION_SHA: 13374833e2
+  OPENSTUDIO_VERSION_EXT: "-rc1"
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   RUBY_VERSION: 25-x64
   BUNDLER_VERSION: 2.1.0
diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb
index e2e0c1af2..532ead1d2 100644
--- a/server/app/lib/openstudio_server/version.rb
+++ b/server/app/lib/openstudio_server/version.rb
@@ -34,9 +34,9 @@
 # *******************************************************************************
 
 module OpenstudioServer
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = ''.freeze # with preceding - or +
-  OS_SHA = '1c9617fa4e'
+  VERSION_EXT = '-rc1'.freeze # with preceding - or +
+  OS_SHA = '13374833e2'
 end

From 75ffceb712fdaee08da2984136cf57559b8a9db7 Mon Sep 17 00:00:00 2001
From: tijcolem <tjc.coleman@gmail.com>
Date: Fri, 5 Jun 2020 11:39:50 -0600
Subject: [PATCH 2/3] update download s3 link

---
 ci/travis/install_openstudio.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/travis/install_openstudio.sh b/ci/travis/install_openstudio.sh
index 002f2be5f..fcedddad7 100755
--- a/ci/travis/install_openstudio.sh
+++ b/ci/travis/install_openstudio.sh
@@ -15,7 +15,7 @@ if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
 
     # copying this from the docker-openstudio dockerfile
     apt-get update && apt-get install -y curl vim gdebi-core ruby2.5 ruby-dev libffi-dev build-essential zlib1g-dev vim git locales sudo
-    export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/3.0.0/$OPENSTUDIO_DOWNLOAD_FILENAME
+    export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}/$OPENSTUDIO_DOWNLOAD_FILENAME
 
     echo "OpenStudio Package Download URL is ${OPENSTUDIO_DOWNLOAD_URL}"
     curl -SLO $OPENSTUDIO_DOWNLOAD_URL

From 79dc4c22018b537c35b533393f4e0dd6c7b974d9 Mon Sep 17 00:00:00 2001
From: tijcolem <tjc.coleman@gmail.com>
Date: Fri, 5 Jun 2020 12:26:16 -0600
Subject: [PATCH 3/3] Use libxml 3.1.0 as newest 3.2.0 is failing on windows

---
 server/Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/Gemfile b/server/Gemfile
index 43e5f734d..fd8471816 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -70,7 +70,8 @@ gem 'openstudio-analysis', '= 1.0.3'
 
 gem 'openstudio-aws', '0.7.1'
 
-gem 'libxml-ruby'
+#libxml 3.2.0 failing on windows
+gem 'libxml-ruby', '3.1.0'
 gem 'msgpack', '~> 1.0'
 gem 'multi_json'
 gem 'rest-client', '~>2.0.1'