diff --git a/.gitignore b/.gitignore
index f2fec5d..c2ec5b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@ CodeAnalyst/
Debug/
Release/
ipch/
+.vs/
+obj/
+packages/
+bin/
diff --git a/LICENSE.md b/LICENSE.md
index 1d2e7fd..504cb83 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -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:
diff --git a/LICENSE.rtf b/LICENSE.rtf
index b98f1ec..3007d3b 100644
Binary files a/LICENSE.rtf and b/LICENSE.rtf differ
diff --git a/Master/AspenSinter73ConsumerConsole/App.Config b/Master/AspenSinter73ConsumerConsole/App.Config
index ea4435f..9ca9501 100644
--- a/Master/AspenSinter73ConsumerConsole/App.Config
+++ b/Master/AspenSinter73ConsumerConsole/App.Config
@@ -1,41 +1,41 @@
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -43,9 +43,9 @@
-
+
-
+
@@ -60,9 +60,9 @@
-
-
+
+
-
\ No newline at end of file
+
diff --git a/Master/AspenSinter73ConsumerConsole/AspenSinter73ConsumerConsole.csproj b/Master/AspenSinter73ConsumerConsole/AspenSinter73ConsumerConsole.csproj
index 2ae1792..e6db4c7 100644
--- a/Master/AspenSinter73ConsumerConsole/AspenSinter73ConsumerConsole.csproj
+++ b/Master/AspenSinter73ConsumerConsole/AspenSinter73ConsumerConsole.csproj
@@ -1,5 +1,5 @@
-
+
Debug
x86
@@ -10,8 +10,9 @@
Properties
Turbine.Console
AspenSinter73ConsumerConsole
- v4.0
- Client
+ v4.8
+
+
512
@@ -23,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ false
x86
@@ -32,6 +34,7 @@
DEBUG;TRACE
prompt
4
+ false
diff --git a/Master/AspenSinter73ConsumerConsole/Properties/Settings.Designer.cs b/Master/AspenSinter73ConsumerConsole/Properties/Settings.Designer.cs
index d39a261..7b8bcae 100644
--- a/Master/AspenSinter73ConsumerConsole/Properties/Settings.Designer.cs
+++ b/Master/AspenSinter73ConsumerConsole/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1008
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace Turbine.Console.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Master/AspenSinter73ConsumerWindowsService/App.Config b/Master/AspenSinter73ConsumerWindowsService/App.Config
index d8ba1dd..2396182 100644
--- a/Master/AspenSinter73ConsumerWindowsService/App.Config
+++ b/Master/AspenSinter73ConsumerWindowsService/App.Config
@@ -1,47 +1,47 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -49,8 +49,8 @@
-
-
+
+
@@ -74,13 +74,13 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/Master/AspenSinter73ConsumerWindowsService/AspenSinter73ConsumerWindowsService.csproj b/Master/AspenSinter73ConsumerWindowsService/AspenSinter73ConsumerWindowsService.csproj
index 72904d4..409006a 100644
--- a/Master/AspenSinter73ConsumerWindowsService/AspenSinter73ConsumerWindowsService.csproj
+++ b/Master/AspenSinter73ConsumerWindowsService/AspenSinter73ConsumerWindowsService.csproj
@@ -1,5 +1,5 @@
-
+
Debug
x86
@@ -10,8 +10,9 @@
Properties
AspenSinter73ConsumerWindowsService
AspenSinter73ConsumerWindowsService
- v4.0
- Client
+ v4.8
+
+
512
false
publish\
@@ -38,6 +39,7 @@
DEBUG;TRACE
prompt
4
+ false
x86
@@ -47,22 +49,11 @@
TRACE
prompt
4
+ false
-
- ..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll
+
+ ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll
@@ -70,12 +61,28 @@
+
+ ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+ ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll
+
+
+ ..\..\TurbineLite\packages\Unity.Abstractions.5.11.7\lib\net48\Unity.Abstractions.dll
+
+
+ ..\..\TurbineLite\packages\Unity.Container.5.11.11\lib\net48\Unity.Container.dll
+
+
+ ..\..\TurbineLite\packages\Unity.Interception.5.11.1\lib\net47\Unity.Interception.dll
+
diff --git a/Master/AspenSinter73ConsumerWindowsService/Properties/Settings.Designer.cs b/Master/AspenSinter73ConsumerWindowsService/Properties/Settings.Designer.cs
index 8491aab..779da01 100644
--- a/Master/AspenSinter73ConsumerWindowsService/Properties/Settings.Designer.cs
+++ b/Master/AspenSinter73ConsumerWindowsService/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace AspenSinter73ConsumerWindowsService.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Master/AspenSinter73ConsumerWindowsService/packages.config b/Master/AspenSinter73ConsumerWindowsService/packages.config
index 8025625..802f5e0 100644
--- a/Master/AspenSinter73ConsumerWindowsService/packages.config
+++ b/Master/AspenSinter73ConsumerWindowsService/packages.config
@@ -1,6 +1,10 @@
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/AspenSinterConsumerConsole/App.Config b/Master/AspenSinterConsumerConsole/App.Config
index 156c76d..8269084 100644
--- a/Master/AspenSinterConsumerConsole/App.Config
+++ b/Master/AspenSinterConsumerConsole/App.Config
@@ -9,14 +9,26 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -79,6 +91,15 @@
REPLACE
+
+ 30
+
+
+ 5
+
+
+ 8
+
-
\ No newline at end of file
+
diff --git a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.cs b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.cs
index fe72ffa..5ef3d6f 100644
--- a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.cs
+++ b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.cs
@@ -5,7 +5,7 @@
using System.Configuration;
using System.Diagnostics;
using System.IO;
-using Microsoft.Practices.Unity;
+using Unity;
using Turbine.Data.Contract.Behaviors;
using sinter;
using System.Threading;
@@ -19,6 +19,7 @@
using CommandLine;
using CommandLine.Text;
using Sinter;
+using System.Data.Common.EntitySql;
namespace Turbine.Console
{
@@ -48,37 +49,33 @@ class Options
[Option('s', "simulation", Required = false,
HelpText = "Bind to Simulation")]
public string Simulation { get; set; }
-
- [ParserState]
- public IParserState LastParserState { get; set; }
-
- [HelpOption]
- public string GetUsage()
- {
- return HelpText.AutoBuild(this,
- (HelpText current) => HelpText.DefaultParsingErrorsHandler(this, current));
- }
}
static void Main(string[] args)
{
- var options = new Options();
string dir = Properties.Settings.Default.BaseDirectory;
IUnityContainer container = Turbine.Consumer.AppUtility.container;
IConsumerContext consumerCtx = Turbine.Consumer.AppUtility.GetConsumerContext();
container.RegisterInstance(consumerCtx);
- if (CommandLine.Parser.Default.ParseArguments(args, options))
+ var parserResult = Parser.Default.ParseArguments(args);
+
+ parserResult.WithParsed(options => RunOptions(options, consumerCtx));
+ parserResult.WithNotParsed(errs =>
{
- // TODO: HACK TO BIND SIMULATION NAME
- consumerCtx.BindSimulationName = options.Simulation;
- }
+ var helpText = HelpText.AutoBuild(parserResult,
+ (HelpText current) => HelpText.DefaultParsingErrorsHandler(parserResult, current));
+ });
+ }
+ static void RunOptions(Options opts, IConsumerContext consumerCtx)
+ {
+ consumerCtx.BindSimulationName = opts.Simulation;
int iterations = Properties.Settings.Default.TimeOutIterations;
int setupIterations = Properties.Settings.Default.TimeOutSetupIterations;
int postInitIterations = Properties.Settings.Default.TimePostInitIterations;
- Turbine.Consumer.Console.SinterConsumerConsole.setTimeOutParams(iterations,
+ Turbine.Consumer.Console.SinterConsumerConsole.setTimeOutParams(iterations,
setupIterations, postInitIterations);
Turbine.Consumer.Console.SinterConsumerConsole.Run();
}
diff --git a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj
index 7feb8e9..ca558e5 100644
--- a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj
+++ b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj
@@ -1,5 +1,5 @@
-
+
Debug
x86
@@ -10,8 +10,9 @@
Properties
Turbine.Console
AspenSinterConsumerConsole
- v4.0
- Client
+ v4.8
+
+
512
@@ -23,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ false
x86
@@ -32,37 +34,55 @@
DEBUG;TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ DEBUG;TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\SharedDatabaseArchitecture\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
+
+ ..\..\TurbineLite\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.dll
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll
+
+ ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll
- $(MSBuildProgramFiles32)\CCSI\SimSinter\Sinter.dll
+ ..\..\..\..\..\..\..\Program Files\CCSI\SimSinter\Sinter.dll
+
+
+ ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+ ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
+
+ ..\..\TurbineLite\packages\Unity.Abstractions.5.11.7\lib\net48\Unity.Abstractions.dll
+
@@ -74,12 +94,10 @@
-
- Designer
-
-
+
Designer
+
SettingsSingleFileGenerator
Settings.Designer.cs
@@ -115,6 +133,17 @@
Turbine.Data.Contract.Behaviors
+
+
+ {8E567520-F9BA-11CF-90B2-0000C0A810C4}
+ 21
+ 0
+ 1033
+ tlbimp
+ False
+ True
+
+
+
\ No newline at end of file
diff --git a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj
index 608d438..036c2d2 100644
--- a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj
+++ b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj
@@ -1,5 +1,5 @@
-
+
Debug
x86
@@ -10,8 +10,9 @@
Properties
AspenSinterConsumerWindowsService
AspenSinterConsumerWindowsService
- v4.0
- Client
+ v4.8
+
+
512
false
publish\
@@ -38,6 +39,7 @@
DEBUG;TRACE
prompt
4
+ false
x86
@@ -47,26 +49,32 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- False
- ..\..\SharedDatabaseArchitecture\packages\AWSSDK.1.5.50.0\lib\AWSSDK.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll
+
+ ..\..\TurbineLite\packages\AWSSDK.2.3.55.2\lib\net45\AWSSDK.dll
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll
+
+ ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll
@@ -74,6 +82,13 @@
+
+ ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+ ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
diff --git a/Master/AspenSinterConsumerWindowsService/Properties/Settings.Designer.cs b/Master/AspenSinterConsumerWindowsService/Properties/Settings.Designer.cs
index 1bc83eb..c3e74fc 100644
--- a/Master/AspenSinterConsumerWindowsService/Properties/Settings.Designer.cs
+++ b/Master/AspenSinterConsumerWindowsService/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace AspenSinterConsumerWindowsService.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -37,7 +37,7 @@ public string BaseDirectory {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("5")]
+ [global::System.Configuration.DefaultSettingValueAttribute("30")]
public int CheckForNewJobsInterval {
get {
return ((int)(this["CheckForNewJobsInterval"]));
@@ -46,48 +46,39 @@ public int CheckForNewJobsInterval {
this["CheckForNewJobsInterval"] = value;
}
}
-
+
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("30")]
- public int TimeOutIterations
- {
- get
- {
+ public int TimeOutIterations {
+ get {
return ((int)(this["TimeOutIterations"]));
}
- set
- {
+ set {
this["TimeOutIterations"] = value;
}
}
-
+
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("10")]
- public int TimeOutSetupIterations
- {
- get
- {
+ [global::System.Configuration.DefaultSettingValueAttribute("5")]
+ public int TimeOutSetupIterations {
+ get {
return ((int)(this["TimeOutSetupIterations"]));
}
- set
- {
+ set {
this["TimeOutSetupIterations"] = value;
}
}
-
+
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("16")]
- public int TimePostInitIterations
- {
- get
- {
+ [global::System.Configuration.DefaultSettingValueAttribute("8")]
+ public int TimePostInitIterations {
+ get {
return ((int)(this["TimePostInitIterations"]));
}
- set
- {
+ set {
this["TimePostInitIterations"] = value;
}
}
diff --git a/Master/AspenSinterConsumerWindowsService/Properties/Settings.settings b/Master/AspenSinterConsumerWindowsService/Properties/Settings.settings
index 08e5923..35249ae 100644
--- a/Master/AspenSinterConsumerWindowsService/Properties/Settings.settings
+++ b/Master/AspenSinterConsumerWindowsService/Properties/Settings.settings
@@ -8,5 +8,14 @@
30
+
+ 30
+
+
+ 5
+
+
+ 8
+
\ No newline at end of file
diff --git a/Master/AspenSinterConsumerWindowsService/packages.config b/Master/AspenSinterConsumerWindowsService/packages.config
index 24a27fc..ef4e4b8 100644
--- a/Master/AspenSinterConsumerWindowsService/packages.config
+++ b/Master/AspenSinterConsumerWindowsService/packages.config
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/Master/DatabaseUnitTest/App.config b/Master/DatabaseUnitTest/App.config
index a0606c1..c019d2b 100644
--- a/Master/DatabaseUnitTest/App.config
+++ b/Master/DatabaseUnitTest/App.config
@@ -1,35 +1,50 @@
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj
index d8f5e69..a7a58d7 100644
--- a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj
+++ b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
AnyCPU
@@ -8,7 +9,7 @@
Properties
DatabaseUnitTest
DatabaseUnitTest
- v4.0
+ v4.8
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
10.0
@@ -16,6 +17,9 @@
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
+
+
+
true
@@ -25,6 +29,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -33,33 +38,27 @@
TRACE
prompt
4
+ false
OnBuildSuccess
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.1.3\lib\net40\EntityFramework.SqlServerCompact.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
-
- ..\..\TurbineLite\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
-
-
- ..\..\TurbineLite\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll
-
- ..\..\TurbineLite\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll
-
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -73,9 +72,18 @@
..\..\TurbineLite\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll
+
+ ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\..\TurbineLite\packages\Unity.5.11.10\lib\net48\Unity.Abstractions.dll
+
+
+ ..\..\TurbineLite\packages\Unity.5.11.10\lib\net48\Unity.Container.dll
+
@@ -156,6 +164,14 @@
if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/GPromsSinterConsumerWindowsService/packages.config b/Master/GPromsSinterConsumerWindowsService/packages.config
index 36be5e4..3b17c9a 100644
--- a/Master/GPromsSinterConsumerWindowsService/packages.config
+++ b/Master/GPromsSinterConsumerWindowsService/packages.config
@@ -1,7 +1,11 @@
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/SelfHostIntegrationTest/App.config b/Master/SelfHostIntegrationTest/App.config
index 9c783f8..abebee2 100644
--- a/Master/SelfHostIntegrationTest/App.config
+++ b/Master/SelfHostIntegrationTest/App.config
@@ -1,21 +1,21 @@
-
+
+
+
+
+
-
-
-
-
@@ -33,6 +33,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,6 +124,9 @@
+
+
+
diff --git a/Master/SelfHostIntegrationTest/SelfHostIntegrationTest.csproj b/Master/SelfHostIntegrationTest/SelfHostIntegrationTest.csproj
index 78f0bcb..77fb70c 100644
--- a/Master/SelfHostIntegrationTest/SelfHostIntegrationTest.csproj
+++ b/Master/SelfHostIntegrationTest/SelfHostIntegrationTest.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
AnyCPU
@@ -8,7 +9,7 @@
Properties
SelfHostIntegrationTest
SelfHostIntegrationTest
- v4.0
+ v4.8
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
10.0
@@ -16,6 +17,9 @@
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
+
+
+
true
@@ -25,6 +29,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -33,20 +38,20 @@
TRACE
prompt
4
+ false
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.1.3\lib\net40\EntityFramework.SqlServerCompact.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -59,9 +64,9 @@
True
..\..\TurbineLite\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll
-
-
-
+
+
+
@@ -159,6 +164,14 @@
if exist "$(TargetDir)" del /Q "$(TargetDir)*.sdf"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -112,10 +112,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/SelfHostWebApplication/Properties/Settings.Designer.cs b/Master/SelfHostWebApplication/Properties/Settings.Designer.cs
index b62abf1..53bf2d0 100644
--- a/Master/SelfHostWebApplication/Properties/Settings.Designer.cs
+++ b/Master/SelfHostWebApplication/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace SelfHostWebApplication.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Master/SelfHostWebApplication/SelfHostWebApplication.csproj b/Master/SelfHostWebApplication/SelfHostWebApplication.csproj
index 1186271..d4cd218 100644
--- a/Master/SelfHostWebApplication/SelfHostWebApplication.csproj
+++ b/Master/SelfHostWebApplication/SelfHostWebApplication.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
@@ -9,8 +10,11 @@
Properties
SelfHostWebApplication
SelfHostWebApplication
- v4.0
+ v4.8
512
+
+
+
AnyCPU
@@ -21,6 +25,7 @@
DEBUG;TRACE
prompt
4
+ false
AnyCPU
@@ -30,20 +35,38 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.1.3\lib\net40\EntityFramework.SqlServerCompact.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -112,6 +135,14 @@
if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -115,10 +115,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/SelfManagedWebApplicationWindowsService/Properties/Settings.Designer.cs b/Master/SelfManagedWebApplicationWindowsService/Properties/Settings.Designer.cs
index c0e1d1c..c942b2b 100644
--- a/Master/SelfManagedWebApplicationWindowsService/Properties/Settings.Designer.cs
+++ b/Master/SelfManagedWebApplicationWindowsService/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace SelfManagedWebApplicationWindowsService.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj b/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj
index a95227f..6257497 100644
--- a/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj
+++ b/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
@@ -9,7 +10,7 @@
Properties
SelfManagedWebApplicationWindowsService
SelfManagedWebApplicationWindowsService
- v4.0
+ v4.8
512
publish\
true
@@ -26,6 +27,9 @@
false
false
true
+
+
+
AnyCPU
@@ -36,6 +40,7 @@
DEBUG;TRACE
prompt
4
+ false
AnyCPU
@@ -45,20 +50,38 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.1.3\lib\net40\EntityFramework.SqlServerCompact.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -158,6 +181,14 @@
if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.AspenTech/packages.config b/Master/Turbine.Consumer.AspenTech/packages.config
index 7024a07..89a5cdc 100644
--- a/Master/Turbine.Consumer.AspenTech/packages.config
+++ b/Master/Turbine.Consumer.AspenTech/packages.config
@@ -1,5 +1,5 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.AspenTech7.3/Turbine.Consumer.AspenTech7.3.csproj b/Master/Turbine.Consumer.AspenTech7.3/Turbine.Consumer.AspenTech7.3.csproj
index 4bde98d..6b030dc 100644
--- a/Master/Turbine.Consumer.AspenTech7.3/Turbine.Consumer.AspenTech7.3.csproj
+++ b/Master/Turbine.Consumer.AspenTech7.3/Turbine.Consumer.AspenTech7.3.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -9,8 +9,9 @@
Properties
Turbine.Consumer.AspenTech73
Turbine.Consumer.AspenTech73
- v4.0
+ v4.8
512
+
true
@@ -20,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -28,6 +30,7 @@
TRACE
prompt
4
+ false
@@ -39,9 +42,8 @@
..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
$(MSBuildProgramFiles32)\CCSI\SimSinter_Aspen7.3\Sinter_Aspen7.3.dll
diff --git a/Master/Turbine.Consumer.AspenTech7.3/packages.config b/Master/Turbine.Consumer.AspenTech7.3/packages.config
index 7024a07..0a97c12 100644
--- a/Master/Turbine.Consumer.AspenTech7.3/packages.config
+++ b/Master/Turbine.Consumer.AspenTech7.3/packages.config
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.Console/SinterConsumerConsole.cs b/Master/Turbine.Consumer.Console/SinterConsumerConsole.cs
index f36981e..500bbbd 100644
--- a/Master/Turbine.Consumer.Console/SinterConsumerConsole.cs
+++ b/Master/Turbine.Consumer.Console/SinterConsumerConsole.cs
@@ -5,7 +5,7 @@
using System.Configuration;
using System.Diagnostics;
using System.IO;
-using Microsoft.Practices.Unity;
+using Unity;
using Turbine.Data.Contract.Behaviors;
using sinter;
using System.Threading;
diff --git a/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj
index 311ab48..c4044ff 100644
--- a/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj
+++ b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -10,8 +10,9 @@
Properties
Turbine.Consumer.Console
Turbine.Consumer.Console
- v4.0
+ v4.8
512
+
true
@@ -21,6 +22,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -29,37 +31,53 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll
-
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.dll
+
+ ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll
-
- ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll
-
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
- $(MSBuildProgramFiles32)\CCSI\SimSinter\Sinter.dll
+ $(ProgramFiles)\CCSI\SimSinter\Sinter.dll
+
+ ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+ ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
+
+ ..\..\TurbineLite\packages\Unity.Abstractions.5.11.7\lib\net48\Unity.Abstractions.dll
+
@@ -92,6 +110,7 @@
+
diff --git a/Master/Turbine.Consumer.Console/app.config b/Master/Turbine.Consumer.Console/app.config
new file mode 100644
index 0000000..e4c2573
--- /dev/null
+++ b/Master/Turbine.Consumer.Console/app.config
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.Console/packages.config b/Master/Turbine.Consumer.Console/packages.config
index ecd83a8..2d7402d 100644
--- a/Master/Turbine.Consumer.Console/packages.config
+++ b/Master/Turbine.Consumer.Console/packages.config
@@ -1,7 +1,8 @@
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.Contract.Behaviors/Turbine.Consumer.Contract.Behaviors.csproj b/Master/Turbine.Consumer.Contract.Behaviors/Turbine.Consumer.Contract.Behaviors.csproj
index 8a26731..a0ccd95 100644
--- a/Master/Turbine.Consumer.Contract.Behaviors/Turbine.Consumer.Contract.Behaviors.csproj
+++ b/Master/Turbine.Consumer.Contract.Behaviors/Turbine.Consumer.Contract.Behaviors.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -10,8 +10,9 @@
Properties
Turbine.Consumer.Contract.Behaviors
Turbine.Consumer.Contract.Behaviors
- v4.0
+ v4.8
512
+
true
@@ -21,6 +22,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -29,6 +31,25 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
diff --git a/Master/Turbine.Consumer.Data.Contract.Behaviors/Turbine.Consumer.Data.Contract.Behaviors.csproj b/Master/Turbine.Consumer.Data.Contract.Behaviors/Turbine.Consumer.Data.Contract.Behaviors.csproj
index d0e7db4..1f99887 100644
--- a/Master/Turbine.Consumer.Data.Contract.Behaviors/Turbine.Consumer.Data.Contract.Behaviors.csproj
+++ b/Master/Turbine.Consumer.Data.Contract.Behaviors/Turbine.Consumer.Data.Contract.Behaviors.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -10,8 +10,9 @@
Properties
Turbine.Consumer.Data.Contract.Behaviors
Turbine.Consumer.Data.Contract.Behaviors
- v4.0
+ v4.8
512
+
true
@@ -21,6 +22,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -29,6 +31,25 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
diff --git a/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj b/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj
index 259b6c2..592b829 100644
--- a/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj
+++ b/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
AnyCPU
@@ -10,8 +11,11 @@
Properties
Turbine.Consumer.Excel
Turbine.Consumer.Excel
- v4.0
+ v4.8
512
+
+
+
true
@@ -21,6 +25,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -29,20 +34,38 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
- $(MSBuildProgramFiles32)\CCSI\SimSinter\Sinter.dll
+ $(ProgramFiles)\CCSI\SimSinter\Sinter.dll
@@ -81,9 +104,18 @@
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.Excel/packages.config b/Master/Turbine.Consumer.Excel/packages.config
index b97280f..89a5cdc 100644
--- a/Master/Turbine.Consumer.Excel/packages.config
+++ b/Master/Turbine.Consumer.Excel/packages.config
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.GProms/App.config b/Master/Turbine.Consumer.GProms/App.config
index 7a9313c..55211c1 100644
--- a/Master/Turbine.Consumer.GProms/App.config
+++ b/Master/Turbine.Consumer.GProms/App.config
@@ -1,9 +1,9 @@
-
+
-
+
@@ -19,6 +19,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/Master/Turbine.Consumer.GProms/Turbine.Consumer.GProms.csproj b/Master/Turbine.Consumer.GProms/Turbine.Consumer.GProms.csproj
index 944662b..abae647 100644
--- a/Master/Turbine.Consumer.GProms/Turbine.Consumer.GProms.csproj
+++ b/Master/Turbine.Consumer.GProms/Turbine.Consumer.GProms.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
AnyCPU
@@ -10,8 +11,11 @@
Properties
Turbine.Consumer.GProms
Turbine.Consumer.GProms
- v4.0
+ v4.8
512
+
+
+
true
@@ -21,6 +25,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -29,20 +34,20 @@
TRACE
prompt
4
+ false
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
- $(MSBuildProgramFiles32)\CCSI\SimSinter\Sinter.dll
+ $(ProgramFiles)\CCSI\SimSinter\Sinter.dll
@@ -58,6 +63,7 @@
+
@@ -83,6 +89,14 @@
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Data.Entities/Turbine.Data.Entities.csproj b/Master/Turbine.Data.Entities/Turbine.Data.Entities.csproj
index dc90c2d..f1d479b 100644
--- a/Master/Turbine.Data.Entities/Turbine.Data.Entities.csproj
+++ b/Master/Turbine.Data.Entities/Turbine.Data.Entities.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
@@ -9,8 +10,11 @@
Properties
Turbine.Data.Entities
Turbine.Data.Entities
- v4.0
+ v4.8
512
+
+
+
true
@@ -20,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -28,13 +33,32 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
@@ -65,9 +89,18 @@
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.DataEF6.Contract/Turbine.DataEF6.Contract.csproj b/Master/Turbine.DataEF6.Contract/Turbine.DataEF6.Contract.csproj
index b856a68..dec936c 100644
--- a/Master/Turbine.DataEF6.Contract/Turbine.DataEF6.Contract.csproj
+++ b/Master/Turbine.DataEF6.Contract/Turbine.DataEF6.Contract.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
@@ -9,8 +10,11 @@
Properties
Turbine.DataEF6.Contract
Turbine.DataEF6.Contract
- v4.0
+ v4.8
512
+
+
+
true
@@ -20,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -28,17 +33,35 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -69,9 +92,18 @@
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
+
+
+
diff --git a/Master/Turbine.DataEF6/Model1.Designer.cs b/Master/Turbine.DataEF6/Model1.Designer.cs
index ee24e0d..4744627 100644
--- a/Master/Turbine.DataEF6/Model1.Designer.cs
+++ b/Master/Turbine.DataEF6/Model1.Designer.cs
@@ -1,4 +1,10 @@
-// Default code generation is disabled for model 'C:\Users\boverhof\Documents\Visual Studio 2012\Projects\turb_sci_gate\Master\Turbine.DataEF6\Model1.edmx'.
-// To enable default code generation, change the value of the 'Code Generation Strategy' designer
-// property to an alternate value. This property is available in the Properties Window when the model is
-// open in the designer.
\ No newline at end of file
+// T4 code generation is enabled for model 'C:\Users\Administrator\Source\Repos\turb_sci_gate\Master\Turbine.DataEF6\Model1.edmx'.
+// To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
+// property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
+// is open in the designer.
+
+// If no context and entity classes have been generated, it may be because you created an empty model but
+// have not yet chosen which version of Entity Framework to use. To generate a context class and entity
+// classes for your model, open the model in the designer, right-click on the designer surface, and
+// select 'Update Model from Database...', 'Generate Database from Model...', or 'Add Code Generation
+// Item...'.
\ No newline at end of file
diff --git a/Master/Turbine.DataEF6/Turbine.DataEF6.csproj b/Master/Turbine.DataEF6/Turbine.DataEF6.csproj
index 0ac62a6..ab5b8f0 100644
--- a/Master/Turbine.DataEF6/Turbine.DataEF6.csproj
+++ b/Master/Turbine.DataEF6/Turbine.DataEF6.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
@@ -9,7 +10,7 @@
Properties
Turbine.DataEF6
Turbine.DataEF6
- v4.0
+ v4.8
512
publish\
true
@@ -26,6 +27,9 @@
false
false
true
+
+
+
true
@@ -35,6 +39,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -43,16 +48,35 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.1.3\lib\net40\EntityFramework.SqlServerCompact.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll
@@ -162,6 +186,14 @@
if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Lite.Consumer.Data.Contract/Turbine.Lite.Consumer.Data.Contract.csproj b/Master/Turbine.Lite.Consumer.Data.Contract/Turbine.Lite.Consumer.Data.Contract.csproj
index f73bb13..6f5a00f 100644
--- a/Master/Turbine.Lite.Consumer.Data.Contract/Turbine.Lite.Consumer.Data.Contract.csproj
+++ b/Master/Turbine.Lite.Consumer.Data.Contract/Turbine.Lite.Consumer.Data.Contract.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
@@ -9,8 +10,11 @@
Properties
Turbine.Lite.Consumer.Data.Contract
Turbine.Lite.Consumer.Data.Contract
- v4.0
+ v4.8
512
+
+
+
true
@@ -20,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -28,13 +33,32 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
@@ -85,6 +109,14 @@
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/Turbine.Lite.Web.Resources/Turbine.Lite.Web.Resources.csproj b/Master/Turbine.Lite.Web.Resources/Turbine.Lite.Web.Resources.csproj
index b47dfef..7bcb42f 100644
--- a/Master/Turbine.Lite.Web.Resources/Turbine.Lite.Web.Resources.csproj
+++ b/Master/Turbine.Lite.Web.Resources/Turbine.Lite.Web.Resources.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
@@ -9,8 +10,11 @@
Properties
Turbine.Lite.Web.Resources
Turbine.Lite.Web.Resources
- v4.0
+ v4.8
512
+
+
+
true
@@ -20,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -28,17 +33,35 @@
TRACE
prompt
4
+ false
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -107,6 +130,14 @@
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
-
+
-
-
+
-
+
-
+
-
+
+
-
-
-
+
+
-
-
-
+
-
+
-
-
+
-
-
-
+
+
-
-
+
-
-
@@ -124,21 +117,15 @@ Turbine Gateway Simple Web Application Configuration
-
-
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
@@ -55,6 +53,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,6 +144,9 @@
+
+
+
diff --git a/Master/TurbineLiteConsumerIntegrationTest/ConsumerContractTest.cs b/Master/TurbineLiteConsumerIntegrationTest/ConsumerContractTest.cs
index 15bdc67..7dcf3f3 100644
--- a/Master/TurbineLiteConsumerIntegrationTest/ConsumerContractTest.cs
+++ b/Master/TurbineLiteConsumerIntegrationTest/ConsumerContractTest.cs
@@ -16,7 +16,7 @@
using Turbine.Lite.Web.Resources.Contracts;
using Turbine.Data.Contract.Behaviors;
using Turbine.Consumer.Contract.Behaviors;
-using Microsoft.Practices.Unity;
+using Unity;
namespace TurbineLiteConsumerIntegrationTest
@@ -128,7 +128,7 @@ public static void AssemblyInit(TestContext context)
*/
var _a = typeof(System.Data.Entity.SqlServer.SqlProviderServices);
var _b = typeof(System.Data.Entity.SqlServerCompact.SqlCeProviderServices);
- var _c = typeof(Microsoft.Practices.ServiceLocation.ServiceLocator);
+ var _c = typeof(CommonServiceLocator.ServiceLocator);
var _d = typeof(Turbine.Lite.Consumer.Data.Contract.ConsumerRegistrationContract);
CleanUpDatabase();
diff --git a/Master/TurbineLiteConsumerIntegrationTest/ConsumerUnityTest1.cs b/Master/TurbineLiteConsumerIntegrationTest/ConsumerUnityTest1.cs
index 6b4faa4..a01e5b5 100644
--- a/Master/TurbineLiteConsumerIntegrationTest/ConsumerUnityTest1.cs
+++ b/Master/TurbineLiteConsumerIntegrationTest/ConsumerUnityTest1.cs
@@ -1,6 +1,6 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.Practices.Unity;
+using Unity;
using Turbine.Consumer.Contract.Behaviors;
namespace TurbineLiteConsumerIntegrationTest
diff --git a/Master/TurbineLiteConsumerIntegrationTest/TurbineLiteConsumerIntegrationTest.csproj b/Master/TurbineLiteConsumerIntegrationTest/TurbineLiteConsumerIntegrationTest.csproj
index f30e47c..b06f0a9 100644
--- a/Master/TurbineLiteConsumerIntegrationTest/TurbineLiteConsumerIntegrationTest.csproj
+++ b/Master/TurbineLiteConsumerIntegrationTest/TurbineLiteConsumerIntegrationTest.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
AnyCPU
@@ -8,7 +9,7 @@
Properties
TurbineLiteConsumerIntegrationTest
TurbineLiteConsumerIntegrationTest
- v4.0
+ v4.8
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
10.0
@@ -16,6 +17,9 @@
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
+
+
+
true
@@ -25,6 +29,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -33,16 +38,23 @@
TRACE
prompt
4
+ false
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll
-
- ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.1.3\lib\net40\EntityFramework.SqlServerCompact.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
+
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
+
+
+ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll
..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
@@ -61,15 +73,15 @@
..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll
-
- ..\..\TurbineLite\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll
+
+ ..\..\TurbineLite\packages\Moq.4.20.69\lib\net462\Moq.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
+
3.5
@@ -83,9 +95,21 @@
True
..\packages\Microsoft.SqlServer.Compact.4.0.8854.1\lib\net40\System.Data.SqlServerCe.Entity.dll
+
+ ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
+
+ ..\..\TurbineLite\packages\Unity.5.11.10\lib\net48\Unity.Abstractions.dll
+
+
+ ..\..\TurbineLite\packages\Unity.5.11.10\lib\net48\Unity.Container.dll
+
..\packages\WCFMock.dll
@@ -204,6 +228,14 @@
if exist "$(TargetDir)" del /Q "$(TargetDir)*.sdf"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
@@ -55,6 +53,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,6 +144,9 @@
+
+
+
diff --git a/Master/TurbineLiteProducerIntegrationTest/TurbineLiteProducerIntegrationTest.csproj b/Master/TurbineLiteProducerIntegrationTest/TurbineLiteProducerIntegrationTest.csproj
index e46465c..a034f07 100644
--- a/Master/TurbineLiteProducerIntegrationTest/TurbineLiteProducerIntegrationTest.csproj
+++ b/Master/TurbineLiteProducerIntegrationTest/TurbineLiteProducerIntegrationTest.csproj
@@ -1,5 +1,6 @@
-
+
+
Debug
AnyCPU
@@ -8,7 +9,7 @@
Properties
TurbineLiteProducerIntegrationTest
TurbineLiteProducerIntegrationTest
- v4.0
+ v4.8
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
10.0
@@ -16,6 +17,9 @@
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
+
+
+
true
@@ -25,6 +29,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -33,26 +38,30 @@
TRACE
prompt
4
+ false
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll
+
+ ..\..\TurbineLite\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
-
- ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
-
- ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.1.3\lib\net40\EntityFramework.SqlServerCompact.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- ..\..\TurbineLite\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll
+
+ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll
-
- False
- ..\..\TurbineLite\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll
+
+ ..\..\TurbineLite\packages\Moq.4.20.69\lib\net462\Moq.dll
+
+
+ ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
+
3.5
@@ -66,9 +75,15 @@
True
..\packages\Microsoft.SqlServer.Compact.4.0.8854.1\lib\net40\System.Data.SqlServerCe.Entity.dll
+
+ ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
..\..\Master\packages\WCFMock.dll
@@ -173,6 +188,14 @@
if exist "$(TargetDir)" del /Q "$(TargetDir)*.sdf"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
- = 600]]>
-
+
+
+
-
- Installed OR PROP.NET_FRAMEWORK_4 = "#1"
-
+
+
+
-
- Installed OR ( OR )
-
-
- Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#2" AND PROP.SIM_SINTER_MINOR >= "#1")
-
+
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
+
-
-
-
+
-
- Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#2" AND PROP.SIM_SINTER_MINOR >= "#1")
-
+
+
+
-
+
-
-
+
+
+
-
+
+
-
-
-
-
+
-
- Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#2" AND PROP.SIM_SINTER_MINOR >= "#1")
-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj
index 7976189..b301f48 100644
--- a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj
+++ b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj
@@ -1,39 +1,20 @@
-
-
+
- Debug
- x86
3.7
- a5cbda7e-0ab4-4c24-bd4c-ff8d6b24e5c7
- 2.0
TurbineLite
- Package
- $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets
- $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets
- bin\$(Configuration)\
- obj\$(Configuration)\
Debug
-
- bin\$(Configuration)\
- obj\$(Configuration)\
-
-
-
-
-
- $(WixExtDir)\WixUtilExtension.dll
- WixUtilExtension
-
-
- $(WixExtDir)\WixUIExtension.dll
- WixUIExtension
-
+
+
+
+
+
+
SelfHostWebApplication
{3e1b9548-a8bc-43d4-9ecb-37d4de916f43}
@@ -50,6 +31,10 @@
Binaries;Content;Satellites
INSTALLFOLDER
+
+
+
+
Turbine.DataEF6
{7c0fa46a-937d-44e0-ad71-d96f383fa4ca}
@@ -58,14 +43,7 @@
Binaries;Content;Satellites
INSTALLFOLDER
-
- TurbineSetupLibrary
- {1b88c188-9959-4c0c-943e-a16de4278b3d}
- True
- True
- Binaries;Content;Satellites
- INSTALLFOLDER
-
+
@@ -75,13 +53,4 @@
-
-
\ No newline at end of file
diff --git a/Master/TurbineSetupLibrary/CA.DATABASE_WARNING.vbs b/Master/TurbineSetupLibrary/CA.DATABASE_WARNING.vbs
new file mode 100644
index 0000000..3f77b92
--- /dev/null
+++ b/Master/TurbineSetupLibrary/CA.DATABASE_WARNING.vbs
@@ -0,0 +1 @@
+msgbox "WARNING: Installing the Database Feature will change SQL Server default instance to Mixed mode authentication"
\ No newline at end of file
diff --git a/Master/TurbineSetupLibrary/Library.wxs b/Master/TurbineSetupLibrary/Library.wxs
index 9b5adf4..72c1851 100644
--- a/Master/TurbineSetupLibrary/Library.wxs
+++ b/Master/TurbineSetupLibrary/Library.wxs
@@ -1,215 +1,151 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -259,7 +195,7 @@
-->
-
+
@@ -272,13 +208,9 @@
-
- = 600]]>
-
+
-
- Installed OR PROP.NET_FRAMEWORK_4 = "#1"
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -369,9 +301,9 @@
-
+
-
+
@@ -380,14 +312,14 @@
-
-
-
+
+
+
-
-
-
+
+
+
@@ -396,17 +328,17 @@
-
+
-
+
-
-
-
+
+
+
@@ -422,17 +354,17 @@
-
+
-
+
-
-
-
+
+
+
@@ -448,54 +380,48 @@
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
@@ -505,54 +431,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -560,32 +475,32 @@
-->
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -595,60 +510,51 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -659,22 +565,18 @@
-
+
-
+
-
+
-
+
@@ -682,11 +584,11 @@
-
-
+
+
-
-
+
+
@@ -694,53 +596,34 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -773,59 +656,49 @@
-->
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -834,49 +707,49 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
diff --git a/Master/TurbineSetupLibrary/TurbineSetupLibrary.wixproj b/Master/TurbineSetupLibrary/TurbineSetupLibrary.wixproj
index 9880bab..89367f2 100644
--- a/Master/TurbineSetupLibrary/TurbineSetupLibrary.wixproj
+++ b/Master/TurbineSetupLibrary/TurbineSetupLibrary.wixproj
@@ -1,34 +1,13 @@
-
-
+
- Debug
- x86
3.5
- {1b88c188-9959-4c0c-943e-a16de4278b3d}
- 2.0
- TurbineSetupLibrary
Library
- $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets
- $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets
- bin\$(Configuration)\
- obj\$(Configuration)\
Debug
-
- bin\$(Configuration)\
- obj\$(Configuration)\
-
-
-
-
-
-
- $(WixExtDir)\WixUtilExtension.dll
- WixUtilExtension
-
+
@@ -64,13 +43,4 @@
INSTALLFOLDER
-
-
\ No newline at end of file
diff --git a/Master/TurbineSetupLibrary/UIDialog.wxs b/Master/TurbineSetupLibrary/UIDialog.wxs
index 87cdab8..fc2d0f7 100644
--- a/Master/TurbineSetupLibrary/UIDialog.wxs
+++ b/Master/TurbineSetupLibrary/UIDialog.wxs
@@ -1,5 +1,4 @@
-
-
+
@@ -10,16 +9,9 @@
- LicenseAccepted = "1"
-
- 1
+
+
+
@@ -41,89 +33,67 @@
- 1
+
- 1
+
- 1
- LicenseAccepted = "1"
+
+
- Installed
- NOT Installed
-
-
-
-
- 1
+
+
+
+
+
- NOT Installed OR WixUI_InstallMode = "Change"
- Installed
+
+
- 1
+
- 1
- 1
- 1
- 1
+
+
+
+
-