2.3.0.1 (#28)

* Update to version 2.3.0.1 and sinter 2.1.0.1 dependencies * Added VARIABLETREE_HREF for string replace in WIX installer
CCSI-Toolset · Sep 22, 2021 · eaee9d0 · eaee9d0
1 parent 770613a
commit eaee9d0
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 8 deletions.
diff --git a/Master/AspenSinterConsumerConsole/App.Config b/Master/AspenSinterConsumerConsole/App.Config
@@ -11,7 +11,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Sinter" publicKeyToken="4be585aca2084488" culture="neutral"/>
-        <codeBase version="2.1.0.0" href="FILE://C:\Program Files (x86)\CCSI\SimSinter\Sinter.dll"/>
+        <codeBase version="2.1.0.1" href="FILE://C:\Program Files (x86)\CCSI\SimSinter\Sinter.dll"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

diff --git a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config
@@ -11,7 +11,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Sinter" publicKeyToken="4be585aca2084488"/>
-        <codeBase href="SINTER_HREF" version="2.1.0.0"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="VariableTree" publicKeyToken="4be585aca2084488"/>
+        <codeBase href="VARIABLETREE_HREF" version="2.1.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config
@@ -11,7 +11,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Sinter" publicKeyToken="4be585aca2084488"/>
-        <codeBase href="SINTER_HREF" version="2.1.0.0"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="VariableTree" publicKeyToken="4be585aca2084488"/>
+        <codeBase href="VARIABLETREE_HREF" version="2.1.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config
@@ -11,7 +11,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Sinter" publicKeyToken="4be585aca2084488"/>
-        <codeBase href="SINTER_HREF" version="2.1.0.0"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="VariableTree" publicKeyToken="4be585aca2084488"/>
+        <codeBase href="VARIABLETREE_HREF" version="2.1.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config
@@ -11,7 +11,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Sinter" publicKeyToken="4be585aca2084488"/>
-        <codeBase href="SINTER_HREF" version="2.1.0.0"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="VariableTree" publicKeyToken="4be585aca2084488"/>
+        <codeBase href="VARIABLETREE_HREF" version="2.1.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Master/TurbineLiteWiXInstaller/GPromsSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/GPromsSinterConsumerConsole.exe.config
@@ -11,7 +11,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Sinter" publicKeyToken="4be585aca2084488"/>
-        <codeBase href="SINTER_HREF" version="2.1.0.0"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="VariableTree" publicKeyToken="4be585aca2084488"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Master/TurbineLiteWiXInstaller/GPromsSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/GPromsSinterConsumerWindowsService.exe.config
@@ -11,7 +11,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Sinter" publicKeyToken="4be585aca2084488"/>
-        <codeBase href="SINTER_HREF" version="2.1.0.0"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="VariableTree" publicKeyToken="4be585aca2084488"/>
+        <codeBase href="SINTER_HREF" version="2.1.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Master/TurbineLiteWiXInstaller/Product.wxs b/Master/TurbineLiteWiXInstaller/Product.wxs
@@ -10,7 +10,7 @@
            UpgradeCode="2a7184f4-0ed0-4c49-bb53-2824bf4b14e8"
            Name="TurbineLite"
            Language="1033"
-           Version="2.3.0.0"
+           Version="2.3.0.1"
            Manufacturer="Lawrence Berkeley National Lab"
            >
 
@@ -152,6 +152,14 @@
           ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='SINTER_HREF'[\]]"
           Name="href"
           Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\Sinter.dll"/>
+        <util:XmlFile
+          Id="XMLFILE.Bin.ExcelSinterWindowsService.5"
+          Action="setValue" Permanent="yes"
+          Sequence="5"
+          File="[#FILE.Bin.ExcelSinterWindowsService.CONFIG]"
+          ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='VARIABLETREE_HREF'[\]]"
+          Name="href"
+          Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\VariableTree.dll"/>
       </Component>
 
       <Component Id="CMP.ExcelConsole.EXE" Guid="9D26C7AD-FFA8-4C25-BBAA-C8937DABE59A">
@@ -180,6 +188,14 @@
           ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='SINTER_HREF'[\]]"
           Name="href"
           Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\Sinter.dll"/>
+        <util:XmlFile
+          Id="XMLFILE.Bin.ExcelSinterConsumerConsole.3"
+          Action="setValue" Permanent="yes"
+          Sequence="3"
+          File="[#FILE.Bin.ExcelSinterConsumerConsole.CONFIG]"
+          ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='VARIABLETREE_HREF'[\]]"
+          Name="href"
+          Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\VariableTree.dll"/>
       </Component>
 
       <?ifdef Debug ?>
@@ -403,6 +419,14 @@
           ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='SINTER_HREF'[\]]"
           Name="href"
           Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\Sinter.dll"/>
+        <util:XmlFile
+          Id="XMLFILE.Bin.AspenSinterConsumerWS.4"
+          Action="setValue" Permanent="yes"
+          Sequence="5"
+          File="[#FILE.AspenSinterConsumerWindowsService.Config]"
+          ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='VARIABLETREE_HREF'[\]]"
+          Name="href"
+          Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\VariableTree.dll"/>
       </Component>
 
       <Component Id="CMP.Bin.AspenSinterConsumerConsole" Guid="7044F1FF-258E-4156-B434-6262D4390D32">
@@ -433,6 +457,14 @@
           ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='SINTER_HREF'[\]]"
           Name="href"
           Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\Sinter.dll"/>
+        <util:XmlFile
+          Id="XMLFILE.Bin.AspenSinterConsumerConsole.4"
+          Action="setValue" Permanent="yes"
+          Sequence="3"
+          File="[#FILE.Bin.AspenSinterConsumerConsole.CONFIG]"
+          ElementPath="/configuration/runtime/assemblyBinding/dependentAssembly/codeBase[\[]@href='VARIABLETREE_HREF'[\]]"
+          Name="href"
+          Value="FILE://[ProgramFilesFolder]CCSI\SimSinter\VariableTree.dll"/>
       </Component>
 
       <!-- DEBUG SECTION