Skip to content

trying to fix neqsimexcel #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EvenSol wants to merge 11 commits into
base: master
Choose a base branch
from
Open

trying to fix neqsimexcel #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
53bab6a
various updates
EvenSol Aug 15, 2023
daa6eee
fix: Remove csproj from gitignore
hakoneriksson Aug 16, 2023
ee8790b
update
EvenSol Aug 16, 2023
46320ca
update .gitignore
EvenSol Aug 16, 2023
a5903c9
Revert "update"
EvenSol Aug 16, 2023
e203d77
Revert "update .gitignore"
EvenSol Aug 16, 2023
0d0d61a
Revert "Revert "update""
EvenSol Aug 16, 2023
238473a
Revert "update"
EvenSol Aug 16, 2023
c4234b8
update gitignore
EvenSol Aug 16, 2023
a4b2d8c
Merge pull request #21 from hakoneriksson/update-2.5.5-1
EvenSol Aug 16, 2023
40d1d3e
updated to new neqsim jar, and included in project.
EvenSol Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*.user
*.userosscache
*.sln.docstates
*.csproj

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
Expand Down
5 changes: 4 additions & 1 deletion CapeOpenUnitOperations/CapeOpenUnitOperations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CapeOpenUnitOperations</RootNamespace>
<AssemblyName>CapeOpenUnitOperations</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
Expand Down Expand Up @@ -129,6 +129,9 @@
<Name>NeqSim.NET</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
65 changes: 41 additions & 24 deletions CapeOpenUnitOperations/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<log4net>
<!--See http://logging.apache.org/log4net/index.html-->
<appender name="Console" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<header value="[Date Time] [Thread ID] [Level] [Class] [TimeStamp since app started] [Message]
"/>
<conversionPattern value="v%property{AppVersion} %date [%thread] %-5level %logger %-4timestamp - %message%newline"/>
<Footer value="
"/>
<header value="[Date Time] [Thread ID] [Level] [Class] [TimeStamp since app started] [Message] " />
<conversionPattern value="v%property{AppVersion} %date [%thread] %-5level %logger %-4timestamp - %message%newline" />
<Footer value=" " />
</layout>
</appender>
<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
<file type="log4net.Util.PatternString" value="${TEMP}\%property{LogName}"/>
<appendToFile value="true"/>
<rollingStyle value="Size"/>
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<maximumFileSize value="1MB"/>
<maxSizeRollBackups value="5"/>
<file type="log4net.Util.PatternString" value="${TEMP}\%property{LogName}" />
<appendToFile value="true" />
<rollingStyle value="Size" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<maximumFileSize value="1MB" />
<maxSizeRollBackups value="5" />
<layout type="log4net.Layout.PatternLayout">
<header value="[Date Time] [Thread ID] [Level] [Class] [TimeStamp since app started] [Message]
"/>
<conversionPattern value="v%property{AppVersion} %date [%thread] %-5level %logger %-4timestamp - %message%newline"/>
<Footer value="
"/>
<header value="[Date Time] [Thread ID] [Level] [Class] [TimeStamp since app started] [Message] " />
<conversionPattern value="v%property{AppVersion} %date [%thread] %-5level %logger %-4timestamp - %message%newline" />
<Footer value=" " />
</layout>
</appender>
<root>
<level value="WARN"/>
<appender-ref ref="Console"/>
<appender-ref ref="RollingFile"/>
<level value="WARN" />
<appender-ref ref="Console" />
<appender-ref ref="RollingFile" />
</root>
</log4net>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient"/>
<add description=".Net Framework Data Provider for MySQL" invariant="MySql.Data.MySqlClient" name="MySQL Data Provider" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
<remove invariant="MySql.Data.MySqlClient" />
<add description=".Net Framework Data Provider for MySQL" invariant="MySql.Data.MySqlClient" name="MySQL Data Provider" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.5.0.0" newVersion="8.5.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.Java" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.5.0.0" newVersion="8.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
38 changes: 21 additions & 17 deletions NeqSim.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
VisualStudioVersion = 17.5.33627.172
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CapeOpenThermoLib", "NeqSimCapeOpen\CapeOpenThermoLib.csproj", "{51856C94-2811-4175-9D84-B221AD786B2C}"
ProjectSection(ProjectDependencies) = postProject
{658BF43C-1523-4315-B58A-4E4F15D15818} = {658BF43C-1523-4315-B58A-4E4F15D15818}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeqSim.NET", "NeqSimNET\NeqSim.NET.csproj", "{658BF43C-1523-4315-B58A-4E4F15D15818}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeqSimExcel", "NeqSimExcel\NeqSimExcel.csproj", "{F9DCF507-D12A-4DC9-A4E5-A338629A42E7}"
ProjectSection(ProjectDependencies) = postProject
{658BF43C-1523-4315-B58A-4E4F15D15818} = {658BF43C-1523-4315-B58A-4E4F15D15818}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CapeOpenUnitOperations", "CapeOpenUnitOperations\CapeOpenUnitOperations.csproj", "{A0EBB07A-9564-4C3A-A7E5-72D6708D26E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeqSimRegistration", "NeqSimRegistration\NeqSimRegistration.csproj", "{E95B7D43-F189-4B34-8B06-490CCB254A24}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "NeqSimInstaller", "NeqSimInstaller\NeqSim2.0.6.vdproj", "{3BFABF32-0B84-45E6-9413-1DFFC11EAF06}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeqSim.NET", "NeqSimNET\NeqSim.NET.csproj", "{658BF43C-1523-4315-B58A-4E4F15D15818}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeqSimNet3", "NeqSimNet3\NeqSimNet3.csproj", "{17AAE9D7-EF41-47FE-98DE-5931417121AF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -37,14 +33,6 @@ Global
{51856C94-2811-4175-9D84-B221AD786B2C}.Release|Any CPU.Build.0 = Debug|Any CPU
{51856C94-2811-4175-9D84-B221AD786B2C}.Release|x86.ActiveCfg = Release|x86
{51856C94-2811-4175-9D84-B221AD786B2C}.Release|x86.Build.0 = Release|x86
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|Any CPU.Build.0 = Debug|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|x86.ActiveCfg = Debug|x86
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|x86.Build.0 = Debug|x86
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|Any CPU.Build.0 = Debug|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|x86.ActiveCfg = Release|x86
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|x86.Build.0 = Release|x86
{F9DCF507-D12A-4DC9-A4E5-A338629A42E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9DCF507-D12A-4DC9-A4E5-A338629A42E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9DCF507-D12A-4DC9-A4E5-A338629A42E7}.Debug|x86.ActiveCfg = Debug|x86
Expand Down Expand Up @@ -72,6 +60,22 @@ Global
{3BFABF32-0B84-45E6-9413-1DFFC11EAF06}.Debug|x86.ActiveCfg = Debug
{3BFABF32-0B84-45E6-9413-1DFFC11EAF06}.Release|Any CPU.ActiveCfg = Release
{3BFABF32-0B84-45E6-9413-1DFFC11EAF06}.Release|x86.ActiveCfg = Release
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|Any CPU.Build.0 = Debug|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|x86.ActiveCfg = Debug|x86
{658BF43C-1523-4315-B58A-4E4F15D15818}.Debug|x86.Build.0 = Debug|x86
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|Any CPU.ActiveCfg = Release|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|Any CPU.Build.0 = Release|Any CPU
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|x86.ActiveCfg = Release|x86
{658BF43C-1523-4315-B58A-4E4F15D15818}.Release|x86.Build.0 = Release|x86
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Debug|x86.ActiveCfg = Debug|Any CPU
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Debug|x86.Build.0 = Debug|Any CPU
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Release|Any CPU.Build.0 = Release|Any CPU
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Release|x86.ActiveCfg = Release|Any CPU
{17AAE9D7-EF41-47FE-98DE-5931417121AF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading