3.34.9 framework

TradeControl · May 29, 2023 · 8394d5b · 8394d5b
1 parent 3fd6f84
commit 8394d5b
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 63 deletions.
diff --git a/src/installation/tcNodeConfig.zip b/src/installation/tcNodeConfig.zip
diff --git a/src/sqlnode.sln b/src/sqlnode.sln
@@ -1,16 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{856686E2-D325-48C2-ADBA-108E0730DCD9}"
-	ProjectSection(SolutionItems) = preProject
-		..\img\tc_config_add_users.jpg = ..\img\tc_config_add_users.jpg
-		..\img\tc_config_basic_setup.jpg = ..\img\tc_config_basic_setup.jpg
-		..\img\tc_config_business_details.jpg = ..\img\tc_config_business_details.jpg
-		..\img\tc_config_connection.jpg = ..\img\tc_config_connection.jpg
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{C96737FC-9A30-4203-837B-8F7ADE497CBC}"
 	ProjectSection(SolutionItems) = preProject
 		..\changelog.md = ..\changelog.md

diff --git a/src/tcNode/Properties/AssemblyInfo.cs b/src/tcNode/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ Trade Control by Trade Control Ltd is licensed under GNU General Public License
 
 [assembly: Guid("e0b55ebe-7f5e-4703-b983-a43bb9e3b8d7")]
 
-[assembly: AssemblyVersion("3.34.8.0")]
-[assembly: AssemblyFileVersion("3.34.8.0")]
+[assembly: AssemblyVersion("3.34.9.0")]
+[assembly: AssemblyFileVersion("3.34.9.0")]
diff --git a/src/tcNode/Properties/Resources.Designer.cs b/src/tcNode/Properties/Resources.Designer.cs
diff --git a/src/tcNode/Properties/Settings.Designer.cs b/src/tcNode/Properties/Settings.Designer.cs
diff --git a/src/tcNode/app.config b/src/tcNode/app.config
@@ -1,35 +1,32 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="TradeControl.Node.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-            <section name="TradeControl.Node.Config.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="TradeControl.Node.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="TradeControl.Node.Config.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
 
   <connectionStrings>
-    <add name="TradeControl.Node.Properties.Settings.tcNodeConnectionString"
-      connectionString="Data Source=IAM;Initial Catalog=tcNode;Integrated Security=True"
-      providerName="System.Data.SqlClient" />
+    <add name="TradeControl.Node.Properties.Settings.tcNodeConnectionString" connectionString="Data Source=IAM;Initial Catalog=tcNode;Integrated Security=True" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <userSettings>
     <TradeControl.Node.Properties.Settings>
       <setting name="SqlServerName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SqlUserName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DatabaseName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="AuthenticationMode" serializeAs="String">
         <value>0</value>
       </setting>
       <setting name="SqlScripts" serializeAs="Xml">
         <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
             <string>tc_upgrade_3_23_2</string>
             <string>tc_upgrade_3_24_1</string>
             <string>tc_upgrade_3_24_2</string>
@@ -73,25 +70,24 @@
     </TradeControl.Node.Properties.Settings>
     <TradeControl.Node.Config.Properties.Settings>
       <setting name="SqlServerName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SqlUserName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DatabaseName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="AuthenticationMode" serializeAs="String">
         <value>0</value>
       </setting>
       <setting name="SqlUpgrades" serializeAs="Xml">
         <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
           </ArrayOfString>
         </value>
       </setting>
     </TradeControl.Node.Config.Properties.Settings>
   </userSettings>
 
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/src/tcNode/scripts/tc_upgrade_3_34_9.sql b/src/tcNode/scripts/tc_upgrade_3_34_9.sql
@@ -0,0 +1,20 @@
+/**************************************************************************************
+Trade Control
+Upgrade script for sql node
+Release 3.34.9
+
+Date: 29 May 2023
+Author: IAM
+
+Trade Control by Trade Control Ltd is licensed under GNU General Public License v3.0. 
+
+You may obtain a copy of the License at
+
+	https://www.gnu.org/licenses/gpl-3.0.en.html
+
+
+***********************************************************************************/
+go
+--.NET Framework 4.8 sql node setup upgrade
+go
+
diff --git a/src/tcNode/tcNode.csproj b/src/tcNode/tcNode.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TradeControl.Node</RootNamespace>
     <AssemblyName>TradeControl.Node</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -143,6 +144,7 @@
     <Content Include="scripts\tc_upgrade_3_34_6.sql" />
     <Content Include="scripts\tc_upgrade_3_34_7.sql" />
     <Content Include="scripts\tc_upgrade_3_34_8.sql" />
+    <Content Include="scripts\tc_upgrade_3_34_9.sql" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />

diff --git a/src/tcNodeDb/tcNodeDb.sqlproj b/src/tcNodeDb/tcNodeDb.sqlproj
@@ -16,14 +16,15 @@
     <ModelCollation>1033,CI</ModelCollation>
     <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
     <DeployToDatabase>True</DeployToDatabase>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetLanguage>CS</TargetLanguage>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <SqlServerVerification>False</SqlServerVerification>
     <IncludeCompositeObjects>True</IncludeCompositeObjects>
     <TargetDatabaseSet>True</TargetDatabaseSet>
     <DefaultCollation>Latin1_General_CI_AS</DefaultCollation>
     <DefaultFilegroup>PRIMARY</DefaultFilegroup>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>

diff --git a/src/tcNodeInstaller/tcNodeInstaller.vdproj b/src/tcNodeInstaller/tcNodeInstaller.vdproj
@@ -15,20 +15,20 @@
     {
         "Entry"
         {
-        "MsmKey" = "8:_255116D2AFC176AAF74DE809CE5FEF8D"
+        "MsmKey" = "8:_44902A3DA5E3808171BB9E1C79ECDCBC"
         "OwnerKey" = "8:_DD76A4FF61444B16BCBCED7BF1C5D3C3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A708C4B6069F4D8DC4C1E1570C51379F"
-        "OwnerKey" = "8:_DD76A4FF61444B16BCBCED7BF1C5D3C3"
+        "MsmKey" = "8:_DD76A4FF61444B16BCBCED7BF1C5D3C3"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DD76A4FF61444B16BCBCED7BF1C5D3C3"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_E2353AEA534EF60851B4C394BB07785B"
+        "OwnerKey" = "8:_DD76A4FF61444B16BCBCED7BF1C5D3C3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -40,13 +40,13 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A708C4B6069F4D8DC4C1E1570C51379F"
+        "OwnerKey" = "8:_44902A3DA5E3808171BB9E1C79ECDCBC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_255116D2AFC176AAF74DE809CE5FEF8D"
+        "OwnerKey" = "8:_E2353AEA534EF60851B4C394BB07785B"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -144,20 +144,20 @@
         }
         "File"
         {
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_255116D2AFC176AAF74DE809CE5FEF8D"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_44902A3DA5E3808171BB9E1C79ECDCBC"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+            "AssemblyAsmDisplayName" = "8:TradeControl.Node, Version=3.34.8.0, Culture=neutral, PublicKeyToken=cb281103e4e604b8, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_255116D2AFC176AAF74DE809CE5FEF8D"
+                    "_44902A3DA5E3808171BB9E1C79ECDCBC"
                     {
-                    "Name" = "8:System.Net.Http.dll"
+                    "Name" = "8:TradeControl.Node.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:System.Net.Http.dll"
+            "SourcePath" = "8:TradeControl.Node.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5CF1BA07340340B497A48A5C96106A02"
@@ -175,20 +175,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A708C4B6069F4D8DC4C1E1570C51379F"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E2353AEA534EF60851B4C394BB07785B"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:TradeControl.Node, Version=3.34.7.0, Culture=neutral, PublicKeyToken=cb281103e4e604b8, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
                 "ScatterAssemblies"
                 {
-                    "_A708C4B6069F4D8DC4C1E1570C51379F"
+                    "_E2353AEA534EF60851B4C394BB07785B"
                     {
-                    "Name" = "8:TradeControl.Node.dll"
+                    "Name" = "8:System.Net.Http.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:TradeControl.Node.dll"
+            "SourcePath" = "8:System.Net.Http.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5CF1BA07340340B497A48A5C96106A02"
@@ -273,15 +273,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Trade Control Node Configurator"
-        "ProductCode" = "8:{58B71D2E-C65A-4C63-9F6B-9885D4171779}"
-        "PackageCode" = "8:{655A60CD-F024-48A9-8D59-35167B66D8FC}"
+        "ProductCode" = "8:{00BC0304-7498-4731-8E9B-3F95C1118862}"
+        "PackageCode" = "8:{DD19ADC7-9BA0-4772-8F9A-FF9F68136C49}"
         "UpgradeCode" = "8:{87530140-719B-40FB-88AF-371486179C12}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.34.8"
+        "ProductVersion" = "8:3.34.9"
         "Manufacturer" = "8:Trade Control"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -809,7 +809,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DD76A4FF61444B16BCBCED7BF1C5D3C3"
             {
-            "SourcePath" = "8:..\\tcNodeSetup\\obj\\Release\\TradeControl.Node.Config.exe"
+            "SourcePath" = "8:..\\tcNodeSetup\\obj\\Debug\\TradeControl.Node.Config.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5CF1BA07340340B497A48A5C96106A02"

diff --git a/src/tcNodeSetup/App.config b/src/tcNodeSetup/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
-</configuration>
+</configuration>
diff --git a/src/tcNodeSetup/MainWindow.xaml.cs b/src/tcNodeSetup/MainWindow.xaml.cs
@@ -212,7 +212,7 @@ private void TestConnection()
                                         {
                                             cbTemplateName.ItemsSource = tcnode.TemplateNames;
                                             if (cbTemplateName.Items.Count > 0)
-                                                cbTemplateName.SelectedIndex = 0;
+                                                cbTemplateName.SelectedIndex = cbTemplateName.Items.Count - 1;
 
                                             if (tcnode.UnitOfCharge != "BTC")
                                             {

diff --git a/src/tcNodeSetup/Properties/AssemblyInfo.cs b/src/tcNodeSetup/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ Trade Control by Trade Control Ltd is licensed under GNU General Public License
     ResourceDictionaryLocation.SourceAssembly
 )]
 
-[assembly: AssemblyVersion("3.34.8.0")]
-[assembly: AssemblyFileVersion("3.34.8.0")]
+[assembly: AssemblyVersion("3.34.9.0")]
+[assembly: AssemblyFileVersion("3.34.9.0")]
diff --git a/src/tcNodeSetup/Properties/Resources.Designer.cs b/src/tcNodeSetup/Properties/Resources.Designer.cs
diff --git a/src/tcNodeSetup/TCNodeSetup.ico b/src/tcNodeSetup/TCNodeSetup.ico
diff --git a/src/tcNodeSetup/tcNodeSetup.csproj b/src/tcNodeSetup/tcNodeSetup.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>TradeControl.Node</RootNamespace>
     <AssemblyName>TradeControl.Node.Config</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>