1.2.3 framework

TradeControl · May 29, 2023 · 75ec0ca · 75ec0ca
1 parent dac3331
commit 75ec0ca
Show file tree

Hide file tree

Showing 19 changed files with 448 additions and 387 deletions.
diff --git a/readme.md b/readme.md
@@ -8,7 +8,7 @@ First published 19 May 2020
 
 ## Documentation
 
-- [overview](https://tradecontrol.github.io/network)
+- [overview](https://tradecontrol.github.io/tutorials/network_overview)
 - [installation](https://tradecontrol.github.io/tutorials/installing-network)
 - [tutorial](https://tradecontrol.github.io/tutorials/network)
 - [technical specification](docs/tc_network_spec.md)

diff --git a/src/installation/setup/setup.exe b/src/installation/setup/setup.exe
diff --git a/src/installation/setup/tcNetworkSetup.msi b/src/installation/setup/tcNetworkSetup.msi
diff --git a/src/installation/tcNetwork.zip b/src/installation/tcNetwork.zip
diff --git a/src/tcNetwork/Properties/AssemblyInfo.cs b/src/tcNetwork/Properties/AssemblyInfo.cs
@@ -27,5 +27,5 @@ Trade Control by Trade Control Ltd is licensed under GNU General Public License
 [assembly: ComVisible(false)]
 [assembly: Guid("0cc6cad7-45c6-47c1-bd81-5fe4309624b7")]
 
-[assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
diff --git a/src/tcNetwork/Properties/Resources.Designer.cs b/src/tcNetwork/Properties/Resources.Designer.cs
diff --git a/src/tcNetwork/Properties/Settings.Designer.cs b/src/tcNetwork/Properties/Settings.Designer.cs
diff --git a/src/tcNetwork/app.config b/src/tcNetwork/app.config
@@ -1,10 +1,21 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
     </configSections>
     <connectionStrings>
-        <add name="TradeControl.Network.Properties.Settings.tcNodeConnectionString"
-            connectionString="Data Source=IAM;Initial Catalog=tcNode;Integrated Security=True"
-            providerName="System.Data.SqlClient" />
+        <add name="TradeControl.Network.Properties.Settings.tcNodeConnectionString" connectionString="Data Source=IAM;Initial Catalog=tcNode;Integrated Security=True" providerName="System.Data.SqlClient" />
     </connectionStrings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/tcNetwork/packages.config b/src/tcNetwork/packages.config
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.2" targetFramework="net472" />
+  <package id="BouncyCastle" version="1.8.9" targetFramework="net48" />
   <package id="Common.Logging.Core" version="3.4.1" targetFramework="net472" />
-  <package id="Microsoft.CSharp" version="4.0.1" targetFramework="net472" />
-  <package id="Nethereum.ABI" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.Accounts" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.BlockchainProcessing" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.Contracts" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.Hex" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.JsonRpc.Client" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.JsonRpc.RpcClient" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.KeyStore" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.Model" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.RLP" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.RPC" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.Signer" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.Util" version="3.5.0" targetFramework="net472" />
-  <package id="Nethereum.Web3" version="3.5.0" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.1" targetFramework="net48" />
+  <package id="Nethereum.ABI" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Accounts" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.BlockchainProcessing" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Contracts" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Hex" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.JsonRpc.Client" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.JsonRpc.RpcClient" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.KeyStore" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Merkle.Patricia" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Model" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.RLP" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.RPC" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Signer" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Signer.EIP712" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Util" version="4.14.0" targetFramework="net48" />
+  <package id="Nethereum.Web3" version="4.14.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
 </packages>
diff --git a/src/tcNetwork/tcNetwork.csproj b/src/tcNetwork/tcNetwork.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TradeControl.Network</RootNamespace>
     <AssemblyName>TradeControl.Network</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <PublishUrl>publish\</PublishUrl>
@@ -27,6 +27,9 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,61 +49,82 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
+      <HintPath>..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.ABI, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.ABI.3.5.0\lib\net451\Nethereum.ABI.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.Accounts, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.Accounts.3.5.0\lib\net451\Nethereum.Accounts.dll</HintPath>
+    <Reference Include="Nethereum.ABI, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.ABI.4.14.0\lib\net461\Nethereum.ABI.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.BlockchainProcessing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.BlockchainProcessing.3.5.0\lib\net451\Nethereum.BlockchainProcessing.dll</HintPath>
+    <Reference Include="Nethereum.Accounts, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Accounts.4.14.0\lib\net461\Nethereum.Accounts.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.Contracts, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.Contracts.3.5.0\lib\net451\Nethereum.Contracts.dll</HintPath>
+    <Reference Include="Nethereum.BlockchainProcessing, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.BlockchainProcessing.4.14.0\lib\net461\Nethereum.BlockchainProcessing.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.Hex, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.Hex.3.5.0\lib\net451\Nethereum.Hex.dll</HintPath>
+    <Reference Include="Nethereum.Contracts, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Contracts.4.14.0\lib\net461\Nethereum.Contracts.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.JsonRpc.Client, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.JsonRpc.Client.3.5.0\lib\net451\Nethereum.JsonRpc.Client.dll</HintPath>
+    <Reference Include="Nethereum.Hex, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Hex.4.14.0\lib\net461\Nethereum.Hex.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.JsonRpc.RpcClient, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.JsonRpc.RpcClient.3.5.0\lib\net451\Nethereum.JsonRpc.RpcClient.dll</HintPath>
+    <Reference Include="Nethereum.JsonRpc.Client, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.JsonRpc.Client.4.14.0\lib\net461\Nethereum.JsonRpc.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.KeyStore, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.KeyStore.3.5.0\lib\net451\Nethereum.KeyStore.dll</HintPath>
+    <Reference Include="Nethereum.JsonRpc.RpcClient, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.JsonRpc.RpcClient.4.14.0\lib\net461\Nethereum.JsonRpc.RpcClient.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.Model, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.Model.3.5.0\lib\net451\Nethereum.Model.dll</HintPath>
+    <Reference Include="Nethereum.KeyStore, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.KeyStore.4.14.0\lib\net461\Nethereum.KeyStore.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.RLP, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.RLP.3.5.0\lib\net451\Nethereum.RLP.dll</HintPath>
+    <Reference Include="Nethereum.Merkle.Patricia, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Merkle.Patricia.4.14.0\lib\net461\Nethereum.Merkle.Patricia.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.RPC, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.RPC.3.5.0\lib\net451\Nethereum.RPC.dll</HintPath>
+    <Reference Include="Nethereum.Model, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Model.4.14.0\lib\net461\Nethereum.Model.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.Signer, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.Signer.3.5.0\lib\net451\Nethereum.Signer.dll</HintPath>
+    <Reference Include="Nethereum.RLP, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.RLP.4.14.0\lib\net461\Nethereum.RLP.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.Util, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.Util.3.5.0\lib\net451\Nethereum.Util.dll</HintPath>
+    <Reference Include="Nethereum.RPC, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.RPC.4.14.0\lib\net461\Nethereum.RPC.dll</HintPath>
     </Reference>
-    <Reference Include="Nethereum.Web3, Version=3.5.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nethereum.Web3.3.5.0\lib\net451\Nethereum.Web3.dll</HintPath>
+    <Reference Include="Nethereum.Signer, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Signer.4.14.0\lib\net461\Nethereum.Signer.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Nethereum.Signer.EIP712, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Signer.EIP712.4.14.0\lib\net461\Nethereum.Signer.EIP712.dll</HintPath>
+    </Reference>
+    <Reference Include="Nethereum.Util, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Util.4.14.0\lib\net461\Nethereum.Util.dll</HintPath>
+    </Reference>
+    <Reference Include="Nethereum.Web3, Version=4.14.0.0, Culture=neutral, PublicKeyToken=8768a594786aba4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nethereum.Web3.4.14.0\lib\net461\Nethereum.Web3.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -168,4 +192,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>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}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.1\build\Microsoft.Extensions.Logging.Abstractions.targets'))" />
+  </Target>
 </Project>