Merge pull request #24 from CCSI-Toolset/josh_update_04_21_2021

boverhof · web-flow · commit 18cbbcc3f396 · 2021-05-18T13:39:16.000-07:00
Josh update 04 21 2021
diff --git a/Master/AspenSinterGUI/SplashWindow.xaml b/Master/AspenSinterGUI/SplashWindow.xaml
@@ -31,7 +31,7 @@
         <RichTextBox  MouseLeftButtonDown="Grid_close" Background="White" HorizontalAlignment="Stretch" Margin="0,0,0,0" Name="Instructions" VerticalAlignment="Stretch" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="2" Grid.RowSpan="3" FontSize="12" IsReadOnly="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
             <FlowDocument>
                 <Paragraph>
-                    SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2021 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al..  All rights reserved.
+                    SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2021 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy and Construction, Inc., et al..  All rights reserved.
                 </Paragraph>
 
                 <Table>
diff --git a/Master/SimSinterInstaller/SimSinter.wxs b/Master/SimSinterInstaller/SimSinter.wxs
@@ -7,7 +7,7 @@
 	<Product Id="FE0D0DCA-BCD7-4242-8647-35D2E4779588" 
            Name="SimSinter" 
            Language="1033" 
-           Version="1.6.0.0" 
+           Version="2.1.0.0" 
            Manufacturer="CCSI" 
            UpgradeCode="a9491f5b-eb5c-4fd4-8551-d7cf7992872c">
     
@@ -59,7 +59,8 @@
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
     <UIRef Id="WixUI_Mondo" />
     <UIRef Id="WixUI_ErrorProgressText" />
-    <WixVariable Id="WixUILicenseRtf" Value="..\LICENSE.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="..\UC2\LICENSE.rtf" />
+
 
   </Product>
 
diff --git a/Master/Sinter/Sinter.csproj b/Master/Sinter/Sinter.csproj
@@ -44,7 +44,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Interop.Happ">
-      <HintPath>$(MSBuildProgramFiles32)\AspenTech\AprSystem V8.4\GUI\Xeq\Interop.Happ.dll</HintPath>
+      <HintPath>$(MSBuildProgramFiles32)\AspenTech\AprSystem V10.0\GUI\Xeq\Interop.Happ.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
diff --git a/Master/UC2/COPYRIGHT_LLNL.txt b/Master/UC2/COPYRIGHT_LLNL.txt
@@ -0,0 +1 @@
+COPYRIGHT..
diff --git a/Master/UC2/UC2.vcxproj b/Master/UC2/UC2.vcxproj
@@ -170,7 +170,9 @@
     <None Include="udunits2\lib\udunits2-common.xml" />
     <None Include="udunits2\lib\udunits2-derived.xml" />
     <None Include="udunits2\lib\udunits2-prefixes.xml" />
-    <None Include="udunits2\lib\udunits2.xml" />
+    <None Include="udunits2\lib\udunits2.xml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="UnitCon.rgs" />
     <None Include="ReadMe.txt" />
   </ItemGroup>
