Skip to content
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

Jump to bottom

Turbine dev upgrade #58

Merged
merged 23 commits into from
Jan 16, 2024
Merged

Turbine dev upgrade #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3358e5b
updated .NET and Wix installer versions to current standards
kbuma Nov 27, 2023
61ed4e6
upgraded EntityFramework to latest version 6.4.4
kbuma Nov 27, 2023
031ef48
updating EntityFramework.SqlServer.Compact to 6.4.4
kbuma Nov 27, 2023
1f1a52c
updating other packages managed through nuget
kbuma Nov 27, 2023
ba3ed1b
updates to Unity configuration usage in newer versions
kbuma Nov 27, 2023
9da3c1c
added settings defaults that were missing
kbuma Nov 27, 2023
be0260d
removed all Aspen73 code and references
kbuma Nov 27, 2023
b9920b8
fixing refernces to sinter and deprecated frameworks
kbuma Nov 28, 2023
e6895d9
updated remainder of packages in nuget
kbuma Nov 28, 2023
d889295
dealing with changes in CommandLineParse APIs from update
kbuma Nov 29, 2023
7776213
reference and settings fixes
kbuma Nov 29, 2023
0ecba33
look for 64-bit Sinter and version >= 3.0
kbuma Nov 30, 2023
cf19461
update version and additional Sinter check
kbuma Nov 29, 2023
695c9a8
Modify installer project to not depend on legacy TurbineSetupLibrary …
kbuma Dec 7, 2023
e990706
cleaned up app configuration for resolving dependencies.
kbuma Dec 7, 2023
fdd22ed
adding dependencies to installer for injected code
kbuma Dec 7, 2023
310ad51
changing to x64
kbuma Dec 7, 2023
3230d10
fix paths to work with properly with 64 bit builds as well and adding…
kbuma Dec 7, 2023
f5ed784
packaging up a few more dependencies and fixing SQL server ce version…
kbuma Dec 8, 2023
a435f04
fix config to get server and service working
kbuma Dec 8, 2023
7b5861c
adding one last missing dependency
kbuma Dec 13, 2023
5a28a57
update license end year to 2023
kbuma Dec 13, 2023
5695cab
update license end year to 2023
kbuma Dec 13, 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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ CodeAnalyst/
Debug/
Release/
ipch/
.vs/
obj/
packages/
bin/
6 changes: 3 additions & 3 deletions LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Copyright and License
=====================

Copyright (c) 2012 - 2021
Copyright (c) 2012 - 2023

Copyright Notice
----------------

Turbine Science Gateway 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.
Turbine Science Gateway was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2023 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.

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
-----------------

Turbine Science Gateway 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.
Turbine Science Gateway Copyright (c) 2012 - 2023, 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.


Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
Binary file modified LICENSE.rtf
View file
Open in desktop
Binary file not shown.
54 changes: 27 additions & 27 deletions Master/AspenSinter73ConsumerConsole/App.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration" />
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Turbine.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Turbine.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>

<connectionStrings>
<add name="TurbineModelContainer" connectionString="" providerName="System.Data.EntityClient" />
<add name="TurbineModelContainer" connectionString="" providerName="System.Data.EntityClient"/>
</connectionStrings>

<unity xmlns="http://schemas.microsoft.com/practices/2010/unity">

<alias alias="ConsoleContext" type="Turbine.Console.ConsoleContext, AspenSinterConsumerConsole" />
<alias alias="IContext" type="Turbine.Consumer.Contract.Behaviors.IContext, Turbine.Consumer.Contract.Behaviors" />
<alias alias="ConsumerContext" type="Turbine.Consumer.Console.ConsumerContext, Turbine.Consumer.Console" />
<alias alias="IConsumerContext" type="Turbine.Consumer.Contract.Behaviors.IConsumerContext, Turbine.Consumer.Contract.Behaviors" />
<alias alias="ConsoleContext" type="Turbine.Console.ConsoleContext, AspenSinterConsumerConsole"/>
<alias alias="IContext" type="Turbine.Consumer.Contract.Behaviors.IContext, Turbine.Consumer.Contract.Behaviors"/>
<alias alias="ConsumerContext" type="Turbine.Consumer.Console.ConsumerContext, Turbine.Consumer.Console"/>
<alias alias="IConsumerContext" type="Turbine.Consumer.Contract.Behaviors.IConsumerContext, Turbine.Consumer.Contract.Behaviors"/>

<alias alias="IConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.Behaviors.IConsumerRegistrationContract, Turbine.Consumer.Data.Contract.Behaviors" />
<alias alias="IJobConsumerContract" type="Turbine.Consumer.Data.Contract.Behaviors.IJobConsumerContract, Turbine.Consumer.Data.Contract.Behaviors" />
<alias alias="IJobQueue" type="Turbine.Consumer.Data.Contract.Behaviors.IJobQueue, Turbine.Consumer.Data.Contract.Behaviors" />
<alias alias="IConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.Behaviors.IConsumerRegistrationContract, Turbine.Consumer.Data.Contract.Behaviors"/>
<alias alias="IJobConsumerContract" type="Turbine.Consumer.Data.Contract.Behaviors.IJobConsumerContract, Turbine.Consumer.Data.Contract.Behaviors"/>
<alias alias="IJobQueue" type="Turbine.Consumer.Data.Contract.Behaviors.IJobQueue, Turbine.Consumer.Data.Contract.Behaviors"/>

<alias alias="JobConsumerContract" type="Turbine.Consumer.Data.Contract.AspenJobConsumerContract, Turbine.Consumer.Data.Contract" />
<alias alias="JobQueue" type="Turbine.Consumer.Data.Contract.DBJobQueue, Turbine.Consumer.Data.Contract" />
<alias alias="ConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.ConsumerRegistrationContract, Turbine.Consumer.Data.Contract" />
<alias alias="JobConsumerContract" type="Turbine.Consumer.Data.Contract.AspenJobConsumerContract, Turbine.Consumer.Data.Contract"/>
<alias alias="JobQueue" type="Turbine.Consumer.Data.Contract.DBJobQueue, Turbine.Consumer.Data.Contract"/>
<alias alias="ConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.ConsumerRegistrationContract, Turbine.Consumer.Data.Contract"/>

<alias alias="IConsumerRun" type="Turbine.Consumer.Contract.Behaviors.IConsumerRun, Turbine.Consumer.Contract.Behaviors" />
<alias alias="ConsumerRun" type="Turbine.Consumer.AspenTech.AspenSinterConsumer, Turbine.Consumer.AspenTech" />
<alias alias="IConsumerRun" type="Turbine.Consumer.Contract.Behaviors.IConsumerRun, Turbine.Consumer.Contract.Behaviors"/>
<alias alias="ConsumerRun" type="Turbine.Consumer.AspenTech.AspenSinterConsumer, Turbine.Consumer.AspenTech"/>

<container name="consumer">
<register type="IContext" mapTo="ConsoleContext" />
<register type="IConsumerContext" mapTo="ConsumerContext" />
<register type="IConsumerRegistrationContract" mapTo="ConsumerRegistrationContract" />
<register type="IJobConsumerContract" mapTo="JobConsumerContract" />
<register type="IJobQueue" mapTo="JobQueue" />
<register type="IConsumerRun" mapTo="ConsumerRun" />
<register type="IContext" mapTo="ConsoleContext"/>
<register type="IConsumerContext" mapTo="ConsumerContext"/>
<register type="IConsumerRegistrationContract" mapTo="ConsumerRegistrationContract"/>
<register type="IJobConsumerContract" mapTo="JobConsumerContract"/>
<register type="IJobQueue" mapTo="JobQueue"/>
<register type="IConsumerRun" mapTo="ConsumerRun"/>
</container>

</unity>

<system.diagnostics>
<trace autoflush="true">
<listeners>
<add name="CSConsumerLogListener" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="ProcessId, DateTime" />
<add name="CSConsumerLogListener" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="ProcessId, DateTime"/>

<remove name="Default" />
<remove name="Default"/>
</listeners>
</trace>
</system.diagnostics>
Expand All @@ -60,9 +60,9 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
9 changes: 6 additions & 3 deletions Master/AspenSinter73ConsumerConsole/AspenSinter73ConsumerConsole.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Turbine.Console</RootNamespace>
<AssemblyName>AspenSinter73ConsumerConsole</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand All @@ -23,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand All @@ -32,6 +34,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.ServiceLocation">
Expand Down
4 changes: 2 additions & 2 deletions Master/AspenSinter73ConsumerConsole/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 25 additions & 25 deletions Master/AspenSinter73ConsumerWindowsService/App.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration" />
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="AspenSinterConsumerWindowsService.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="AspenSinterConsumerWindowsService.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>

<connectionStrings>
<add name="TurbineModelContainer" connectionString="" providerName="System.Data.EntityClient" />
<add name="TurbineModelContainer" connectionString="" providerName="System.Data.EntityClient"/>
</connectionStrings>

<unity xmlns="http://schemas.microsoft.com/practices/2010/unity">

<alias alias="WindowsServiceContext" type="AspenSinterConsumerWindowsService.WindowsServiceContext, AspenSinterConsumerWindowsService" />
<alias alias="ConsumerContext" type="AspenSinterConsumerWindowsService.ConsumerContext, AspenSinterConsumerWindowsService" />
<alias alias="WindowsServiceContext" type="AspenSinterConsumerWindowsService.WindowsServiceContext, AspenSinterConsumerWindowsService"/>
<alias alias="ConsumerContext" type="AspenSinterConsumerWindowsService.ConsumerContext, AspenSinterConsumerWindowsService"/>

<alias alias="IContext" type="Turbine.Consumer.Contract.Behaviors.IContext, Turbine.Consumer.Contract.Behaviors" />
<alias alias="IConsumerContext" type="Turbine.Consumer.Contract.Behaviors.IConsumerContext, Turbine.Consumer.Contract.Behaviors" />
<alias alias="IContext" type="Turbine.Consumer.Contract.Behaviors.IContext, Turbine.Consumer.Contract.Behaviors"/>
<alias alias="IConsumerContext" type="Turbine.Consumer.Contract.Behaviors.IConsumerContext, Turbine.Consumer.Contract.Behaviors"/>

<alias alias="IConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.Behaviors.IConsumerRegistrationContract, Turbine.Consumer.Data.Contract.Behaviors" />
<alias alias="IConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.Behaviors.IConsumerRegistrationContract, Turbine.Consumer.Data.Contract.Behaviors"/>
<!--
<alias alias="IJobConsumerContract" type="Turbine.Consumer.Data.Contract.Behaviors.IJobConsumerContract, Turbine.Consumer.Data.Contract.Behaviors"/>
-->
<alias alias="IJobQueue" type="Turbine.Consumer.Data.Contract.Behaviors.IJobQueue, Turbine.Consumer.Data.Contract.Behaviors" />
<alias alias="IJobQueue" type="Turbine.Consumer.Data.Contract.Behaviors.IJobQueue, Turbine.Consumer.Data.Contract.Behaviors"/>

<!--
<alias alias="JobConsumerContract" type="Turbine.Consumer.Data.Contract.AspenJobConsumerContract, Turbine.Consumer.Data.Contract"/>
-->
<alias alias="JobQueue" type="Turbine.Consumer.Data.Contract.DBJobQueue, Turbine.Consumer.Data.Contract" />
<alias alias="JobQueue" type="Turbine.Consumer.Data.Contract.DBJobQueue, Turbine.Consumer.Data.Contract"/>

<alias alias="ConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.ConsumerRegistrationContract, Turbine.Consumer.Data.Contract" />
<alias alias="ConsumerRegistrationContract" type="Turbine.Consumer.Data.Contract.ConsumerRegistrationContract, Turbine.Consumer.Data.Contract"/>

<alias alias="IConsumerRun" type="Turbine.Consumer.Contract.Behaviors.IConsumerRun, Turbine.Consumer.Contract.Behaviors" />
<alias alias="ConsumerRun" type="Turbine.Consumer.AspenTech.AspenSinterConsumer, Turbine.Consumer.AspenTech" />
<alias alias="IConsumerRun" type="Turbine.Consumer.Contract.Behaviors.IConsumerRun, Turbine.Consumer.Contract.Behaviors"/>
<alias alias="ConsumerRun" type="Turbine.Consumer.AspenTech.AspenSinterConsumer, Turbine.Consumer.AspenTech"/>

<container name="consumer">
<register type="IContext" mapTo="WindowsServiceContext" />
<register type="IConsumerContext" mapTo="ConsumerContext" />
<register type="IConsumerRegistrationContract" mapTo="ConsumerRegistrationContract" />
<register type="IJobConsumerContract" mapTo="JobConsumerContract" />
<register type="IJobQueue" mapTo="JobQueue" />
<register type="IConsumerRun" mapTo="ConsumerRun" />
<register type="IContext" mapTo="WindowsServiceContext"/>
<register type="IConsumerContext" mapTo="ConsumerContext"/>
<register type="IConsumerRegistrationContract" mapTo="ConsumerRegistrationContract"/>
<register type="IJobConsumerContract" mapTo="JobConsumerContract"/>
<register type="IJobQueue" mapTo="JobQueue"/>
<register type="IConsumerRun" mapTo="ConsumerRun"/>
</container>

</unity>

<system.diagnostics>
<trace autoflush="true">
<listeners>
<add name="SinterConsumerLogListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="c:\turbine\log\AspenSinterConsumerWindowsService_MS12.log" />
<remove name="Default" />
<add name="SinterConsumerLogListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="c:\turbine\log\AspenSinterConsumerWindowsService_MS12.log"/>
<remove name="Default"/>
</listeners>
</trace>
</system.diagnostics>
Expand All @@ -74,13 +74,13 @@

<dependentAssembly>

<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>

<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>

</dependentAssembly>

</assemblyBinding>

</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
Loading