From 3358e5bf76e91db9cbe6fb8434f473a9654b8f6d Mon Sep 17 00:00:00 2001 From: kbuma Date: Mon, 27 Nov 2023 17:14:47 -0500 Subject: [PATCH 01/23] updated .NET and Wix installer versions to current standards --- .gitignore | 3 + .../AspenSinter73ConsumerConsole/App.Config | 54 +- .../AspenSinter73ConsumerConsole.csproj | 9 +- .../Properties/Settings.Designer.cs | 4 +- .../App.Config | 50 +- ...AspenSinter73ConsumerWindowsService.csproj | 9 +- .../Properties/Settings.Designer.cs | 4 +- Master/AspenSinterConsumerConsole/App.Config | 62 +- .../AspenSinterConsumerConsole.csproj | 9 +- .../Properties/Settings.Designer.cs | 49 +- .../App.Config | 66 +- .../AspenSinterConsumerWindowsService.csproj | 9 +- .../Properties/Settings.Designer.cs | 51 +- Master/DatabaseUnitTest/App.config | 18 +- .../DatabaseUnitTest/DatabaseUnitTest.csproj | 7 +- Master/DatabaseUnitTest/packages.config | 2 +- Master/ExcelSinterConsumerConsole/App.Config | 58 +- .../ExcelSinterConsumerConsole.csproj | 9 +- .../Properties/Settings.Designer.cs | 4 +- .../App.Config | 52 +- .../ExcelSinterConsumerWindowsService.csproj | 9 +- .../Properties/Settings.Designer.cs | 4 +- Master/GPromsSinterConsumerConsole/App.config | 66 +- .../GPromsSinterConsumerConsole.csproj | 9 +- .../Properties/Settings.Designer.cs | 64 +- .../packages.config | 2 +- .../GPromsSinterConsumerWindowsService.csproj | 9 +- .../Properties/Settings.Designer.cs | 75 +- .../app.config | 66 +- Master/SelfHostIntegrationTest/App.config | 46 +- .../SelfHostIntegrationTest.csproj | 7 +- .../SelfHostIntegrationTest/packages.config | 2 +- Master/SelfHostWebApplication/App.Config | 40 +- .../Properties/Settings.Designer.cs | 4 +- .../SelfHostWebApplication.csproj | 7 +- Master/SelfHostWebApplication/packages.config | 2 +- .../App.config | 44 +- .../Properties/Settings.Designer.cs | 4 +- ...ManagedWebApplicationWindowsService.csproj | 7 +- .../packages.config | 2 +- Master/SinterIntegrationTest/App.config | 60 +- .../Properties/Settings.Designer.cs | 49 +- .../SinterIntegrationTest.csproj | 7 +- .../Sinter_Aspen73_IntegrationTest/App.config | 52 +- .../Sinter_Aspen73_IntegrationTest.csproj | 7 +- .../Turbine.Consumer.AspenTech.csproj | 7 +- .../packages.config | 2 +- .../Turbine.Consumer.AspenTech7.3.csproj | 7 +- .../packages.config | 2 +- .../Turbine.Consumer.Console.csproj | 7 +- ...Turbine.Consumer.Contract.Behaviors.csproj | 7 +- ...ne.Consumer.Data.Contract.Behaviors.csproj | 7 +- .../Turbine.Consumer.Excel.csproj | 7 +- .../Turbine.Consumer.GProms.csproj | 7 +- .../Turbine.Consumer.SimSinter.csproj | 7 +- .../Turbine.Consumer/Turbine.Consumer.csproj | 7 +- .../Turbine.Data.Contract.Behaviors.csproj | 11 +- .../Turbine.Data.Entities.csproj | 7 +- .../Turbine.Data.Serialize.csproj | 7 +- Master/Turbine.Data.Serialize/packages.config | 2 +- .../Turbine.DataEF6.Contract.csproj | 7 +- .../Turbine.DataEF6.Contract/packages.config | 2 +- Master/Turbine.DataEF6/App.config | 16 +- Master/Turbine.DataEF6/Model1.Designer.cs | 14 +- Master/Turbine.DataEF6/Turbine.DataEF6.csproj | 7 +- Master/Turbine.DataEF6/packages.config | 2 +- .../App.config | 10 +- ...Turbine.Lite.Consumer.Data.Contract.csproj | 7 +- Master/Turbine.Lite.Web.Resources/App.config | 10 +- .../Turbine.Lite.Web.Resources.csproj | 7 +- .../packages.config | 2 +- ...ne.Producer.Data.Contract.Behaviors.csproj | 7 +- .../Turbine.Producer/Turbine.Producer.csproj | 7 +- Master/Turbine.Web/Turbine.Web.csproj | 7 +- .../TurbineLiteWebApplication.csproj | 11 +- .../TurbineLiteWebApplication/Web.config | 61 +- .../App.config | 82 +- .../TurbineLiteConsumerIntegrationTest.csproj | 7 +- .../packages.config | 2 +- .../App.config | 82 +- .../TurbineLiteProducerIntegrationTest.csproj | 7 +- .../packages.config | 2 +- Master/TurbineLiteWiXInstaller/Product.wxs | 831 ++++++------------ .../TurbineLiteWiXInstaller.wixproj | 38 +- .../CA.DATABASE_WARNING.vbs | 1 + Master/TurbineSetupLibrary/Library.wxs | 554 +++++------- .../TurbineSetupLibrary.wixproj | 34 +- Master/TurbineSetupLibrary/UIDialog.wxs | 160 ++-- 88 files changed, 1287 insertions(+), 1957 deletions(-) create mode 100644 Master/TurbineSetupLibrary/CA.DATABASE_WARNING.vbs diff --git a/.gitignore b/.gitignore index f2fec5d..29a4ec8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ CodeAnalyst/ Debug/ Release/ ipch/ +.vs/ +obj/ +packages/ 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..e2f3877 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,6 +49,7 @@ TRACE prompt 4 + false 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/AspenSinterConsumerConsole/App.Config b/Master/AspenSinterConsumerConsole/App.Config index 156c76d..0e2a8ad 100644 --- a/Master/AspenSinterConsumerConsole/App.Config +++ b/Master/AspenSinterConsumerConsole/App.Config @@ -1,9 +1,9 @@ - + -
+
-
+
@@ -14,52 +14,52 @@ - - + + - + - - - - + + + + - - - + + + - + - - + + - - + + - + - - + + - + - - - - - - + + + + + + @@ -67,9 +67,9 @@ - + - + @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj index 7feb8e9..9ea10e8 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,6 +34,7 @@ DEBUG;TRACE prompt 4 + false diff --git a/Master/AspenSinterConsumerConsole/Properties/Settings.Designer.cs b/Master/AspenSinterConsumerConsole/Properties/Settings.Designer.cs index c4e54a4..7b8bcae 100644 --- a/Master/AspenSinterConsumerConsole/Properties/Settings.Designer.cs +++ b/Master/AspenSinterConsumerConsole/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()))); @@ -34,50 +34,5 @@ public string BaseDirectory { this["BaseDirectory"] = value; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1800")] - public int TimeOutIterations - { - get - { - return ((int)(this["TimeOutIterations"])); - } - set - { - this["TimeOutIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("600")] - public int TimeOutSetupIterations - { - get - { - return ((int)(this["TimeOutSetupIterations"])); - } - set - { - this["TimeOutSetupIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("660")] - public int TimePostInitIterations - { - get - { - return ((int)(this["TimePostInitIterations"])); - } - set - { - this["TimePostInitIterations"] = value; - } - } } } diff --git a/Master/AspenSinterConsumerWindowsService/App.Config b/Master/AspenSinterConsumerWindowsService/App.Config index 756df28..fe2df88 100644 --- a/Master/AspenSinterConsumerWindowsService/App.Config +++ b/Master/AspenSinterConsumerWindowsService/App.Config @@ -1,60 +1,60 @@ - + -
+
-
+
- - + + - - + + - + - - - - + + + + - - - + + + - - - + + + - - + + - + - - + + - - - - - - - + + + + + + + @@ -62,8 +62,8 @@ - - + + @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj index 608d438..6dba07c 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,6 +49,7 @@ TRACE prompt 4 + false diff --git a/Master/AspenSinterConsumerWindowsService/Properties/Settings.Designer.cs b/Master/AspenSinterConsumerWindowsService/Properties/Settings.Designer.cs index 1bc83eb..e888cb4 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,50 +46,5 @@ public int CheckForNewJobsInterval { this["CheckForNewJobsInterval"] = value; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("30")] - public int TimeOutIterations - { - get - { - return ((int)(this["TimeOutIterations"])); - } - set - { - this["TimeOutIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("10")] - public int TimeOutSetupIterations - { - get - { - return ((int)(this["TimeOutSetupIterations"])); - } - set - { - this["TimeOutSetupIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("16")] - public int TimePostInitIterations - { - get - { - return ((int)(this["TimePostInitIterations"])); - } - set - { - this["TimePostInitIterations"] = value; - } - } } } diff --git a/Master/DatabaseUnitTest/App.config b/Master/DatabaseUnitTest/App.config index a0606c1..a40596f 100644 --- a/Master/DatabaseUnitTest/App.config +++ b/Master/DatabaseUnitTest/App.config @@ -1,8 +1,8 @@ - + -
+
@@ -15,21 +15,21 @@ - + - - + + - + - - + + - \ No newline at end of file + diff --git a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj index d8f5e69..1d43c11 100644 --- a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj +++ b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -8,7 +8,7 @@ Properties DatabaseUnitTest DatabaseUnitTest - v4.0 + v4.8 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -16,6 +16,7 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest + true @@ -25,6 +26,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -33,6 +35,7 @@ TRACE prompt 4 + false OnBuildSuccess diff --git a/Master/DatabaseUnitTest/packages.config b/Master/DatabaseUnitTest/packages.config index 89b1dad..520c7bb 100644 --- a/Master/DatabaseUnitTest/packages.config +++ b/Master/DatabaseUnitTest/packages.config @@ -6,4 +6,4 @@ - + \ No newline at end of file diff --git a/Master/ExcelSinterConsumerConsole/App.Config b/Master/ExcelSinterConsumerConsole/App.Config index 226087d..26d5200 100644 --- a/Master/ExcelSinterConsumerConsole/App.Config +++ b/Master/ExcelSinterConsumerConsole/App.Config @@ -1,54 +1,54 @@ - + -
+
-
+
- - + + - - + + - + - - - - + + + + - - - + + + - - - + + + - - + + - - - - - - + + + + + + @@ -56,9 +56,9 @@ - + - + @@ -71,4 +71,4 @@ - \ No newline at end of file + diff --git a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj index 03502ce..5a87cf3 100644 --- a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj +++ b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,8 +10,9 @@ Properties ExcelSinterConsumerConsole ExcelSinterConsumerConsole - v4.0 - Client + v4.8 + + 512 publish\ true @@ -38,6 +39,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -47,6 +49,7 @@ TRACE prompt 4 + false ExcelSinterConsumerConsole.Program diff --git a/Master/ExcelSinterConsumerConsole/Properties/Settings.Designer.cs b/Master/ExcelSinterConsumerConsole/Properties/Settings.Designer.cs index e6d20a9..55e6435 100644 --- a/Master/ExcelSinterConsumerConsole/Properties/Settings.Designer.cs +++ b/Master/ExcelSinterConsumerConsole/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 ExcelSinterConsumerConsole.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/ExcelSinterConsumerWindowsService/App.Config b/Master/ExcelSinterConsumerWindowsService/App.Config index 55f0679..9ae0edd 100644 --- a/Master/ExcelSinterConsumerWindowsService/App.Config +++ b/Master/ExcelSinterConsumerWindowsService/App.Config @@ -1,52 +1,52 @@ - + -
+
-
+
- - + + - - + + - + - - + + - - + + - - - + + + - - + + - + - - - - - + + + + + @@ -54,8 +54,8 @@ - - + + @@ -69,4 +69,4 @@ - + diff --git a/Master/ExcelSinterConsumerWindowsService/ExcelSinterConsumerWindowsService.csproj b/Master/ExcelSinterConsumerWindowsService/ExcelSinterConsumerWindowsService.csproj index 9417a57..3714ddd 100644 --- a/Master/ExcelSinterConsumerWindowsService/ExcelSinterConsumerWindowsService.csproj +++ b/Master/ExcelSinterConsumerWindowsService/ExcelSinterConsumerWindowsService.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,9 +9,10 @@ Properties ExcelSinterConsumerWindowsService ExcelSinterConsumerWindowsService - v4.0 + v4.8 512 - Client + + publish\ true Disk @@ -37,6 +38,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -46,6 +48,7 @@ TRACE prompt 4 + false diff --git a/Master/ExcelSinterConsumerWindowsService/Properties/Settings.Designer.cs b/Master/ExcelSinterConsumerWindowsService/Properties/Settings.Designer.cs index 99602e2..e730e5a 100644 --- a/Master/ExcelSinterConsumerWindowsService/Properties/Settings.Designer.cs +++ b/Master/ExcelSinterConsumerWindowsService/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18063 +// 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 ExcelSinterConsumerWindowsService.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/GPromsSinterConsumerConsole/App.config b/Master/GPromsSinterConsumerConsole/App.config index f3ccb92..3162edc 100644 --- a/Master/GPromsSinterConsumerConsole/App.config +++ b/Master/GPromsSinterConsumerConsole/App.config @@ -1,65 +1,65 @@ - + -
+
-
+
- - + + - - + + - + - - - - + + + + - - - + + + - + - - + + - - + + - + - - + + - + - - - - - - + + + + + + @@ -67,9 +67,9 @@ - + - + @@ -81,4 +81,4 @@ - + diff --git a/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj b/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj index 1a8e9e1..6f13c89 100644 --- a/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj +++ b/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,8 +10,9 @@ Properties Turbine.Console GPromsSinterConsumerConsole - 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/GPromsSinterConsumerConsole/Properties/Settings.Designer.cs b/Master/GPromsSinterConsumerConsole/Properties/Settings.Designer.cs index 35bf092..2ab3e28 100644 --- a/Master/GPromsSinterConsumerConsole/Properties/Settings.Designer.cs +++ b/Master/GPromsSinterConsumerConsole/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// 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", "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()))); @@ -22,65 +22,5 @@ public static Settings Default { return defaultInstance; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("REPLACE")] - public string BaseDirectory - { - get - { - return ((string)(this["BaseDirectory"])); - } - set - { - this["BaseDirectory"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1800")] - public int TimeOutIterations - { - get - { - return ((int)(this["TimeOutIterations"])); - } - set - { - this["TimeOutIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("600")] - public int TimeOutSetupIterations - { - get - { - return ((int)(this["TimeOutSetupIterations"])); - } - set - { - this["TimeOutSetupIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("660")] - public int TimePostInitIterations - { - get - { - return ((int)(this["TimePostInitIterations"])); - } - set - { - this["TimePostInitIterations"] = value; - } - } } } diff --git a/Master/GPromsSinterConsumerConsole/packages.config b/Master/GPromsSinterConsumerConsole/packages.config index 3afdfe4..c12a583 100644 --- a/Master/GPromsSinterConsumerConsole/packages.config +++ b/Master/GPromsSinterConsumerConsole/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj b/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj index f6f6725..fff8d7a 100644 --- a/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj +++ b/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,8 +10,9 @@ Properties GPromsSinterConsumerWindowsService GPromsSinterConsumerWindowsService - v4.0 - Client + v4.8 + + 512 false publish\ @@ -38,6 +39,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -47,6 +49,7 @@ TRACE prompt 4 + false diff --git a/Master/GPromsSinterConsumerWindowsService/Properties/Settings.Designer.cs b/Master/GPromsSinterConsumerWindowsService/Properties/Settings.Designer.cs index 8ea3858..fd5f3c1 100644 --- a/Master/GPromsSinterConsumerWindowsService/Properties/Settings.Designer.cs +++ b/Master/GPromsSinterConsumerWindowsService/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// 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 GPromsSinterConsumerWindowsService.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()))); @@ -22,79 +22,28 @@ public static Settings Default { return defaultInstance; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("REPLACE")] - public string BaseDirectory - { - get - { + public string BaseDirectory { + get { return ((string)(this["BaseDirectory"])); } - set - { + set { this["BaseDirectory"] = value; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("5")] - public int CheckForNewJobsInterval - { - get - { - return ((int)(this["CheckForNewJobsInterval"])); - } - set - { - this["CheckForNewJobsInterval"] = value; - } - } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("30")] - public int TimeOutIterations - { - get - { - return ((int)(this["TimeOutIterations"])); - } - set - { - this["TimeOutIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("10")] - public int TimeOutSetupIterations - { - get - { - return ((int)(this["TimeOutSetupIterations"])); - } - set - { - this["TimeOutSetupIterations"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("16")] - public int TimePostInitIterations - { - get - { - return ((int)(this["TimePostInitIterations"])); + public string CheckForNewJobsInterval { + get { + return ((string)(this["CheckForNewJobsInterval"])); } - set - { - this["TimePostInitIterations"] = value; + set { + this["CheckForNewJobsInterval"] = value; } } } diff --git a/Master/GPromsSinterConsumerWindowsService/app.config b/Master/GPromsSinterConsumerWindowsService/app.config index 4f0cbec..dbf9738 100644 --- a/Master/GPromsSinterConsumerWindowsService/app.config +++ b/Master/GPromsSinterConsumerWindowsService/app.config @@ -1,60 +1,60 @@ - + -
+
-
+
- - + + - - + + - + - - - - + + + + - - - + + + - - - + + + - - + + - + - - + + - - - - - - - + + + + + + + @@ -62,8 +62,8 @@ - - + + @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/Master/SelfHostIntegrationTest/App.config b/Master/SelfHostIntegrationTest/App.config index 9c783f8..cf71fb9 100644 --- a/Master/SelfHostIntegrationTest/App.config +++ b/Master/SelfHostIntegrationTest/App.config @@ -1,58 +1,58 @@ - + -
-
+
+
- + - - + + - + - - + + - + - - + + - + - + - + - + - + @@ -12,19 +12,19 @@ - + - - + + - - + + - + - + - + - + - + @@ -12,36 +12,36 @@ - + - - + + - + - - + + - + - + - + - + -
+
@@ -10,18 +10,18 @@ - + - - + + - - + + - \ No newline at end of file + 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..482033c 100644 --- a/Master/Turbine.DataEF6/Turbine.DataEF6.csproj +++ b/Master/Turbine.DataEF6/Turbine.DataEF6.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Turbine.DataEF6 Turbine.DataEF6 - v4.0 + v4.8 512 publish\ true @@ -26,6 +26,7 @@ false false true + true @@ -35,6 +36,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -43,6 +45,7 @@ TRACE prompt 4 + false diff --git a/Master/Turbine.DataEF6/packages.config b/Master/Turbine.DataEF6/packages.config index a393e7c..88e153e 100644 --- a/Master/Turbine.DataEF6/packages.config +++ b/Master/Turbine.DataEF6/packages.config @@ -3,4 +3,4 @@ - + \ No newline at end of file diff --git a/Master/Turbine.Lite.Consumer.Data.Contract/App.config b/Master/Turbine.Lite.Consumer.Data.Contract/App.config index 01f6c9b..4659f5a 100644 --- a/Master/Turbine.Lite.Consumer.Data.Contract/App.config +++ b/Master/Turbine.Lite.Consumer.Data.Contract/App.config @@ -1,13 +1,13 @@ - + -
+
- + - + - \ 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..6cb0685 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,5 @@  - + Debug @@ -9,8 +9,9 @@ Properties Turbine.Lite.Consumer.Data.Contract Turbine.Lite.Consumer.Data.Contract - v4.0 + v4.8 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Master/Turbine.Lite.Web.Resources/App.config b/Master/Turbine.Lite.Web.Resources/App.config index 01f6c9b..4659f5a 100644 --- a/Master/Turbine.Lite.Web.Resources/App.config +++ b/Master/Turbine.Lite.Web.Resources/App.config @@ -1,13 +1,13 @@ - + -
+
- + - + - \ 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..509f8f1 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,5 @@  - + Debug @@ -9,8 +9,9 @@ Properties Turbine.Lite.Web.Resources Turbine.Lite.Web.Resources - v4.0 + v4.8 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Master/Turbine.Lite.Web.Resources/packages.config b/Master/Turbine.Lite.Web.Resources/packages.config index 7024a07..b97280f 100644 --- a/Master/Turbine.Lite.Web.Resources/packages.config +++ b/Master/Turbine.Lite.Web.Resources/packages.config @@ -2,4 +2,4 @@ - + \ No newline at end of file diff --git a/Master/Turbine.Producer.Data.Contract.Behaviors/Turbine.Producer.Data.Contract.Behaviors.csproj b/Master/Turbine.Producer.Data.Contract.Behaviors/Turbine.Producer.Data.Contract.Behaviors.csproj index cfe75a9..e4b4536 100644 --- a/Master/Turbine.Producer.Data.Contract.Behaviors/Turbine.Producer.Data.Contract.Behaviors.csproj +++ b/Master/Turbine.Producer.Data.Contract.Behaviors/Turbine.Producer.Data.Contract.Behaviors.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,9 @@ Properties Turbine.Producer.Data.Contract.Behaviors Turbine.Producer.Data.Contract.Behaviors - v4.0 + v4.8 512 + true @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +31,7 @@ TRACE prompt 4 + false diff --git a/Master/Turbine.Producer/Turbine.Producer.csproj b/Master/Turbine.Producer/Turbine.Producer.csproj index 7757d8b..bb36c25 100644 --- a/Master/Turbine.Producer/Turbine.Producer.csproj +++ b/Master/Turbine.Producer/Turbine.Producer.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,9 @@ Properties Turbine.Producer Turbine.Producer - v4.0 + v4.8 512 + true @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +31,7 @@ TRACE prompt 4 + false diff --git a/Master/Turbine.Web/Turbine.Web.csproj b/Master/Turbine.Web/Turbine.Web.csproj index 1f1879b..ec808b6 100644 --- a/Master/Turbine.Web/Turbine.Web.csproj +++ b/Master/Turbine.Web/Turbine.Web.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,9 @@ Properties Turbine.Web Turbine.Web - v4.0 + v4.8 512 + true @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +31,7 @@ DEBUG;TRACE prompt 4 + false diff --git a/Master/TurbineLite/TurbineLiteWebApplication/TurbineLiteWebApplication.csproj b/Master/TurbineLite/TurbineLiteWebApplication/TurbineLiteWebApplication.csproj index f01f4f1..702a40c 100644 --- a/Master/TurbineLite/TurbineLiteWebApplication/TurbineLiteWebApplication.csproj +++ b/Master/TurbineLite/TurbineLiteWebApplication/TurbineLiteWebApplication.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,13 +13,16 @@ Properties TurbineLiteWebApplication TurbineLiteWebApplication - v4.0 + v4.8 True true + + + true @@ -29,6 +32,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +41,7 @@ TRACE prompt 4 + false @@ -60,13 +65,13 @@ False ..\..\packages\Microsoft Unity Application Block 2.1\Bin\Microsoft.Practices.Unity.Interception.Configuration.dll + - diff --git a/Master/TurbineLite/TurbineLiteWebApplication/Web.config b/Master/TurbineLite/TurbineLiteWebApplication/Web.config index 9ae6d20..0733d0c 100644 --- a/Master/TurbineLite/TurbineLiteWebApplication/Web.config +++ b/Master/TurbineLite/TurbineLiteWebApplication/Web.config @@ -5,35 +5,37 @@ Turbine Gateway Simple Web Application Configuration
-
+
- - - + + - + - + + - - - - - - + + - @@ -111,43 +106,33 @@ Turbine Gateway Simple Web Application Configuration - - - + - - + + - - - + - - - + + - - - + - + - - \ No newline at end of file diff --git a/Master/TurbineLiteConsumerIntegrationTest/App.config b/Master/TurbineLiteConsumerIntegrationTest/App.config index 18c7b8b..73a5905 100644 --- a/Master/TurbineLiteConsumerIntegrationTest/App.config +++ b/Master/TurbineLiteConsumerIntegrationTest/App.config @@ -1,8 +1,8 @@ - + -
-
+
+
@@ -11,70 +11,70 @@ - + - - + + - + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - + + - + - + - + - + - + @@ -11,70 +11,70 @@ - + - - + + - + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - + + - + - + - + - + - + - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - + + + - + - - - - - - + + + + + + - + - - - - - + + + + + - + - + @@ -349,138 +231,53 @@ - + - + - - - + + + - + - - - - - - - + + + + + + + - + - - + + - + - - + + - + - + - + @@ -613,128 +410,113 @@ BUG: $(var.AspenSinterConsumerConsole.ProjectDir) is throwing a "undefined preprocessor error" --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -750,178 +532,106 @@ --> - + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - = 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") - + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - + + + - - + + - + @@ -1167,23 +868,23 @@ - - - + + + - + - - - + + + - - + + - + @@ -1191,47 +892,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj index 7976189..7776f82 100644 --- a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj +++ b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj @@ -1,37 +1,14 @@ - - + - 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 - + + @@ -75,13 +52,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..7eb6af6 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 @@ - - + + - - + + @@ -695,51 +597,41 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -773,59 +665,49 @@ --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -834,49 +716,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 + + + + - + - - + + - - + + - - + + - - 1 + + - - - - "" and PROP.SQL_PASSWORD <> - "" and PROP.SQLSERVER <> "" ]]> - + + + - - 1 + + - - - Please enter Configuration for Turbine Components + + + - - - {\WixUI_Font_Title}Application Settings + + + @@ -132,50 +102,34 @@ - + - - + + - - + + - - 1 + + - - - "" and PROP.TURBINE_PASSWORD <> ""]]> - + + - - 1 + + - - - User Account for Turbine Web API + + + - - - {\WixUI_Font_Title}Application Web Settings + + + From 61ed4e64a433a726d4d37ab4ffd5b4bf9f2abf57 Mon Sep 17 00:00:00 2001 From: kbuma Date: Mon, 27 Nov 2023 17:33:02 -0500 Subject: [PATCH 02/23] upgraded EntityFramework to latest version 6.4.4 --- .../AspenSinterConsumerConsole.csproj | 2 +- Master/DatabaseUnitTest/App.config | 22 +++++++++++-------- .../DatabaseUnitTest/DatabaseUnitTest.csproj | 19 ++++++++++++---- Master/DatabaseUnitTest/packages.config | 2 +- .../Turbine.Consumer.SimSinter.csproj | 2 +- Master/Turbine.Data.Entities/App.config | 2 ++ .../Turbine.Data.Entities.csproj | 8 +++---- Master/Turbine.Data.Entities/packages.config | 2 +- Master/Turbine.DataEF6/App.config | 20 ++++++++++------- Master/Turbine.DataEF6/Turbine.DataEF6.csproj | 19 ++++++++++++---- Master/Turbine.DataEF6/packages.config | 2 +- 11 files changed, 66 insertions(+), 34 deletions(-) create mode 100644 Master/Turbine.Data.Entities/App.config diff --git a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj index 9ea10e8..b7ee7c9 100644 --- a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj +++ b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj @@ -56,7 +56,7 @@ ..\..\SharedDatabaseArchitecture\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll - $(MSBuildProgramFiles32)\CCSI\SimSinter\Sinter.dll + $(MSBuildProgramFiles)\CCSI\SimSinter\Sinter.dll diff --git a/Master/DatabaseUnitTest/App.config b/Master/DatabaseUnitTest/App.config index a40596f..2c2c1c9 100644 --- a/Master/DatabaseUnitTest/App.config +++ b/Master/DatabaseUnitTest/App.config @@ -1,8 +1,7 @@ - + -
@@ -11,25 +10,30 @@ + +
- + - - + + - + - - + + - + + + + \ No newline at end of file diff --git a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj index 1d43c11..5a449f2 100644 --- a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj +++ b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -17,6 +18,8 @@ False UnitTest + + true @@ -41,11 +44,11 @@ OnBuildSuccess - - ..\..\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 @@ -159,6 +162,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.DataEF6/Turbine.DataEF6.csproj b/Master/Turbine.DataEF6/Turbine.DataEF6.csproj index 482033c..1738c73 100644 --- a/Master/Turbine.DataEF6/Turbine.DataEF6.csproj +++ b/Master/Turbine.DataEF6/Turbine.DataEF6.csproj @@ -1,5 +1,6 @@  + Debug @@ -27,6 +28,8 @@ false true + + true @@ -48,11 +51,11 @@ 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 @@ -165,6 +168,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/DatabaseUnitTest/DatabaseUnitTest.csproj b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj index 5a449f2..c7c86d2 100644 --- a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj +++ b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj @@ -50,8 +50,8 @@ ..\..\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 diff --git a/Master/DatabaseUnitTest/packages.config b/Master/DatabaseUnitTest/packages.config index d94781a..361d783 100644 --- a/Master/DatabaseUnitTest/packages.config +++ b/Master/DatabaseUnitTest/packages.config @@ -2,7 +2,7 @@ - + diff --git a/Master/SelfHostIntegrationTest/App.config b/Master/SelfHostIntegrationTest/App.config index cf71fb9..d2de022 100644 --- a/Master/SelfHostIntegrationTest/App.config +++ b/Master/SelfHostIntegrationTest/App.config @@ -1,58 +1,58 @@ - + -
-
+
+
+ + + + - + - - - - - + - - + + - + - - + + - + - + - + - + - + +
+ + + + - + - - - - - - + + - + - + - + - + - + +
+ + + + - + - - - - - + - - + + - + - + - + - + - - - -
+ + + + + - - - - + + + - - - \ No newline at end of file diff --git a/Master/Turbine.DataEF6/Turbine.DataEF6.csproj b/Master/Turbine.DataEF6/Turbine.DataEF6.csproj index 1738c73..550b85b 100644 --- a/Master/Turbine.DataEF6/Turbine.DataEF6.csproj +++ b/Master/Turbine.DataEF6/Turbine.DataEF6.csproj @@ -57,8 +57,8 @@ ..\..\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 diff --git a/Master/Turbine.DataEF6/packages.config b/Master/Turbine.DataEF6/packages.config index b114867..dc957b2 100644 --- a/Master/Turbine.DataEF6/packages.config +++ b/Master/Turbine.DataEF6/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Master/TurbineLiteConsumerIntegrationTest/App.config b/Master/TurbineLiteConsumerIntegrationTest/App.config index 73a5905..ac154bc 100644 --- a/Master/TurbineLiteConsumerIntegrationTest/App.config +++ b/Master/TurbineLiteConsumerIntegrationTest/App.config @@ -1,80 +1,78 @@ - + -
-
- - +
+
+ + + + - + - - - - - + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - + + - + - + - + - + - + - +
+
+ + + + - + - - - - - + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - + + - + - + - + - + - + + + \ No newline at end of file diff --git a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj index 6dba07c..175f8c5 100644 --- a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj +++ b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj @@ -52,24 +52,11 @@ false - - False - ..\..\SharedDatabaseArchitecture\packages\AWSSDK.1.5.50.0\lib\AWSSDK.dll + + ..\..\TurbineLite\packages\AWSSDK.2.3.55.2\lib\net45\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 - - - ..\..\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 @@ -77,12 +64,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/AspenSinterConsumerWindowsService/packages.config b/Master/AspenSinterConsumerWindowsService/packages.config index 24a27fc..ea61402 100644 --- a/Master/AspenSinterConsumerWindowsService/packages.config +++ b/Master/AspenSinterConsumerWindowsService/packages.config @@ -1,7 +1,11 @@  - - - - + + + + + + + + \ No newline at end of file diff --git a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj index c7c86d2..a7a58d7 100644 --- a/Master/DatabaseUnitTest/DatabaseUnitTest.csproj +++ b/Master/DatabaseUnitTest/DatabaseUnitTest.csproj @@ -44,6 +44,9 @@ OnBuildSuccess + + ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll + ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -54,18 +57,8 @@ ..\..\TurbineLite\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.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\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 @@ -79,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 + diff --git a/Master/DatabaseUnitTest/packages.config b/Master/DatabaseUnitTest/packages.config index 361d783..0800589 100644 --- a/Master/DatabaseUnitTest/packages.config +++ b/Master/DatabaseUnitTest/packages.config @@ -1,9 +1,10 @@  - + - - + + + \ No newline at end of file diff --git a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj index 5a87cf3..031e7ab 100644 --- a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj +++ b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj @@ -55,24 +55,11 @@ ExcelSinterConsumerConsole.Program - - ..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + + ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.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 - - - 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 @@ -81,11 +68,27 @@ + + ..\..\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/ExcelSinterConsumerConsole/packages.config b/Master/ExcelSinterConsumerConsole/packages.config index 535181b..53cad77 100644 --- a/Master/ExcelSinterConsumerConsole/packages.config +++ b/Master/ExcelSinterConsumerConsole/packages.config @@ -1,7 +1,11 @@  - - - - + + + + + + + + \ No newline at end of file diff --git a/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj b/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj index 6f13c89..ea2c544 100644 --- a/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj +++ b/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj @@ -37,23 +37,11 @@ false - - ..\..\SharedDatabaseArchitecture\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll + + ..\..\TurbineLite\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.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 - - - ..\..\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 @@ -61,11 +49,27 @@ + + ..\..\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 + @@ -80,9 +84,7 @@ Designer - - Designer - + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Master/GPromsSinterConsumerConsole/packages.config b/Master/GPromsSinterConsumerConsole/packages.config index c12a583..6c78d7c 100644 --- a/Master/GPromsSinterConsumerConsole/packages.config +++ b/Master/GPromsSinterConsumerConsole/packages.config @@ -1,7 +1,11 @@  - - - - + + + + + + + + \ No newline at end of file diff --git a/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj b/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj index fff8d7a..2c4ef55 100644 --- a/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj +++ b/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj @@ -52,24 +52,11 @@ false - - False - ..\..\SharedDatabaseArchitecture\packages\AWSSDK.1.5.50.0\lib\AWSSDK.dll + + ..\..\TurbineLite\packages\AWSSDK.2.3.55.2\lib\net45\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 - - - ..\..\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 @@ -77,12 +64,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/GPromsSinterConsumerWindowsService/app.config b/Master/GPromsSinterConsumerWindowsService/app.config index dbf9738..b9cb229 100644 --- a/Master/GPromsSinterConsumerWindowsService/app.config +++ b/Master/GPromsSinterConsumerWindowsService/app.config @@ -1,76 +1,61 @@ - + -
+
-
+
- - - + + - - + + - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + - - - REPLACE @@ -80,5 +65,16 @@ - - + + + + + + + \ No newline at end of file diff --git a/Master/GPromsSinterConsumerWindowsService/packages.config b/Master/GPromsSinterConsumerWindowsService/packages.config index 36be5e4..ea61402 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/SelfHostIntegrationTest.csproj b/Master/SelfHostIntegrationTest/SelfHostIntegrationTest.csproj index 04dd149..d6f423a 100644 --- a/Master/SelfHostIntegrationTest/SelfHostIntegrationTest.csproj +++ b/Master/SelfHostIntegrationTest/SelfHostIntegrationTest.csproj @@ -50,9 +50,8 @@ ..\..\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 diff --git a/Master/SelfHostIntegrationTest/packages.config b/Master/SelfHostIntegrationTest/packages.config index 4ab33a7..ddd66b3 100644 --- a/Master/SelfHostIntegrationTest/packages.config +++ b/Master/SelfHostIntegrationTest/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/Master/SelfHostWebApplication/SelfHostWebApplication.csproj b/Master/SelfHostWebApplication/SelfHostWebApplication.csproj index 69ee14d..d8aaebc 100644 --- a/Master/SelfHostWebApplication/SelfHostWebApplication.csproj +++ b/Master/SelfHostWebApplication/SelfHostWebApplication.csproj @@ -47,9 +47,8 @@ ..\..\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 diff --git a/Master/SelfHostWebApplication/packages.config b/Master/SelfHostWebApplication/packages.config index 4ab33a7..ddd66b3 100644 --- a/Master/SelfHostWebApplication/packages.config +++ b/Master/SelfHostWebApplication/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj b/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj index 605be62..5c07129 100644 --- a/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj +++ b/Master/SelfManagedWebApplicationWindowsService/SelfManagedWebApplicationWindowsService.csproj @@ -62,9 +62,8 @@ ..\..\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 diff --git a/Master/SelfManagedWebApplicationWindowsService/packages.config b/Master/SelfManagedWebApplicationWindowsService/packages.config index 4ab33a7..ddd66b3 100644 --- a/Master/SelfManagedWebApplicationWindowsService/packages.config +++ b/Master/SelfManagedWebApplicationWindowsService/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/Master/SinterIntegrationTest/SinterIntegrationTest.csproj b/Master/SinterIntegrationTest/SinterIntegrationTest.csproj index bbefc35..d78172b 100644 --- a/Master/SinterIntegrationTest/SinterIntegrationTest.csproj +++ b/Master/SinterIntegrationTest/SinterIntegrationTest.csproj @@ -49,9 +49,8 @@ - - 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 diff --git a/Master/SinterIntegrationTest/packages.config b/Master/SinterIntegrationTest/packages.config index 28e5e44..0b14af3 100644 --- a/Master/SinterIntegrationTest/packages.config +++ b/Master/SinterIntegrationTest/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Master/Sinter_Aspen73_IntegrationTest/Sinter_Aspen73_IntegrationTest.csproj b/Master/Sinter_Aspen73_IntegrationTest/Sinter_Aspen73_IntegrationTest.csproj index b39412d..68a8858 100644 --- a/Master/Sinter_Aspen73_IntegrationTest/Sinter_Aspen73_IntegrationTest.csproj +++ b/Master/Sinter_Aspen73_IntegrationTest/Sinter_Aspen73_IntegrationTest.csproj @@ -38,9 +38,8 @@ false - - 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 diff --git a/Master/Sinter_Aspen73_IntegrationTest/packages.config b/Master/Sinter_Aspen73_IntegrationTest/packages.config index 28e5e44..0b14af3 100644 --- a/Master/Sinter_Aspen73_IntegrationTest/packages.config +++ b/Master/Sinter_Aspen73_IntegrationTest/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj b/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj index 72a4cab..0fc05c6 100644 --- a/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj +++ b/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj @@ -40,9 +40,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\Sinter.dll diff --git a/Master/Turbine.Consumer.AspenTech/packages.config b/Master/Turbine.Consumer.AspenTech/packages.config index b97280f..0a97c12 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 1a9d7e0..6b030dc 100644 --- a/Master/Turbine.Consumer.AspenTech7.3/Turbine.Consumer.AspenTech7.3.csproj +++ b/Master/Turbine.Consumer.AspenTech7.3/Turbine.Consumer.AspenTech7.3.csproj @@ -42,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 b97280f..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/Turbine.Consumer.Console.csproj b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj index a96a6ae..6d23d38 100644 --- a/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj +++ b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj @@ -34,35 +34,38 @@ false - - ..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + + ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.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 - - - 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 + + ..\..\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/Turbine.Consumer.Console/packages.config b/Master/Turbine.Consumer.Console/packages.config index ecd83a8..53cad77 100644 --- a/Master/Turbine.Consumer.Console/packages.config +++ b/Master/Turbine.Consumer.Console/packages.config @@ -1,7 +1,11 @@  - - - - + + + + + + + + \ No newline at end of file diff --git a/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj b/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj index 44ee6af..7183332 100644 --- a/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj +++ b/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj @@ -40,9 +40,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\Sinter.dll diff --git a/Master/Turbine.Consumer.Excel/packages.config b/Master/Turbine.Consumer.Excel/packages.config index b97280f..0a97c12 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/Turbine.Consumer.GProms.csproj b/Master/Turbine.Consumer.GProms/Turbine.Consumer.GProms.csproj index 06fa957..ab4a307 100644 --- a/Master/Turbine.Consumer.GProms/Turbine.Consumer.GProms.csproj +++ b/Master/Turbine.Consumer.GProms/Turbine.Consumer.GProms.csproj @@ -40,9 +40,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\Sinter.dll diff --git a/Master/Turbine.Consumer.GProms/packages.config b/Master/Turbine.Consumer.GProms/packages.config index b97280f..0a97c12 100644 --- a/Master/Turbine.Consumer.GProms/packages.config +++ b/Master/Turbine.Consumer.GProms/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj b/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj index 3ead72f..1b612bb 100644 --- a/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj +++ b/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj @@ -34,24 +34,11 @@ false - - ..\..\SharedDatabaseArchitecture\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + + ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.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 - - - 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 $(MSBuildProgramFiles)\CCSI\SimSinter\Sinter.dll @@ -60,12 +47,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/Turbine.Consumer.SimSinter/packages.config b/Master/Turbine.Consumer.SimSinter/packages.config index ecd83a8..53cad77 100644 --- a/Master/Turbine.Consumer.SimSinter/packages.config +++ b/Master/Turbine.Consumer.SimSinter/packages.config @@ -1,7 +1,11 @@  - - - - + + + + + + + + \ No newline at end of file diff --git a/Master/Turbine.Consumer/Turbine.Consumer.csproj b/Master/Turbine.Consumer/Turbine.Consumer.csproj index c5e9993..b905aef 100644 --- a/Master/Turbine.Consumer/Turbine.Consumer.csproj +++ b/Master/Turbine.Consumer/Turbine.Consumer.csproj @@ -34,29 +34,33 @@ 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 + + ..\..\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 + @@ -81,9 +85,7 @@ - - Designer - + + +
+ - + - + - + + + + \ 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 509f8f1..bfebd8d 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 @@ -12,6 +13,8 @@ v4.8 512 + + true @@ -33,15 +36,14 @@ 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 @@ -110,6 +112,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}. + + + + + -
-
+
+
- - + + @@ -24,28 +24,28 @@ Turbine Gateway Simple Web Application Configuration --> - + - - + + - - + + - + - + - + - + + + + + + + + + + + + + \ No newline at end of file diff --git a/Master/TurbineLite/TurbineLiteWebApplication/packages.config b/Master/TurbineLite/TurbineLiteWebApplication/packages.config new file mode 100644 index 0000000..89b9286 --- /dev/null +++ b/Master/TurbineLite/TurbineLiteWebApplication/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Master/TurbineLiteConsumerIntegrationTest/App.config b/Master/TurbineLiteConsumerIntegrationTest/App.config index ac154bc..0a71061 100644 --- a/Master/TurbineLiteConsumerIntegrationTest/App.config +++ b/Master/TurbineLiteConsumerIntegrationTest/App.config @@ -53,6 +53,18 @@ + + + + + + + + + + + + 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 3c072a1..1bc1738 100644 --- a/Master/TurbineLiteConsumerIntegrationTest/TurbineLiteConsumerIntegrationTest.csproj +++ b/Master/TurbineLiteConsumerIntegrationTest/TurbineLiteConsumerIntegrationTest.csproj @@ -44,6 +44,9 @@ ..\..\TurbineLite\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll + + ..\..\TurbineLite\packages\CommonServiceLocator.2.0.7\lib\net48\CommonServiceLocator.dll + ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -101,6 +104,12 @@ ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\..\TurbineLite\packages\Unity.5.11.2\lib\net47\Unity.Abstractions.dll + + + ..\..\TurbineLite\packages\Unity.5.11.2\lib\net47\Unity.Container.dll + ..\packages\WCFMock.dll diff --git a/Master/TurbineLiteConsumerIntegrationTest/packages.config b/Master/TurbineLiteConsumerIntegrationTest/packages.config index e431858..5fbef64 100644 --- a/Master/TurbineLiteConsumerIntegrationTest/packages.config +++ b/Master/TurbineLiteConsumerIntegrationTest/packages.config @@ -1,6 +1,7 @@  + @@ -8,4 +9,5 @@ + \ No newline at end of file From e6895d90a9636240a89cfa1ca2d408da3e3ecffa Mon Sep 17 00:00:00 2001 From: kbuma Date: Mon, 27 Nov 2023 19:29:29 -0500 Subject: [PATCH 09/23] updated remainder of packages in nuget --- Master/AspenSinterConsumerConsole/App.Config | 82 ++++++++++------- .../App.Config | 16 ++++ .../AspenSinterConsumerWindowsService.csproj | 8 +- .../packages.config | 4 +- Master/DatabaseUnitTest/App.config | 20 ++++ Master/ExcelSinterConsumerConsole/App.Config | 74 +++++++++------ .../ExcelSinterConsumerConsole.csproj | 8 +- .../packages.config | 4 +- .../App.Config | 68 ++++++++------ Master/GPromsSinterConsumerConsole/App.config | 82 ++++++++++------- .../GPromsSinterConsumerConsole.csproj | 8 +- .../packages.config | 4 +- .../GPromsSinterConsumerWindowsService.csproj | 8 +- .../app.config | 16 ++++ .../packages.config | 4 +- Master/SelfHostIntegrationTest/App.config | 16 ++++ Master/SelfHostWebApplication/App.Config | 20 ++++ .../App.config | 20 ++++ Master/SinterIntegrationTest/App.config | 92 +++++++++++++------ .../Turbine.Consumer.AspenTech.csproj | 20 +++- Master/Turbine.Consumer.AspenTech/app.config | 32 +++++++ .../packages.config | 2 +- .../Turbine.Consumer.Console.csproj | 9 +- Master/Turbine.Consumer.Console/app.config | 23 +++++ .../Turbine.Consumer.Console/packages.config | 4 +- .../Turbine.Consumer.Excel.csproj | 20 +++- Master/Turbine.Consumer.Excel/app.config | 32 +++++++ Master/Turbine.Consumer.Excel/packages.config | 2 +- Master/Turbine.Consumer.GProms/App.config | 22 ++++- .../Turbine.Consumer.GProms.csproj | 20 +++- .../Turbine.Consumer.GProms/packages.config | 2 +- .../Turbine.Consumer.SimSinter.csproj | 9 +- Master/Turbine.Consumer.SimSinter/app.config | 23 +++++ .../packages.config | 4 +- .../Turbine.Consumer/Turbine.Consumer.csproj | 9 +- Master/Turbine.Consumer/app.config | 23 +++++ Master/Turbine.Consumer/packages.config | 4 +- Master/Turbine.Data.Entities/App.config | 12 ++- .../Turbine.Data.Entities.csproj | 19 +++- Master/Turbine.Data.Entities/packages.config | 2 +- Master/Turbine.DataEF6.Contract/App.config | 12 ++- .../Turbine.DataEF6.Contract.csproj | 16 +++- .../Turbine.DataEF6.Contract/packages.config | 2 +- .../App.config | 37 ++++++-- ...Turbine.Lite.Consumer.Data.Contract.csproj | 19 +++- .../packages.config | 2 +- Master/Turbine.Lite.Web.Resources/App.config | 20 ++++ .../Turbine.Producer/Turbine.Producer.csproj | 9 +- Master/Turbine.Producer/app.config | 23 +++++ Master/Turbine.Producer/packages.config | 4 +- Master/Turbine.Web/Turbine.Web.csproj | 9 +- Master/Turbine.Web/app.config | 23 +++++ Master/Turbine.Web/packages.config | 4 +- .../TurbineLiteWebApplication.csproj | 14 +-- .../TurbineLiteWebApplication/Web.config | 12 ++- .../TurbineLiteWebApplication/packages.config | 4 +- .../App.config | 8 +- .../TurbineLiteConsumerIntegrationTest.csproj | 12 +-- .../packages.config | 4 +- .../App.config | 16 ++++ .../TurbineLiteProducerIntegrationTest.csproj | 4 +- .../packages.config | 2 +- 62 files changed, 834 insertions(+), 269 deletions(-) create mode 100644 Master/Turbine.Consumer.AspenTech/app.config create mode 100644 Master/Turbine.Consumer.Console/app.config create mode 100644 Master/Turbine.Consumer.Excel/app.config create mode 100644 Master/Turbine.Consumer.SimSinter/app.config create mode 100644 Master/Turbine.Consumer/app.config create mode 100644 Master/Turbine.Producer/app.config create mode 100644 Master/Turbine.Web/app.config diff --git a/Master/AspenSinterConsumerConsole/App.Config b/Master/AspenSinterConsumerConsole/App.Config index 0e2a8ad..8158297 100644 --- a/Master/AspenSinterConsumerConsole/App.Config +++ b/Master/AspenSinterConsumerConsole/App.Config @@ -1,65 +1,81 @@ - + -
+
-
+
- - + + - - + + + + + + + + + + + + + + + + + + - + - - - - + + + + - - - + + + - + - - + + - - + + - + - - + + - + - - - - - - + + + + + + @@ -67,9 +83,9 @@ - + - + @@ -81,4 +97,4 @@ - + diff --git a/Master/AspenSinterConsumerWindowsService/App.Config b/Master/AspenSinterConsumerWindowsService/App.Config index 068de6b..174338d 100644 --- a/Master/AspenSinterConsumerWindowsService/App.Config +++ b/Master/AspenSinterConsumerWindowsService/App.Config @@ -16,6 +16,22 @@ + + + + + + + + + + + + + + + + diff --git a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj index 175f8c5..043fd48 100644 --- a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj +++ b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj @@ -64,12 +64,12 @@ - - ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.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.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Master/AspenSinterConsumerWindowsService/packages.config b/Master/AspenSinterConsumerWindowsService/packages.config index ea61402..3b17c9a 100644 --- a/Master/AspenSinterConsumerWindowsService/packages.config +++ b/Master/AspenSinterConsumerWindowsService/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/Master/DatabaseUnitTest/App.config b/Master/DatabaseUnitTest/App.config index 5b21cbd..c019d2b 100644 --- a/Master/DatabaseUnitTest/App.config +++ b/Master/DatabaseUnitTest/App.config @@ -27,4 +27,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Master/ExcelSinterConsumerConsole/App.Config b/Master/ExcelSinterConsumerConsole/App.Config index 26d5200..34b7af5 100644 --- a/Master/ExcelSinterConsumerConsole/App.Config +++ b/Master/ExcelSinterConsumerConsole/App.Config @@ -1,54 +1,70 @@ - + -
+
-
+
- - + + - - + + + + + + + + + + + + + + + + + + - + - - - - + + + + - - - + + + - - - + + + - - + + - - - - - - + + + + + + @@ -56,9 +72,9 @@ - + - + @@ -71,4 +87,4 @@ - + diff --git a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj index 031e7ab..281d067 100644 --- a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj +++ b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj @@ -68,12 +68,12 @@ - - ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.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.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Master/ExcelSinterConsumerConsole/packages.config b/Master/ExcelSinterConsumerConsole/packages.config index 53cad77..97ca540 100644 --- a/Master/ExcelSinterConsumerConsole/packages.config +++ b/Master/ExcelSinterConsumerConsole/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/Master/ExcelSinterConsumerWindowsService/App.Config b/Master/ExcelSinterConsumerWindowsService/App.Config index 9ae0edd..7904d65 100644 --- a/Master/ExcelSinterConsumerWindowsService/App.Config +++ b/Master/ExcelSinterConsumerWindowsService/App.Config @@ -1,52 +1,68 @@ - + -
+
-
+
- - + + - - + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - - + + + - - + + - + - - - - - + + + + + @@ -54,8 +70,8 @@ - - + + @@ -69,4 +85,4 @@ - + diff --git a/Master/GPromsSinterConsumerConsole/App.config b/Master/GPromsSinterConsumerConsole/App.config index 3162edc..642bf28 100644 --- a/Master/GPromsSinterConsumerConsole/App.config +++ b/Master/GPromsSinterConsumerConsole/App.config @@ -1,65 +1,81 @@ - + -
+
-
+
- - + + - - + + + + + + + + + + + + + + + + + + - + - - - - + + + + - - - + + + - + - - + + - - + + - + - - + + - + - - - - - - + + + + + + @@ -67,9 +83,9 @@ - + - + @@ -81,4 +97,4 @@ - + diff --git a/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj b/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj index ea2c544..c535edb 100644 --- a/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj +++ b/Master/GPromsSinterConsumerConsole/GPromsSinterConsumerConsole.csproj @@ -49,12 +49,12 @@ - - ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.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.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Master/GPromsSinterConsumerConsole/packages.config b/Master/GPromsSinterConsumerConsole/packages.config index 6c78d7c..ec8625a 100644 --- a/Master/GPromsSinterConsumerConsole/packages.config +++ b/Master/GPromsSinterConsumerConsole/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj b/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj index 2c4ef55..02b8383 100644 --- a/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj +++ b/Master/GPromsSinterConsumerWindowsService/GPromsSinterConsumerWindowsService.csproj @@ -64,12 +64,12 @@ - - ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.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.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Master/GPromsSinterConsumerWindowsService/app.config b/Master/GPromsSinterConsumerWindowsService/app.config index 2705ca6..0caa466 100644 --- a/Master/GPromsSinterConsumerWindowsService/app.config +++ b/Master/GPromsSinterConsumerWindowsService/app.config @@ -16,6 +16,22 @@ + + + + + + + + + + + + + + + + diff --git a/Master/GPromsSinterConsumerWindowsService/packages.config b/Master/GPromsSinterConsumerWindowsService/packages.config index ea61402..3b17c9a 100644 --- a/Master/GPromsSinterConsumerWindowsService/packages.config +++ b/Master/GPromsSinterConsumerWindowsService/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/Master/SelfHostIntegrationTest/App.config b/Master/SelfHostIntegrationTest/App.config index d2de022..abebee2 100644 --- a/Master/SelfHostIntegrationTest/App.config +++ b/Master/SelfHostIntegrationTest/App.config @@ -33,6 +33,22 @@ + + + + + + + + + + + + + + + + diff --git a/Master/SelfHostWebApplication/App.Config b/Master/SelfHostWebApplication/App.Config index 0afa05d..667b93e 100644 --- a/Master/SelfHostWebApplication/App.Config +++ b/Master/SelfHostWebApplication/App.Config @@ -121,4 +121,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Master/SelfManagedWebApplicationWindowsService/App.config b/Master/SelfManagedWebApplicationWindowsService/App.config index 4dbc1a3..5b5311a 100644 --- a/Master/SelfManagedWebApplicationWindowsService/App.config +++ b/Master/SelfManagedWebApplicationWindowsService/App.config @@ -124,4 +124,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Master/SinterIntegrationTest/App.config b/Master/SinterIntegrationTest/App.config index 9f3a467..d587d3d 100644 --- a/Master/SinterIntegrationTest/App.config +++ b/Master/SinterIntegrationTest/App.config @@ -1,47 +1,47 @@ - + -
+
-
+
- - + + - + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - - - - - - + + + + + + + @@ -51,9 +51,41 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -74,4 +106,4 @@ - + diff --git a/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj b/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj index 8367118..c506b8e 100644 --- a/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj +++ b/Master/Turbine.Consumer.AspenTech/Turbine.Consumer.AspenTech.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -13,6 +14,8 @@ v4.8 512 + + true @@ -34,11 +37,11 @@ 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\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -93,9 +96,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.AspenTech/packages.config b/Master/Turbine.Consumer.AspenTech/packages.config index 0a97c12..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.Console/Turbine.Consumer.Console.csproj b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj index ed5bf44..f84c528 100644 --- a/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj +++ b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj @@ -45,12 +45,12 @@ - - ..\..\TurbineLite\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.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.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\TurbineLite\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -98,6 +98,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 53cad77..97ca540 100644 --- a/Master/Turbine.Consumer.Console/packages.config +++ b/Master/Turbine.Consumer.Console/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj b/Master/Turbine.Consumer.Excel/Turbine.Consumer.Excel.csproj index 164811e..8aa0aef 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 @@ -13,6 +14,8 @@ v4.8 512 + + true @@ -34,11 +37,11 @@ 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\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -83,9 +86,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 0a97c12..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 d6325c4..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 @@ -13,6 +14,8 @@ v4.8 512 + + true @@ -34,11 +37,11 @@ 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\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -60,6 +63,7 @@ + @@ -85,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 0602810..ee0b638 100644 --- a/Master/Turbine.Data.Entities/Turbine.Data.Entities.csproj +++ b/Master/Turbine.Data.Entities/Turbine.Data.Entities.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,6 +13,8 @@ v4.8 512 + + true @@ -34,10 +37,10 @@ - ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll + ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll + ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll @@ -68,10 +71,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 75ad84a..5c61591 100644 --- a/Master/Turbine.DataEF6.Contract/Turbine.DataEF6.Contract.csproj +++ b/Master/Turbine.DataEF6.Contract/Turbine.DataEF6.Contract.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,6 +13,8 @@ v4.8 512 + + true @@ -34,10 +37,10 @@ - ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll + ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\..\TurbineLite\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll + ..\..\TurbineLite\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll ..\..\TurbineLite\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -71,9 +74,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.Lite.Consumer.Data.Contract/Turbine.Lite.Consumer.Data.Contract.csproj b/Master/Turbine.Lite.Consumer.Data.Contract/Turbine.Lite.Consumer.Data.Contract.csproj index 6cb0685..e8f6226 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 @@ -12,6 +13,8 @@ v4.8 512 + + true @@ -33,11 +36,11 @@ 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 @@ -88,6 +91,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}. + + + + + - @@ -414,24 +279,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - @@ -456,31 +337,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -614,9 +471,6 @@ - - - @@ -624,14 +478,14 @@ - + - + - + - + @@ -303,11 +303,14 @@ + + + - + - + @@ -558,7 +561,7 @@ - + @@ -574,7 +577,7 @@ - + @@ -638,7 +641,8 @@ - + + @@ -750,8 +754,9 @@ - - + + + diff --git a/Master/TurbineSetupLibrary/Library.wxs b/Master/TurbineSetupLibrary/Library.wxs index 8920cee..72c1851 100644 --- a/Master/TurbineSetupLibrary/Library.wxs +++ b/Master/TurbineSetupLibrary/Library.wxs @@ -596,31 +596,34 @@ - + - + - + - + - + - + - - + + + + + - + From 695c9a80dbffe3479b27eacec4603ba9b274cf59 Mon Sep 17 00:00:00 2001 From: kbuma Date: Wed, 6 Dec 2023 20:35:23 -0500 Subject: [PATCH 14/23] Modify installer project to not depend on legacy TurbineSetupLibrary project --- Master/TurbineLiteWiXInstaller/Product.wxs | 1335 +++++++++-------- .../TurbineLiteWiXInstaller.wixproj | 15 +- TurbineLite/TurbineLite.sln | 15 - 3 files changed, 696 insertions(+), 669 deletions(-) diff --git a/Master/TurbineLiteWiXInstaller/Product.wxs b/Master/TurbineLiteWiXInstaller/Product.wxs index 4fba96d..0850a18 100644 --- a/Master/TurbineLiteWiXInstaller/Product.wxs +++ b/Master/TurbineLiteWiXInstaller/Product.wxs @@ -12,7 +12,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + + + - + + + - - + - - + @@ -608,120 +667,146 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + --> + \ No newline at end of file diff --git a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj index 7776f82..a3ad940 100644 --- a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj +++ b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj @@ -11,6 +11,10 @@ + + + + SelfHostWebApplication {3e1b9548-a8bc-43d4-9ecb-37d4de916f43} @@ -27,6 +31,9 @@ Binaries;Content;Satellites INSTALLFOLDER + + + Turbine.DataEF6 {7c0fa46a-937d-44e0-ad71-d96f383fa4ca} @@ -35,14 +42,6 @@ Binaries;Content;Satellites INSTALLFOLDER - - TurbineSetupLibrary - {1b88c188-9959-4c0c-943e-a16de4278b3d} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - diff --git a/TurbineLite/TurbineLite.sln b/TurbineLite/TurbineLite.sln index 22e1d04..8f80378 100644 --- a/TurbineLite/TurbineLite.sln +++ b/TurbineLite/TurbineLite.sln @@ -28,9 +28,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SelfHostIntegrationTest", "..\Master\SelfHostIntegrationTest\SelfHostIntegrationTest.csproj", "{FF6504D8-FEDB-4807-AC29-F456B157BC5A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{08F91DA6-42D8-48C9-B082-850652F9641E}" - ProjectSection(SolutionItems) = preProject - ..\Master\Turbine.Producer\Turbine.Producer.csproj = ..\Master\Turbine.Producer\Turbine.Producer.csproj - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Turbine.Producer", "..\Master\Turbine.Producer\Turbine.Producer.csproj", "{BCB53D56-20A1-49F9-A9C0-49229529C77C}" EndProject @@ -48,8 +45,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Turbine.DataEF6.Contract", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Turbine.Lite.Consumer.Data.Contract", "..\Master\Turbine.Lite.Consumer.Data.Contract\Turbine.Lite.Consumer.Data.Contract.csproj", "{7A1F5303-BC4B-4BF6-97AD-E3A524CC1971}" EndProject -Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "TurbineSetupLibrary", "..\Master\TurbineSetupLibrary\TurbineSetupLibrary.wixproj", "{1B88C188-9959-4C0C-943E-A16DE4278B3D}" -EndProject Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "TurbineLiteWiXInstaller", "..\Master\TurbineLiteWiXInstaller\TurbineLiteWiXInstaller.wixproj", "{A5CBDA7E-0AB4-4C24-BD4C-FF8D6B24E5C7}" ProjectSection(ProjectDependencies) = postProject {7A1F5303-BC4B-4BF6-97AD-E3A524CC1971} = {7A1F5303-BC4B-4BF6-97AD-E3A524CC1971} @@ -287,16 +282,6 @@ Global {7A1F5303-BC4B-4BF6-97AD-E3A524CC1971}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {7A1F5303-BC4B-4BF6-97AD-E3A524CC1971}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7A1F5303-BC4B-4BF6-97AD-E3A524CC1971}.Release|x86.ActiveCfg = Release|Any CPU - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Debug|Any CPU.ActiveCfg = Debug|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Debug|x86.ActiveCfg = Debug|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Debug|x86.Build.0 = Debug|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Release|Any CPU.ActiveCfg = Release|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Release|Mixed Platforms.Build.0 = Release|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Release|x86.ActiveCfg = Release|x86 - {1B88C188-9959-4C0C-943E-A16DE4278B3D}.Release|x86.Build.0 = Release|x86 {A5CBDA7E-0AB4-4C24-BD4C-FF8D6B24E5C7}.Debug|Any CPU.ActiveCfg = Debug|x86 {A5CBDA7E-0AB4-4C24-BD4C-FF8D6B24E5C7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {A5CBDA7E-0AB4-4C24-BD4C-FF8D6B24E5C7}.Debug|Mixed Platforms.Build.0 = Debug|x86 From e990706c8d9d34671651dcf92e7e24d0ebd03bc2 Mon Sep 17 00:00:00 2001 From: kbuma Date: Wed, 6 Dec 2023 21:56:42 -0500 Subject: [PATCH 15/23] cleaned up app configuration for resolving dependencies. --- Master/AspenSinterConsumerConsole/App.Config | 4 -- .../AspenSinterConsumerConsole.csproj | 11 +---- .../packages.config | 4 -- .../App.Config | 4 -- .../AspenSinterConsumerWindowsService.csproj | 9 ----- .../packages.config | 4 -- Master/ExcelSinterConsumerConsole/App.Config | 4 -- .../ExcelSinterConsumerConsole.csproj | 6 --- .../packages.config | 3 -- .../App.Config | 4 -- .../Turbine.Consumer.Console.csproj | 6 --- .../Turbine.Consumer.Console/packages.config | 3 -- .../Turbine.Consumer.SimSinter.csproj | 9 ----- .../packages.config | 4 -- .../Turbine.Consumer/Turbine.Consumer.csproj | 3 -- Master/Turbine.Consumer/packages.config | 2 - .../Turbine.Producer/Turbine.Producer.csproj | 3 -- Master/Turbine.Producer/packages.config | 2 - Master/Turbine.Web/Turbine.Web.csproj | 9 ----- Master/Turbine.Web/packages.config | 4 -- .../AspenSinterConsumerConsole.exe.config | 38 ++++++++++++------ ...penSinterConsumerWindowsService.exe.config | 40 ++++++++++++------- .../ExcelSinterConsumerConsole.exe.config | 40 ++++++++++++------- ...celSinterConsumerWindowsService.exe.config | 40 ++++++++++++------- Master/TurbineLiteWiXInstaller/Product.wxs | 15 ++----- 25 files changed, 107 insertions(+), 164 deletions(-) diff --git a/Master/AspenSinterConsumerConsole/App.Config b/Master/AspenSinterConsumerConsole/App.Config index faae737..8269084 100644 --- a/Master/AspenSinterConsumerConsole/App.Config +++ b/Master/AspenSinterConsumerConsole/App.Config @@ -9,10 +9,6 @@ - - - - diff --git a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj index 528208c..8994c62 100644 --- a/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj +++ b/Master/AspenSinterConsumerConsole/AspenSinterConsumerConsole.csproj @@ -65,15 +65,6 @@ ..\..\TurbineLite\packages\Unity.Abstractions.5.11.7\lib\net48\Unity.Abstractions.dll - - ..\..\TurbineLite\packages\Unity.Configuration.5.11.2\lib\net47\Unity.Configuration.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 - @@ -85,7 +76,7 @@ - + Designer diff --git a/Master/AspenSinterConsumerConsole/packages.config b/Master/AspenSinterConsumerConsole/packages.config index c90ca8a..17fb1f9 100644 --- a/Master/AspenSinterConsumerConsole/packages.config +++ b/Master/AspenSinterConsumerConsole/packages.config @@ -4,9 +4,5 @@ - - - - \ No newline at end of file diff --git a/Master/AspenSinterConsumerWindowsService/App.Config b/Master/AspenSinterConsumerWindowsService/App.Config index 910b67b..2a660e7 100644 --- a/Master/AspenSinterConsumerWindowsService/App.Config +++ b/Master/AspenSinterConsumerWindowsService/App.Config @@ -8,10 +8,6 @@ - - - - diff --git a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj index 043fd48..3c1880e 100644 --- a/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj +++ b/Master/AspenSinterConsumerWindowsService/AspenSinterConsumerWindowsService.csproj @@ -77,15 +77,6 @@ - - ..\..\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/AspenSinterConsumerWindowsService/packages.config b/Master/AspenSinterConsumerWindowsService/packages.config index 3b17c9a..ef4e4b8 100644 --- a/Master/AspenSinterConsumerWindowsService/packages.config +++ b/Master/AspenSinterConsumerWindowsService/packages.config @@ -4,8 +4,4 @@ - - - - \ No newline at end of file diff --git a/Master/ExcelSinterConsumerConsole/App.Config b/Master/ExcelSinterConsumerConsole/App.Config index 34b7af5..6fbe792 100644 --- a/Master/ExcelSinterConsumerConsole/App.Config +++ b/Master/ExcelSinterConsumerConsole/App.Config @@ -9,10 +9,6 @@ - - - - diff --git a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj index 84cf08e..376af16 100644 --- a/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj +++ b/Master/ExcelSinterConsumerConsole/ExcelSinterConsumerConsole.csproj @@ -83,12 +83,6 @@ ..\..\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/ExcelSinterConsumerConsole/packages.config b/Master/ExcelSinterConsumerConsole/packages.config index 97ca540..2d7402d 100644 --- a/Master/ExcelSinterConsumerConsole/packages.config +++ b/Master/ExcelSinterConsumerConsole/packages.config @@ -4,8 +4,5 @@ - - - \ No newline at end of file diff --git a/Master/ExcelSinterConsumerWindowsService/App.Config b/Master/ExcelSinterConsumerWindowsService/App.Config index 7904d65..863ce7c 100644 --- a/Master/ExcelSinterConsumerWindowsService/App.Config +++ b/Master/ExcelSinterConsumerWindowsService/App.Config @@ -9,10 +9,6 @@ - - - - diff --git a/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj index f84c528..31500ea 100644 --- a/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj +++ b/Master/Turbine.Consumer.Console/Turbine.Consumer.Console.csproj @@ -60,12 +60,6 @@ ..\..\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/Turbine.Consumer.Console/packages.config b/Master/Turbine.Consumer.Console/packages.config index 97ca540..2d7402d 100644 --- a/Master/Turbine.Consumer.Console/packages.config +++ b/Master/Turbine.Consumer.Console/packages.config @@ -4,8 +4,5 @@ - - - \ No newline at end of file diff --git a/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj b/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj index 354b960..2c0bf3b 100644 --- a/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj +++ b/Master/Turbine.Consumer.SimSinter/Turbine.Consumer.SimSinter.csproj @@ -60,15 +60,6 @@ - - ..\..\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/Turbine.Consumer.SimSinter/packages.config b/Master/Turbine.Consumer.SimSinter/packages.config index 97ca540..16ace11 100644 --- a/Master/Turbine.Consumer.SimSinter/packages.config +++ b/Master/Turbine.Consumer.SimSinter/packages.config @@ -4,8 +4,4 @@ - - - - \ No newline at end of file diff --git a/Master/Turbine.Consumer/Turbine.Consumer.csproj b/Master/Turbine.Consumer/Turbine.Consumer.csproj index 1f5bb76..7572fc4 100644 --- a/Master/Turbine.Consumer/Turbine.Consumer.csproj +++ b/Master/Turbine.Consumer/Turbine.Consumer.csproj @@ -61,9 +61,6 @@ ..\..\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/Turbine.Consumer/packages.config b/Master/Turbine.Consumer/packages.config index 5a7ab1c..a213e05 100644 --- a/Master/Turbine.Consumer/packages.config +++ b/Master/Turbine.Consumer/packages.config @@ -3,9 +3,7 @@ - - \ No newline at end of file diff --git a/Master/Turbine.Producer/Turbine.Producer.csproj b/Master/Turbine.Producer/Turbine.Producer.csproj index a43c9f1..a87f55f 100644 --- a/Master/Turbine.Producer/Turbine.Producer.csproj +++ b/Master/Turbine.Producer/Turbine.Producer.csproj @@ -61,9 +61,6 @@ ..\..\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/Turbine.Producer/packages.config b/Master/Turbine.Producer/packages.config index 5a7ab1c..a213e05 100644 --- a/Master/Turbine.Producer/packages.config +++ b/Master/Turbine.Producer/packages.config @@ -3,9 +3,7 @@ - - \ No newline at end of file diff --git a/Master/Turbine.Web/Turbine.Web.csproj b/Master/Turbine.Web/Turbine.Web.csproj index 3480579..de76047 100644 --- a/Master/Turbine.Web/Turbine.Web.csproj +++ b/Master/Turbine.Web/Turbine.Web.csproj @@ -59,15 +59,6 @@ - - ..\..\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/Turbine.Web/packages.config b/Master/Turbine.Web/packages.config index 97ca540..16ace11 100644 --- a/Master/Turbine.Web/packages.config +++ b/Master/Turbine.Web/packages.config @@ -4,8 +4,4 @@ - - - - \ No newline at end of file diff --git a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config index d21b587..f894398 100644 --- a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config +++ b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config @@ -4,21 +4,33 @@
-
+
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config index 6245b25..57f8bf0 100644 --- a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config +++ b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config @@ -1,25 +1,37 @@ 
-
+
- - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config index bb3a14a..81f16cc 100644 --- a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config +++ b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config @@ -4,22 +4,34 @@
-
+
- - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config index 366a694..9d21805 100644 --- a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config +++ b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config @@ -1,25 +1,37 @@ 
-
+
- - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Master/TurbineLiteWiXInstaller/Product.wxs b/Master/TurbineLiteWiXInstaller/Product.wxs index 0850a18..56121ba 100644 --- a/Master/TurbineLiteWiXInstaller/Product.wxs +++ b/Master/TurbineLiteWiXInstaller/Product.wxs @@ -111,9 +111,9 @@ - + @@ -175,8 +175,6 @@ - - @@ -190,8 +188,6 @@ - - @@ -344,8 +340,6 @@ - - @@ -361,9 +355,6 @@ - - - From fdd22ed2b0a503ed8aade06f21b4a87c13b4d817 Mon Sep 17 00:00:00 2001 From: kbuma Date: Wed, 6 Dec 2023 22:56:46 -0500 Subject: [PATCH 16/23] adding dependencies to installer for injected code --- Master/Turbine.Consumer/AppUtility.cs | 1 - Master/Turbine.Producer/Container.cs | 1 - .../AspenSinterConsumerConsole.exe.config | 8 ++++++-- .../AspenSinterConsumerWindowsService.exe.config | 2 +- .../ExcelSinterConsumerConsole.exe.config | 2 +- .../ExcelSinterConsumerWindowsService.exe.config | 2 +- Master/TurbineLiteWiXInstaller/Product.wxs | 13 ++++++++++--- .../TurbineLiteWiXInstaller.wixproj | 1 + 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Master/Turbine.Consumer/AppUtility.cs b/Master/Turbine.Consumer/AppUtility.cs index 44bad02..b8b1ba2 100644 --- a/Master/Turbine.Consumer/AppUtility.cs +++ b/Master/Turbine.Consumer/AppUtility.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Text; using Unity; -using Unity.Configuration; using Turbine.Data.Contract.Behaviors; using Turbine.Consumer.Data.Contract.Behaviors; using Turbine.Consumer.Contract.Behaviors; diff --git a/Master/Turbine.Producer/Container.cs b/Master/Turbine.Producer/Container.cs index 10237f0..ffd2438 100644 --- a/Master/Turbine.Producer/Container.cs +++ b/Master/Turbine.Producer/Container.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Text; using Unity; -using Unity.Configuration; using System.Diagnostics; using Turbine.Producer.Contracts; using Microsoft.Practices.Unity.Configuration; diff --git a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config index f894398..ed8ed93 100644 --- a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config +++ b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerConsole.exe.config @@ -4,11 +4,15 @@
-
+
+ + + + @@ -32,7 +36,7 @@ - + diff --git a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config index 57f8bf0..0d29814 100644 --- a/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config +++ b/Master/TurbineLiteWiXInstaller/AspenSinterConsumerWindowsService.exe.config @@ -1,7 +1,7 @@ 
-
+
diff --git a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config index 81f16cc..ab75cab 100644 --- a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config +++ b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerConsole.exe.config @@ -4,7 +4,7 @@
-
+
diff --git a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config index 9d21805..4a8f041 100644 --- a/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config +++ b/Master/TurbineLiteWiXInstaller/ExcelSinterConsumerWindowsService.exe.config @@ -1,7 +1,7 @@ 
-
+
diff --git a/Master/TurbineLiteWiXInstaller/Product.wxs b/Master/TurbineLiteWiXInstaller/Product.wxs index 56121ba..983b1e7 100644 --- a/Master/TurbineLiteWiXInstaller/Product.wxs +++ b/Master/TurbineLiteWiXInstaller/Product.wxs @@ -134,7 +134,10 @@ - + + + + @@ -154,6 +157,9 @@ + + + @@ -355,6 +361,7 @@ + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -184,11 +184,11 @@ - + - + @@ -198,10 +198,10 @@ - + - + @@ -211,12 +211,12 @@ + Source="..\..\Master\Turbine.Consumer.GProms\$(var.OutDir)\Turbine.Consumer.GProms.dll" KeyPath="yes"/> + Source="..\..\Master\GPromsSinterConsumerWindowsService\$(var.OutDir)\GPromsSinterConsumerWindowsService.exe" KeyPath="yes"/> + Source="..\..\Master\GPromsSinterConsumerConsole\$(var.OutDir)\GPromsSinterConsumerConsole.exe" KeyPath="yes"/> @@ -315,15 +315,15 @@ + Source="..\..\Master\GPromsSinterConsumerConsole\$(var.OutDir)\GPromsSinterConsumerConsole.pdb" KeyPath="yes"/> + Source="..\..\Master\Turbine.Consumer.GProms\$(var.OutDir)\Turbine.Consumer.GProms.pdb" KeyPath="yes"/> + Source="..\..\Master\GPromsSinterConsumerWindowsService\$(var.OutDir)\GPromsSinterConsumerWindowsService.pdb" KeyPath="yes"/> --> @@ -331,7 +331,7 @@ - + @@ -348,13 +348,13 @@ - - + + - + @@ -362,19 +362,20 @@ + - - + + - - + + - - + + @@ -385,7 +386,7 @@ @@ -395,24 +396,24 @@ - - + + - - + + - - + + - - + + - + @@ -420,8 +421,8 @@ - - + + @@ -430,99 +431,99 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + @@ -639,7 +640,7 @@ - + From f5ed7848308a15e64a91e46bacfffff1c2d89a82 Mon Sep 17 00:00:00 2001 From: kbuma Date: Thu, 7 Dec 2023 20:23:13 -0500 Subject: [PATCH 19/23] packaging up a few more dependencies and fixing SQL server ce version check --- Master/TurbineLiteWiXInstaller/Product.wxs | 47 ++++++++++++++++++++-- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/Master/TurbineLiteWiXInstaller/Product.wxs b/Master/TurbineLiteWiXInstaller/Product.wxs index ccc637b..81d1a74 100644 --- a/Master/TurbineLiteWiXInstaller/Product.wxs +++ b/Master/TurbineLiteWiXInstaller/Product.wxs @@ -84,6 +84,18 @@ + + + + + + + + + + + + @@ -137,6 +149,19 @@ + + + + + + + + + + + + + @@ -160,6 +185,12 @@ + + + + + + @@ -361,8 +392,6 @@ - -