Merge remote-tracking branch 'avtar/GPII-1814'

* avtar/GPII-1814:
  GPII-1814: Documents the restart step required for interactive VM usage
  GPII-1814: Moves Universal related tasks to separate batch file
  GPII-1814: Replaces gpii-universal Grunt task with batch file
  GPII-1814: Moves npm command to related script
  GPII-1814: Fixes CI build

Author: colinbdclark

README.md

@@ -41,9 +41,11 @@ will be withdrawn soon. You can operate these as follows:
 
 It is possible to provision a Windows VM for testing purposes. Please ensure you have met [these VM requirements](https://github.com/GPII/qi-development-environments/#requirements) before proceeding. After that you can use the ``vagrant up`` command to create an instance of a [Windows 10 Evaluation VM](https://github.com/idi-ops/packer-windows) which will boot an instance of the Windows 10 VM, pull in the GPII Framework's npm dependencies, and then build it. 
 
-If this is your first time creating this VM a 6.5GB download will take place. The downloaded image will be valid for 90 days after which the Windows installation will no longer be useable. To remove an expired image you can use the ``vagrant box remove "inclusivedesign/windows10-eval"`` command.
+If this is your first time creating this VM an 8 GB download will take place. The downloaded image will be valid for 90 days after which the Windows installation will no longer be useable. To remove an expired image you can use the ``vagrant box remove "inclusivedesign/windows10-eval"`` command.
 
-Once the VM has finished booting up you can open a command prompt window and use the following commands to test the framework:
+Once the VM has finished booting up you will need to type the ``vagrant reload`` command to cause it to restart. This is required so changes made to the Windows VM's ``PATH`` environment variable as part of the provisioning process are available in terminal sessions. This step is a temporary workaround and will be removed in the near future. 
+
+Now you can open a command prompt window and use the following commands to test the framework:
 
 ```
 cd c:\vagrant

Vagrantfile

@@ -37,5 +37,6 @@ Vagrant.configure(2) do |config|
   config.vm.provision "shell", path: "provisioning/chocolatey-packages.bat"
   config.vm.provision "shell", path: "provisioning/npm-packages.bat"
   config.vm.provision "shell", path: "provisioning/build.bat"
+  config.vm.provision "shell", path: "provisioning/universal.bat"
 
 end

provisioning/build.bat

@@ -1,3 +1,3 @@
 cd c:\vagrant
-npm install --ignore-scripts=true
-grunt build
+npm install
+

provisioning/chocolatey-packages.bat

@@ -1,3 +1,3 @@
-choco install nodejs -version 4.4.3 --forcex86 -y
-choco install nodejs.install -version 4.4.3 --forcex86 -y
-setx /M PATH "%PATH%;c:\programdata\chocolatey\lib\nodejs.commandline\tools;c:\users\vagrant\appdata\roaming\npm"
+choco install nodejs.install -version 4.4.3 -y
+choco install python2 -y
+setx /M PATH "%PATH%;C:\Program Files\nodejs;C:\tools\python2"

provisioning/npm-packages.bat

@@ -1,2 +1,3 @@
+call npm config set msvs_version 2015 --global
 call npm install grunt-cli -g
 call npm install testem -g

provisioning/universal.bat

@@ -0,0 +1,7 @@
+mkdir c:\node_modules
+cd c:\node_modules
+git clone --depth 1 https://github.com/GPII/universal.git
+cd universal
+npm install
+npm install dedupe-infusion
+node -e "require('dedupe-infusion')()"