Skip to content

Commit d42ea21

Browse files
boverhofboverhof
authored
Merge pull request #42 from kbuma/vs22
Upgrading SimSinter to work on Windows 2022 Server/Aspen v14/Visual Studio 2022
2 parents 71e2d75 + ae95051 commit d42ea21

218 files changed

Lines changed: 1059 additions & 114892 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.DS_Store
2+
*.exe
3+
*.log
24
*.msm
35
*.opensdf
46
*.sdf
@@ -10,18 +12,15 @@
1012
.vs/
1113
Debug*/
1214
Debug/
13-
Master/ipch/
14-
Master/UC2/UC2_i.c
15-
Master/UC2/UC2_i.h
16-
Master/UC2/UC2_p.c
17-
Master/UC2/dlldata.c
1815
Master/packages/
19-
Master/test/Flash_Example/trunk/ACM/AM_Flash_Example/
20-
Master/test/LongRun/ACM/AM_long
21-
Master/test/gPROMStest/input/
22-
Master/test/gPROMStest/sinterInput.xml
23-
Master/test/models/SimpleExcelTest/test-ouputs.json
16+
obj/
2417
Release*/
25-
SimSinter-Build.trx
26-
ccsi_W7-BUILD*
2718
Administrator_WIN-*/
19+
# regression test artifacts
20+
/Master/test/Flash_Example/trunk/ACM/Flash_Example.json
21+
/Master/test/Flash_Example/trunk/Aspen_Plus/_1241kfg.def
22+
/Master/test/gPROMStest/input/BufferTank_FO.gENCRYPT
23+
/Master/test/gPROMStest/sinterInput.xml
24+
/Master/test/LongRun/ACM/AM_long/commonshellsettings.xml
25+
/Master/test/LongRun/AP/_5512yju.def
26+
/Master/test/models/SimpleExcelTest/test-ouputs.json

‎Master/AspenSinterGUI/Properties/Resources.Designer.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Master/AspenSinterGUI/Properties/Settings.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Master/AspenSinterGUI/SinterConfigGUI.csproj‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>SinterConfigGUI</RootNamespace>
1212
<AssemblyName>SinterConfigGUI</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
<FileAlignment>512</FileAlignment>
1617
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1718
<WarningLevel>4</WarningLevel>
@@ -42,6 +43,7 @@
4243
<DefineConstants>DEBUG;TRACE</DefineConstants>
4344
<ErrorReport>prompt</ErrorReport>
4445
<WarningLevel>4</WarningLevel>
46+
<Prefer32Bit>false</Prefer32Bit>
4547
</PropertyGroup>
4648
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
4749
<PlatformTarget>x86</PlatformTarget>
@@ -51,6 +53,7 @@
5153
<DefineConstants>TRACE</DefineConstants>
5254
<ErrorReport>prompt</ErrorReport>
5355
<WarningLevel>4</WarningLevel>
56+
<Prefer32Bit>false</Prefer32Bit>
5457
</PropertyGroup>
5558
<PropertyGroup>
5659
<ApplicationIcon>sinter_icon.ico</ApplicationIcon>
@@ -61,10 +64,45 @@
6164
<PropertyGroup>
6265
<AssemblyOriginatorKeyFile>SinterConfigGUI.snk</AssemblyOriginatorKeyFile>
6366
</PropertyGroup>
67+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
68+
<DebugSymbols>true</DebugSymbols>
69+
<OutputPath>bin\Debug\</OutputPath>
70+
<DefineConstants>DEBUG;TRACE</DefineConstants>
71+
<DebugType>full</DebugType>
72+
<PlatformTarget>AnyCPU</PlatformTarget>
73+
<LangVersion>7.3</LangVersion>
74+
<ErrorReport>prompt</ErrorReport>
75+
</PropertyGroup>
76+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
77+
<OutputPath>bin\Release\</OutputPath>
78+
<DefineConstants>TRACE</DefineConstants>
79+
<Optimize>true</Optimize>
80+
<DebugType>pdbonly</DebugType>
81+
<PlatformTarget>AnyCPU</PlatformTarget>
82+
<LangVersion>7.3</LangVersion>
83+
<ErrorReport>prompt</ErrorReport>
84+
</PropertyGroup>
85+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
86+
<DebugSymbols>true</DebugSymbols>
87+
<OutputPath>bin\x64\Debug\</OutputPath>
88+
<DefineConstants>DEBUG;TRACE</DefineConstants>
89+
<DebugType>full</DebugType>
90+
<PlatformTarget>x64</PlatformTarget>
91+
<LangVersion>7.3</LangVersion>
92+
<ErrorReport>prompt</ErrorReport>
93+
</PropertyGroup>
94+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
95+
<OutputPath>bin\x64\Release\</OutputPath>
96+
<DefineConstants>TRACE</DefineConstants>
97+
<Optimize>true</Optimize>
98+
<DebugType>pdbonly</DebugType>
99+
<PlatformTarget>x64</PlatformTarget>
100+
<LangVersion>7.3</LangVersion>
101+
<ErrorReport>prompt</ErrorReport>
102+
</PropertyGroup>
64103
<ItemGroup>
65-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
104+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
105+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
68106
</Reference>
69107
<Reference Include="System" />
70108
<Reference Include="System.Data" />
@@ -178,6 +216,7 @@
178216
<Generator>ResXFileCodeGenerator</Generator>
179217
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
180218
</EmbeddedResource>
219+
<None Include="app.config" />
181220
<None Include="packages.config" />
182221
<None Include="Properties\Settings.settings">
183222
<Generator>SettingsSingleFileGenerator</Generator>

‎Master/AspenSinterGUI/app.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎Master/AspenSinterGUI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40-Client" />
3+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
44
</packages>

‎Master/CCSIUnitsInstaller/CCSIUnits.wxs‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎Master/CCSIUnitsInstaller/CCSIUnits128.png‎

-10.3 KB
Binary file not shown.

‎Master/CCSIUnitsInstaller/CCSIUnitsInstaller.wixproj‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎Master/CCSIUnitsInstaller/CCSIunits256.png‎

-24.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)