Merge branch 'development'

# Conflicts: # Demos/Hash_FMX/Hash_FMX.deployproj # Unit Tests/DECDUnitXTestSuite.dproj.local
MHumm · Mar 7, 2021 · 1f6ede2 · 1f6ede2
2 parents ef7a0c7 + 908eea8
commit 1f6ede2
Show file tree

Hide file tree

Showing 95 changed files with 2,194 additions and 239 deletions.
diff --git a/Demos/Cipher_Console/Cipher_Console.dproj b/Demos/Cipher_Console/Cipher_Console.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{BC13B21E-5E59-450C-A11D-EA58C8E05628}</ProjectGuid>
-        <ProjectVersion>19.1</ProjectVersion>
+        <ProjectVersion>19.2</ProjectVersion>
         <FrameworkType>None</FrameworkType>
         <MainSource>Cipher_Console.dpr</MainSource>
         <Base>True</Base>
@@ -160,6 +160,12 @@
                 </Source>
             </Delphi.Personality>
             <Deployment Version="3">
+                <DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Cipher_Console.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>Cipher_Console.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
                     <Platform Name="OSX32">
                         <Overwrite>true</Overwrite>
@@ -190,12 +196,6 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Cipher_Console.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>Cipher_Console.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>

diff --git a/Demos/Cipher_FMX/Cipher_FMX.deployproj b/Demos/Cipher_FMX/Cipher_FMX.deployproj
diff --git a/Demos/Cipher_FMX/Cipher_FMX.dproj b/Demos/Cipher_FMX/Cipher_FMX.dproj
diff --git a/Demos/Cipher_FMX/Cipher_FMX.res b/Demos/Cipher_FMX/Cipher_FMX.res
diff --git a/Demos/Cipher_FMX/CryptoIcon_192.png b/Demos/Cipher_FMX/CryptoIcon_192.png
diff --git a/Demos/Cipher_FMX/MainForm.fmx b/Demos/Cipher_FMX/MainForm.fmx
@@ -18,7 +18,7 @@ object FormMain: TFormMain
     Size.PlatformDefault = False
     StyleLookup = 'scrollboxstyle'
     TabOrder = 0
-    Viewport.Width = 409.000000000000000000
+    Viewport.Width = 425.000000000000000000
     Viewport.Height = 711.000000000000000000
     object LayoutTop: TLayout
       Size.Width = 425.000000000000000000
@@ -209,8 +209,8 @@ object FormMain: TFormMain
         Size.PlatformDefault = False
         StyleLookup = 'gridstyle'
         TabOrder = 8
-        Viewport.Width = 365.000000000000000000
-        Viewport.Height = 75.000000000000000000
+        Viewport.Width = 385.000000000000000000
+        Viewport.Height = 100.000000000000000000
         object StringColumn1: TStringColumn
           Header = 'Property'
           Size.Width = 250.000000000000000000

diff --git a/Demos/Cipher_FMX/MainForm.pas b/Demos/Cipher_FMX/MainForm.pas
@@ -77,7 +77,7 @@   TFormMain = class(TForm)
   end;
 
 var
-  FormMain: TMainForm;
+  FormMain: TFormMain;
 
 implementation
 

diff --git a/Demos/Format_Console/Format_Console.dproj b/Demos/Format_Console/Format_Console.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{A36C5DFF-C1BF-493E-93AC-4D6170321A4C}</ProjectGuid>
-        <ProjectVersion>19.1</ProjectVersion>
+        <ProjectVersion>19.2</ProjectVersion>
         <FrameworkType>None</FrameworkType>
         <MainSource>Format_Console.dpr</MainSource>
         <Base>True</Base>
@@ -165,14 +165,14 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Format_Console.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>Format_Console.exe</RemoteName>
+                <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
+                    <Platform Name="OSX64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
-                    <Platform Name="OSX64">
+                <DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Format_Console.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>Format_Console.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>

diff --git a/Demos/Hash_Console/Hash_Console.dproj b/Demos/Hash_Console/Hash_Console.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{3617401D-D6AC-4F43-9D1D-B217C40C973D}</ProjectGuid>
-        <ProjectVersion>19.1</ProjectVersion>
+        <ProjectVersion>19.2</ProjectVersion>
         <FrameworkType>None</FrameworkType>
         <MainSource>Hash_Console.dpr</MainSource>
         <Base>True</Base>
@@ -165,12 +165,6 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Hash_Console.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>Hash_Console.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
                 <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
                     <Platform Name="OSX64">
                         <Overwrite>true</Overwrite>
@@ -181,6 +175,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Hash_Console.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>Hash_Console.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>

diff --git a/Demos/Hash_FMX/AndroidManifest.template.xml b/Demos/Hash_FMX/AndroidManifest.template.xml
@@ -6,7 +6,8 @@
         android:versionName="%versionName%"
         android:installLocation="%installLocation%">
 
-    <uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="%targetSdkVersion%" />
+<!--<uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" />	-->
     <%uses-permission%>
     <uses-feature android:glEsVersion="0x00020000" android:required="True"/>
     <application android:persistent="%persistent%" 

diff --git a/Demos/Hash_FMX/Hash192.png b/Demos/Hash_FMX/Hash192.png