From 564a59415c91cd63d546c2e4bd6fb54d9cb2d452 Mon Sep 17 00:00:00 2001
From: Juri Solodenko <Yuri05@users.noreply.github.com>
Date: Wed, 18 Jul 2018 18:48:21 +0200
Subject: [PATCH 1/4] Update CONTRIBUTING.md (#21)

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca39f48..9ac7868 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,6 +5,8 @@ Here are some ways ***you*** can contribute:
 
 * by submitting new ideas or features
 * by submitting new models
+* by providing use cases for the platform qualification
+* by writing tutorials
 * by reporting bugs
 * by fixing bugs
 * by implementing new features (e.g. new algorithms)

From 92aa8d401169e1abab5d8ec0c9799c3c286c4941 Mon Sep 17 00:00:00 2001
From: Michael Sevestre <michael@design2code.ca>
Date: Wed, 25 Jul 2018 22:29:54 +0200
Subject: [PATCH 2/4] X64 setup (#22)

* Update link to default develop branch

* Update to 7.4 with x64 setups - without R setup
---
 appveyor.yml     |  6 +++---
 rakefile.rb      |  7 ++++---
 setup/bundle.wxs | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index afefdff..6004055 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  app_version: '7.3.0'
+  app_version: '7.4.0'
 
 version: '%app_version%.{build}'
 
@@ -12,9 +12,9 @@ install:
       Copy-Item c:\netfx462.exe .
 
   - ps: >-
-      (new-object net.webclient).DownloadFile('http://go.microsoft.com/fwlink/?LinkId=746571', 'C:\\vc_redist.x86.exe')
+      (new-object net.webclient).DownloadFile('http://go.microsoft.com/fwlink/?LinkId=746572', 'C:\\vc_redist.x64.exe')
 
-      Copy-Item C:\vc_redist.x86.exe .
+      Copy-Item C:\vc_redist.x64.exe .
 
   - ps: >-
       (new-object net.webclient).DownloadFile('https://github.com/Open-Systems-Pharmacology/MiKTeX/releases/download/v2.9.3/MikTex.2.9.3.msi', 'C:\\MikTex.msi')
diff --git a/rakefile.rb b/rakefile.rb
index b595c13..4500444 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -29,10 +29,10 @@
   VARIABLES[:ProductVersion] =  @product_version
   VARIABLES[:ProductFullVersion] =  @product_full_version
 
-  MSI[:pksim] = create_package('pk-sim', 'PK-Sim', 'setup.zip', @product_version, 'hotfix/7.2.1')
-  MSI[:mobi] = create_package('mobi', 'MoBi', 'setup.zip', @product_version, 'hotfix/7.2.1')
+  MSI[:pksim] = create_package('pk-sim', 'PK-Sim')
+  MSI[:mobi] = create_package('mobi', 'MoBi')
   MSI[:matlab] = create_package('matlab-toolbox', 'Matlab-Toolbox')
-  MSI[:r] = create_package('r-toolbox', 'R-Toolbox')
+  # MSI[:r] = create_package('r-toolbox', 'R-Toolbox')
   MSI[:validator] = create_package('installationvalidator', 'InstallationValidator')
   
   Rake::Task['downlad_all_packages'].invoke
@@ -110,6 +110,7 @@ def create_setup(compressed:'yes', output_name:'OSPSuite')
 
 def prepare_msi(msi)
   package =  MSI[msi]
+
   file = download package
   puts file
   package[:file_name] = retrieve_package_name(file, package) 
diff --git a/setup/bundle.wxs b/setup/bundle.wxs
index 91e7225..ecfdf99 100644
--- a/setup/bundle.wxs
+++ b/setup/bundle.wxs
@@ -9,7 +9,7 @@
       <WixVariable Id="WixStdbaLicenseRtf" Value="EULA.rtf" />
       <WixVariable Id="WixStdbaLogo" Value="Banner.png" />
     
-      <Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]"/>      
+      <Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]"/>      
       <Chain>
         <ExePackage
           Id="netfx462"
@@ -23,13 +23,13 @@
         />    
 
         <ExePackage
-          SourceFile="vc_redist.x86.exe"
+          SourceFile="vc_redist.x64.exe"
           InstallCommand='/q '
           Vital="yes"
           Compressed="$(var.Compressed)"
           PerMachine="yes"
           Permanent="yes"          
-		      DownloadUrl="http://go.microsoft.com/fwlink/?LinkId=746571"
+		      DownloadUrl="http://go.microsoft.com/fwlink/?LinkId=746572"
         >
           <!-- Ignore "Newer version installed" error -->
           <ExitCode Value="1638" Behavior="success"/>
@@ -75,7 +75,7 @@
           <MsiProperty Name='TARGETDIR' Value='[InstallFolder]'/>
         </MsiPackage>
 
-        <MsiPackage 
+      <!--   <MsiPackage 
           Id="r"
           Vital="yes"
           SourceFile="$(var.r)"
@@ -83,7 +83,7 @@
           DownloadUrl="$(var.rDownloadPath)"
           >
           <MsiProperty Name='TARGETDIR' Value='[InstallFolder]'/>
-        </MsiPackage>
+        </MsiPackage> -->
 
         <MsiPackage 
           Id="validator"

From c204ab127df7cf0a5e95fb0c84b1dfe558ac7a2a Mon Sep 17 00:00:00 2001
From: Michael Sevestre <michael@design2code.ca>
Date: Fri, 27 Jul 2018 13:51:05 -0400
Subject: [PATCH 3/4] Add R-toolbox to setup

---
 rakefile.rb      | 2 +-
 setup/bundle.wxs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rakefile.rb b/rakefile.rb
index 4500444..35dbfe4 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -32,7 +32,7 @@
   MSI[:pksim] = create_package('pk-sim', 'PK-Sim')
   MSI[:mobi] = create_package('mobi', 'MoBi')
   MSI[:matlab] = create_package('matlab-toolbox', 'Matlab-Toolbox')
-  # MSI[:r] = create_package('r-toolbox', 'R-Toolbox')
+  MSI[:r] = create_package('r-toolbox', 'R-Toolbox')
   MSI[:validator] = create_package('installationvalidator', 'InstallationValidator')
   
   Rake::Task['downlad_all_packages'].invoke
diff --git a/setup/bundle.wxs b/setup/bundle.wxs
index ecfdf99..8de6759 100644
--- a/setup/bundle.wxs
+++ b/setup/bundle.wxs
@@ -75,7 +75,7 @@
           <MsiProperty Name='TARGETDIR' Value='[InstallFolder]'/>
         </MsiPackage>
 
-      <!--   <MsiPackage 
+        <MsiPackage 
           Id="r"
           Vital="yes"
           SourceFile="$(var.r)"
@@ -83,7 +83,7 @@
           DownloadUrl="$(var.rDownloadPath)"
           >
           <MsiProperty Name='TARGETDIR' Value='[InstallFolder]'/>
-        </MsiPackage> -->
+        </MsiPackage>
 
         <MsiPackage 
           Id="validator"

From 75204344b0a02d24e88290eaeab75f15aefa085b Mon Sep 17 00:00:00 2001
From: Michael Sevestre <michael@design2code.ca>
Date: Thu, 13 Sep 2018 11:45:30 -0400
Subject: [PATCH 4/4] Fixes appveyor issue with version (#23)

---
 appveyor.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6004055..3d069e7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,4 @@
-environment:
-  app_version: '7.4.0'
-
-version: '%app_version%.{build}'
+version: '7.4.0.{build}'
 
 install:
   - cmd: set PATH=C:\Ruby22\bin;%PATH%