Merge pull request #26 from CCSI-Toolset/tag-2.0.0

Update to 2.1.0.0

Author: boverhof

LICENSE.md

@@ -14,14 +14,15 @@ Northwest Division through Pacific Northwest National Laboratory, Carnegie Mello
 Virginia University, Boston University, the Trustees of Princeton University, The University of
 Texas at Austin, URS Energy & Construction, Inc., et al..  All rights reserved.
 
+License Agreement
+-----------------
+
 NOTICE.  This Software was developed under funding from the U.S. Department of Energy and the
 U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted
 for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license
 in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform
 publicly and display publicly, and to permit other to do so.
 
-License Agreement
------------------
 
 SimSinter 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

LICENSE.rtf

@@ -59,8 +59,7 @@
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
     <UIRef Id="WixUI_Mondo" />
     <UIRef Id="WixUI_ErrorProgressText" />
-    <WixVariable Id="WixUILicenseRtf" Value="..\UC2\LICENSE.rtf" />
-
+    <WixVariable Id="WixUILicenseRtf" Value="..\..\LICENSE.rtf" />
 
   </Product>
 

Master/SimSinterInstaller/Library.wxs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]

Master/SimSinterInstaller/SimSinter.wxs

@@ -37,10 +37,10 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Sinter.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>ccsi2_strong_name.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Interop.Happ">
@@ -116,8 +116,10 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Sinter.snk" />
+    <None Include="ccsi2_strong_name.snk" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VariableTree\VariableTree.csproj">
@@ -136,5 +138,24 @@
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+
+  <PropertyGroup>
+    <SNExePath>NotSet</SNExePath>
+  </PropertyGroup>
+  <Target Name="GetSNPath" BeforeTargets="AfterBuild">
+    <GetFrameworkSdkPath>
+      <Output TaskParameter="Path" PropertyName="WindowsSdkPath" />
+    </GetFrameworkSdkPath>
+    <PropertyGroup>
+      <SignatureFile>..\ccsi2_strong_name.snk</SignatureFile>
+      <TargetPath>$(TargetDir)Sinter.dll</TargetPath>
+      <FrameworkVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworkVersilon)', 'v', ''))</FrameworkVersion>
+      <NETFXVersion>NETFX 4.0 Tools</NETFXVersion>
+      <SNExePath Condition="!Exists($(SNExePath))">$(WindowsSdkPath)bin\NETFX 4.0 Tools\sn.exe</SNExePath>
+    </PropertyGroup>
+  </Target>
+  <Target Name="AfterBuild">
+    <Exec Command="&quot;$(SNExePath)&quot; -R &quot;$(TargetPath)&quot; &quot;$(SignatureFile)&quot;" />
+  </Target>
+-->
 </Project>

Master/Sinter/Properties/AssemblyInfo.cs

@@ -32,10 +32,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>VariableTree.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>ccsi2_strong_name.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
@@ -55,8 +55,7 @@
     <Compile Include="VariableTreeNode.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="VariableTree.snk" />
+    <None Include="ccsi2_strong_name.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.