Merge pull request #42 from kbuma/vs22

Upgrading SimSinter to work on Windows 2022 Server/Aspen v14/Visual Studio 2022
CCSI-Toolset · Sep 26, 2023 · d42ea21 · d42ea21
2 parents 71e2d75 + ae95051
commit d42ea21
Show file tree

Hide file tree

Showing 218 changed files with 1,059 additions and 114,892 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 *.DS_Store
+*.exe
+*.log
 *.msm
 *.opensdf
 *.sdf
@@ -10,18 +12,15 @@
 .vs/
 Debug*/
 Debug/
-Master/ipch/
-Master/UC2/UC2_i.c
-Master/UC2/UC2_i.h
-Master/UC2/UC2_p.c
-Master/UC2/dlldata.c
 Master/packages/
-Master/test/Flash_Example/trunk/ACM/AM_Flash_Example/
-Master/test/LongRun/ACM/AM_long
-Master/test/gPROMStest/input/
-Master/test/gPROMStest/sinterInput.xml
-Master/test/models/SimpleExcelTest/test-ouputs.json
+obj/
 Release*/
-SimSinter-Build.trx
-ccsi_W7-BUILD*
 Administrator_WIN-*/
+# regression test artifacts
+/Master/test/Flash_Example/trunk/ACM/Flash_Example.json
+/Master/test/Flash_Example/trunk/Aspen_Plus/_1241kfg.def
+/Master/test/gPROMStest/input/BufferTank_FO.gENCRYPT
+/Master/test/gPROMStest/sinterInput.xml
+/Master/test/LongRun/ACM/AM_long/commonshellsettings.xml
+/Master/test/LongRun/AP/_5512yju.def
+/Master/test/models/SimpleExcelTest/test-ouputs.json
diff --git a/Master/AspenSinterGUI/Properties/Resources.Designer.cs b/Master/AspenSinterGUI/Properties/Resources.Designer.cs
diff --git a/Master/AspenSinterGUI/Properties/Settings.Designer.cs b/Master/AspenSinterGUI/Properties/Settings.Designer.cs
diff --git a/Master/AspenSinterGUI/SinterConfigGUI.csproj b/Master/AspenSinterGUI/SinterConfigGUI.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SinterConfigGUI</RootNamespace>
     <AssemblyName>SinterConfigGUI</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -42,6 +43,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -51,6 +53,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>sinter_icon.ico</ApplicationIcon>
@@ -61,10 +64,45 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>SinterConfigGUI.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -178,6 +216,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

diff --git a/Master/AspenSinterGUI/app.config b/Master/AspenSinterGUI/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/Master/AspenSinterGUI/packages.config b/Master/AspenSinterGUI/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40-Client" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
 </packages>
diff --git a/Master/CCSIUnitsInstaller/CCSIUnits.wxs b/Master/CCSIUnitsInstaller/CCSIUnits.wxs
diff --git a/Master/CCSIUnitsInstaller/CCSIUnits128.png b/Master/CCSIUnitsInstaller/CCSIUnits128.png
diff --git a/Master/CCSIUnitsInstaller/CCSIUnitsInstaller.wixproj b/Master/CCSIUnitsInstaller/CCSIUnitsInstaller.wixproj
diff --git a/Master/CCSIUnitsInstaller/CCSIunits256.png b/Master/CCSIUnitsInstaller/CCSIunits256.png
diff --git a/Master/CCSIUnitsInstaller/packages.config b/Master/CCSIUnitsInstaller/packages.config
diff --git a/Master/CSVConsoleSinter/CSVConsoleSinter.csproj b/Master/CSVConsoleSinter/CSVConsoleSinter.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CSVConsoleSinter</RootNamespace>
     <AssemblyName>CSVConsoleSinter</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>C:\Users\leek2-a\Desktop\</PublishUrl>
@@ -42,6 +43,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -51,6 +53,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>3C60BEB566ECB07ED6524B4111BC028A13ADD2BD</ManifestCertificateThumbprint>
@@ -76,14 +79,49 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>CSVConsoleSinter.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -130,6 +168,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="CSVConsoleSinter.snk" />
     <None Include="CSVConsoleSinter_TemporaryKey.pfx" />
     <None Include="packages.config" />

diff --git a/Master/CSVConsoleSinter/CSVConsoleSinter.csproj.user b/Master/CSVConsoleSinter/CSVConsoleSinter.csproj.user
@@ -16,4 +16,10 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <StartArguments>C:\SimSinterFiles\ACM_Install_Test\Flash_Example_ACM.json C:\SimSinterFiles\CSVConsoleSinter_Tutorial\Flash_Example_Input.csv C:\SimSinterFiles\CSVConsoleSinter_Tutorial\Flash_Example_Output.csv N</StartArguments>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <StartArguments>C:\SimSinterFiles\ACM_Install_Test\Flash_Example_ACM.json C:\SimSinterFiles\CSVConsoleSinter_Tutorial\Flash_Example_Input.csv C:\SimSinterFiles\CSVConsoleSinter_Tutorial\Flash_Example_Output.csv N</StartArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <StartArguments>C:\SimSinterFiles\Aspen_Plus_Install_Test\Flash_Example_AP.json C:\SimSinterFiles\CSVConsoleSinter_Tutorial\Flash_Example_Input.csv C:\SimSinterFiles\CSVConsoleSinter_Tutorial\Flash_Example_Output.csv</StartArguments>
+  </PropertyGroup>
 </Project>
diff --git a/Master/CSVConsoleSinter/app.config b/Master/CSVConsoleSinter/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>