Serverseitiges Ändern wurde angefangen implementiert zu werden.

2021-12-16 11:52:00 +01:00
parent 0b7f25475c
commit 53843457f1
9 changed files with 213 additions and 163 deletions
--- a/App_Code/TestPerformance.vb
+++ b/App_Code/TestPerformance.vb
@@ -1,6 +1,7 @@
 Imports System.Data.SqlClient
 Imports System.Diagnostics
 Imports Microsoft.VisualBasic
+Imports Konscious.Security.Cryptography


 Public Class TestPerformance
@@ -130,7 +131,7 @@ Public Class TestPerformance
            sw1.Start()
            arrkeys.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(0, zahlint)))
            arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
-            arrzahl.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 10), Math.Pow(2, 14))))
+            arrzahl.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 6), Math.Pow(2, 10))))
            sw1.Stop()
            arrzeitp1.Add(sw1.ElapsedMilliseconds)
            sw1.Reset()
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -29,26 +29,29 @@ Public Class VERAG_VARIABLES
    End Function
    Public Shared Async Function HashPassword(password As String, salt As Byte(), nIterations As Integer, nHash As Integer) As Threading.Tasks.Task(Of Byte())
        'Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(password))
+
        If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
            Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
            Argon.Salt = salt
            Argon.DegreeOfParallelism = 24
            Argon.Iterations = nIterations
            Argon.MemorySize = (((nIterations * 1 - nIterations / 4 * 2) / 1.05) + 1 * 150)
-            Return Await Argon.GetBytesAsync(nHash)
+
            'Return Convert.ToBase64String(Argon.GetBytes(nHash))
            'Return Argon.GetBytes(nHash)
            'Dim saltBytes = Convert.FromBase64String(salt)
            'Using rfc2898DeriveBytes = New Rfc2898DeriveBytes(password, saltBytes, nIterations)
            'End Using
+            Return Await Argon.GetBytesAsync(nHash)
        Else
            Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
            Argon.Salt = salt
-            Argon.DegreeOfParallelism = 48
+            Argon.DegreeOfParallelism = 36
            Argon.Iterations = nIterations
-            Argon.MemorySize = ((((nIterations * 3 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2)
+            Argon.MemorySize = ((((nIterations * 4 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2)
            Return Await Argon.GetBytesAsync(nHash)
        End If
+
    End Function

    Public Shared Async Function Verifyhash(ByVal passw As String, ByVal salt As Byte(), ByVal hash As Byte(), ByVal nIterations As Integer, ByVal nHash As Integer) As Threading.Tasks.Task(Of Boolean)
--- a/App_Code/WebService.vb
+++ b/App_Code/WebService.vb
@@ -150,4 +150,21 @@ Public Class WebService

        myConn.Close() : Return lstCountries
    End Function
+    <WebMethod()>
+    Private Function buildtablerow(page As Page, tbl As Table) As Table
+
+        Dim row As TableRow = New TableRow
+        Dim c1 As TableCell = New TableCell
+        Dim c2 As TableCell = New TableCell
+        Dim c3 As TableCell = New TableCell
+
+        c1.Text = "ID"
+        c2.Text = "Stadt"
+        c3.Text = "Persona"
+        row.Cells.Add(c1)
+        row.Cells.Add(c2)
+        row.Cells.Add(c3)
+        tbl.Rows.Add(row)
+        Return tbl
+    End Function
 End Class
--- a/Customers/Default2.aspx
+++ b/Customers/Default2.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" %>
+<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" Async="true" %>

 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server"><%If String.Equals(Page.User.Identity.Name, "Admin") = False Then
                                                                                             FormsAuthentication.RedirectToLoginPage()
@@ -79,6 +79,7 @@
             </tr>
             <tr><td>          
    <tr><td><asp:Button ID="Button1" runat="server" Text="Button" OnClick="Button1_Click" /></td></tr>   
+             <tr><td><asp:Button ID="btn_TesthashrateServer" runat="server" Font-Overline="false" BorderStyle="Dashed" ClientIDMode="AutoID" OnClick="btn_TesthashrateServer_ClickAsync" Text="Test hashrate of Server!" /></td></tr>
             </table>
         </ContentTemplate>
     </asp:UpdatePanel>
--- a/Customers/Default2.aspx.vb
+++ b/Customers/Default2.aspx.vb
@@ -1,4 +1,4 @@
-
+Imports Konscious.Security.Cryptography
 Partial Class Customers_Default2
    Inherits System.Web.UI.Page
    Protected Sub Page_Load(ByVal sender As Object, e As EventArgs) Handles Me.Load
@@ -33,4 +33,9 @@ Partial Class Customers_Default2
            txt_Fehlercodezuzahl.Text = finalstr
        End If
    End Sub
+
+    Protected Async Sub btn_TesthashrateServer_ClickAsync(sender As Object, e As EventArgs) Handles btn_TesthashrateServer.Click
+        Dim zahl As Integer = VERAG_VARIABLES.RandomInteger(5, Math.Pow(2, 5))
+        Dim pwhashresult As Byte() = Await TestPerformance.TestHashrateServer(zahl)
+    End Sub
 End Class
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -47,7 +47,7 @@
 </asp:Content>

 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-     <asp:ScriptManager ID="script5" runat="server"></asp:ScriptManager>
+     <asp:ScriptManager ID="script5" runat="server" EnablePageMethods="true"></asp:ScriptManager>
     <asp:UpdatePanel ID="panelupdate5" runat="server"><ContentTemplate>
    <div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
            <div id="containerseiterand">     
@@ -138,78 +138,25 @@
                                    </div>
         </div>
                </div>         
-         <asp:Button ID="Button_hid" runat="server" OnClick="TableRowClick" Style="display: none" />
         </ContentTemplate></asp:UpdatePanel>       
     <!-- jQuery CDN - Slim version (=without AJAX) -->
        <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
     <!-- Popper.JS -->
    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>  
    <script type="text/javascript">        
-        function TableRowClick(listtemp, Kennzeichen, Nat) {            
+        function TableRow_Click(Nat,Kennzeichen) {
            let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
            let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")            
            
            Speditionslabel.textContent = Kennzeichen
            natplaceholder.textContent = Nat                       
-
-            var tb = document.getElementById("<%=tbl_mainpage.ClientID%>");
-            while (tb.rows.length > 1) {
-                tb.deleteRow(1);
        }
-            
-            //debugger            
-                //alert(Arr)
-            for (let outertabl of Array.from(listtemp.split("-"))) {
-                for (let arrint of Array.from(outertabl.split(";"))) {
-                    for (let innertable = 0; innertable < arrint.length; innertable++) {
-                        let SDLNr = arrint[innertable].toString;
-                        innertable++;
-                        let Bez = arrint[innertable].toString;
-                        innertable++;
-                        let Gueltigbis = arrint[innertable].toString;
-                        innertable++;
-                        let KartenNr = arrint[innertable].toString;
-                        //alert(SDLNr)
-                        //alert(Bez)
-                        //alert(Gueltigbis)
-                        //alert(KartenNr)               
-                        addRow(<%=tbl_mainpage.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
-                    }                    
-                }               
-            }
-        }
-        function TableRowClick_M(listtemp_M, Kennzeichen, Nat) {
+        function TableRow_Click_M(Nat,Kennzeichen) {
            let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder_M.ClientID%>")
            let natplaceholder = document.getElementById("<%=lbl_Placeholder_M.ClientID%>")            
            
            Speditionslabel.textContent = Kennzeichen
            natplaceholder.textContent = Nat           
-
-            var tb = document.getElementById("<%=tbl_mainpage_M.ClientID%>");
-            while (tb.rows.length > 1) {
-                tb.deleteRow(1);
-            }
-
-            
-            //debugger            
-                //alert(Arr)
-            for (let outertable_M of Array.from(listtemp_M.split("-"))) {
-                for (let arrint_M of Array.from(outertable_M.split(";")))
-                for (let innertable = 0; innertable < arrint_M.length; innertable++) {                    
-                    let SDLNr = arrint_M[innertable].toString;
-                    innertable++;
-                    let Bez = arrint_M[innertable].toString;
-                    innertable++;
-                    let Gueltigbis = arrint_M[innertable].toString;
-                    innertable++;
-                    let KartenNr = arrint_M[innertable].toString;
-                    //alert(SDLNr)
-                    //alert(Bez)
-                    //alert(Gueltigbis)
-                    //alert(KartenNr)                      
-                    addRow(<%=tbl_mainpage_M.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
-                }
-            }
        }
        function addRow(table1,par1,par2,par3,par4) {            
            let tableRef = table1;
--- a/Customers/LKWs.aspx.vb
+++ b/Customers/LKWs.aspx.vb
@@ -9,6 +9,20 @@ Partial Class LKWS
    Dim Kdnrtext As String = String.Empty
    Dim list As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing
    Dim list_M As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing
+    Dim tbl2mainpagetemp As Table
+    Dim TableRows As List(Of TableRow) = New List(Of TableRow)
+    Dim TableRows_M As List(Of TableRow) = New List(Of TableRow)
+    Protected Sub Page_OnInit(sender As Object, e As EventArgs)
+        If TableRows.Count = 0 Then
+            For Each tr In TableRows
+                tbl_mainpage_M.Rows.Add(tr)
+            Next
+        Else
+            For Each tr In TableRows
+                tbl_mainpage.Rows.Add(tr)
+            Next
+        End If
+    End Sub
    Protected Sub Page_Load(sender As Object, ByVal e As System.EventArgs) Handles Me.Load
        VERAG_VARIABLES.initerrorcount()

@@ -57,7 +71,6 @@ Partial Class LKWS
            Dim tc_KZ_Ab As TableCell = New TableCell()
            Dim tc_Vermerk As TableCell = New TableCell()
            Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l1.KfzKennzeichen)
-            Dim list3 As List(Of String) = New List(Of String)

            tc_KfzKennz.Text = l1.KfzKennzeichen
            tr1.Cells.Add(tc_KfzKennz)
@@ -100,6 +113,7 @@ Partial Class LKWS
            Dim strtemparr As String = String.Empty
            Dim strtemp2 As String = String.Empty
            Dim strarrtemp = String.Empty
+            tbl2mainpagetemp = New Table
            For Each l2 In list2
                Dim String2 As String = String.Empty

@@ -108,8 +122,21 @@ Partial Class LKWS
                Else
                    Stringtemp = String.Empty
                End If
-
-                list3.Add(l2.SDLNr.ToString + ";" + Stringtemp + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString)
+                Dim tr As TableRow = New TableRow
+                Dim tc_SDL As TableCell = New TableCell
+                Dim tc_Bez As TableCell = New TableCell
+                Dim tc_gueltigbis As TableCell = New TableCell
+                Dim tc_Karten_Nr As TableCell = New TableCell
+                tc_SDL.Text = l2.SDLNr.ToString
+                tc_Bez.Text = Stringtemp
+                tc_gueltigbis.Text = l2.GültigBis.ToString
+                tc_Karten_Nr.Text = l2.KartenNr.ToString
+                tr.Cells.Add(tc_SDL)
+                tr.Cells.Add(tc_Bez)
+                tr.Cells.Add(tc_gueltigbis)
+                tr.Cells.Add(tc_Karten_Nr)
+                TableRows.Add(tr)
+                'MsgBox(TableRows.Count.ToString)
            Next
            If String.IsNullOrEmpty(l1.Nationalität) = True Then
                strtemp2 = "Keine Angabe"
@@ -117,10 +144,7 @@ Partial Class LKWS
                strtemp2 = l1.Nationalität
            End If

-            For Each l4 In list3
-                strarrtemp = String.Join("-", l4.ToString)
-            Next
-            tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & strarrtemp & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)")
+            tr1.Attributes.Add("onclick", "Javascript:TableRow_Click(""" & strtemp2 & """,""" & l1.KfzKennzeichen & """)")
            cnt += 1
            tbl_sidemenue.Rows.Add(tr1)
        Next
@@ -201,8 +225,7 @@ Partial Class LKWS
        Next
    End Sub

-    Protected Sub TableRowClick(ByVal sender As TableRow, e As EventArgs)
-    End Sub
+

    Protected Sub btn_Suchen_M_Click(sender As Object, e As EventArgs)
        If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
@@ -261,9 +284,7 @@ Partial Class LKWS
            cnt += 1
        Next
    End Sub
-    Protected Sub Button_hid_Click(sender As Object, e As EventArgs)
-        'MsgBox("Test erfolgreich!")
-    End Sub
+
    Protected Sub btn_alle_M_Click(sender As Object, e As EventArgs)
        If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
@@ -348,9 +369,10 @@ Partial Class LKWS
            For Each Ltenp In list2
                str2temptemp = String.Join("-", Ltenp)
            Next
-            tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & str2temptemp & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)")
+            tr1_M.Attributes.Add("OnClick", "Javascript:TableRow_Click_M(""" & strtemp2 & """,""" & l3.KfzKennzeichen & """)")
            tbl_2.Rows.Add(tr1_M)
            cnt += 1
        Next
    End Sub
+
 End Class
--- a/Web.config
+++ b/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Weitere Informationen zum Konfigurieren der ASP.NET-Anwendung finden Sie unter
  http://go.microsoft.com/fwlink/?LinkId=169433
@@ -71,6 +71,10 @@
        <add assembly="System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
        <add assembly="WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
        <add assembly="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add assembly="System.Diagnostics.Tracing, Version=4.1.2.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
      </assemblies>
    </compilation>
    <membership defaultProvider="MySqlMembershipProvider">
@@ -170,6 +174,10 @@
        <assemblyIdentity name="Serilog.Sinks.Console" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <appSettings>
--- a/packages.config
+++ b/packages.config
@@ -10,8 +10,8 @@
  <package id="K4os.Compression.LZ4" version="1.2.16" targetFramework="net471" />
  <package id="K4os.Compression.LZ4.Streams" version="1.2.16" targetFramework="net471" />
  <package id="K4os.Hash.xxHash" version="1.0.7" targetFramework="net471" />
-  <package id="Konscious.Security.Cryptography.Argon2" version="1.2.1" targetFramework="net47" />
-  <package id="Konscious.Security.Cryptography.Blake2" version="1.0.9" targetFramework="net47" />
+  <package id="Konscious.Security.Cryptography.Argon2" version="1.2.0" targetFramework="net471" />
+  <package id="Konscious.Security.Cryptography.Blake2" version="1.0.8" targetFramework="net471" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net471" />
  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net471" developmentDependency="true" />
  <package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net471" />
@@ -22,25 +22,71 @@
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net471" />
  <package id="Microsoft.CST.DevSkim" version="0.6.5" targetFramework="net471" />
  <package id="Microsoft.CST.OAT" version="1.1.15" targetFramework="net471" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net471" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net471" />
  <package id="MySql.Data" version="8.0.27" targetFramework="net47" />
+  <package id="NETStandard.Library" version="1.6.1" targetFramework="net471" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net471" />
  <package id="Serilog" version="2.10.0" targetFramework="net47" />
  <package id="Serilog.Sinks.Console" version="4.0.1" targetFramework="net471" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net471" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net47" />
  <package id="System.Collections" version="4.3.0" targetFramework="net47" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net471" />
  <package id="System.Collections.Immutable" version="6.0.0" targetFramework="net471" />
  <package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net471" />
+  <package id="System.Console" version="4.3.0" targetFramework="net471" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net471" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net471" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net471" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net471" />
  <package id="System.Drawing.Common" version="6.0.0" targetFramework="net471" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net471" />
+  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net471" />
+  <package id="System.IO" version="4.3.0" targetFramework="net471" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net471" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net471" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net471" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net471" />
+  <package id="System.IO.UnmanagedMemoryStream" version="4.0.1" targetFramework="net471" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net471" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net471" />
  <package id="System.Memory" version="4.5.4" targetFramework="net47" />
+  <package id="System.Net.Http" version="4.3.0" targetFramework="net471" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net471" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net471" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="net471" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net471" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net471" />
  <package id="System.Reflection.Metadata" version="6.0.0" targetFramework="net471" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net471" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net471" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net471" />
  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net471" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net471" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net471" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net471" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net471" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net471" />
  <package id="System.Security.AccessControl" version="6.0.0" targetFramework="net471" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net471" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net471" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net471" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net471" />
  <package id="System.Security.Permissions" version="6.0.0" targetFramework="net471" />
  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net47" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net471" />
  <package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net471" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net471" />
  <package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net471" />
  <package id="System.Text.Json" version="6.0.0" targetFramework="net471" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net471" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net471" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net471" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net471" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net47" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net471" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net471" />
 </packages>