Merge pull request #5 from ShawnLaMountain/main

ShawnLaMountain · web-flow · commit 9125915cb409 · 2022-03-02T05:10:45.000-05:00
Changing from .NET Standard 2.1 to .NET Standard 2.0 to support more …
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -7,7 +7,7 @@ on:
 env:
   TITLE: "Dynamic Thread-Safe Objects"
   DESCRIPTION: "A combination of generic Dynamic Thread-Safe objects that can be used in all application types."
-  TAGS: "thunderdesign dynamic threading net"
+  TAGS: "thunderdesign dynamic visual%2Dstudio c%2Dsharp dotnet%2Dstandard dotnet%2Dframework dotnet%2Dcore cross%2Dplatform pcl%2Dlibrary mono xamarin%2Dforms xamarin%2Dandroid xamarin%2Dios xamarin%2Dmac xamarin%2Duwp unity csharp net dotnet threading bindable binding"
   #FILE_NAME: ex: "ThunderDesign.Net-PCL.Dynamic"
   FILE_NAME: "${{ github.event.repository.name }}"
   #REPOSITORY_NAME: ex: "ThunderDesign.Net-PCL.Dynamic"
@@ -30,10 +30,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     
-    - name: Setup .NET 3.0
+    - name: Setup .NET 2.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.x
+        dotnet-version: 2.0.x
         
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v1.1
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -20,10 +20,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Setup .NET 3.0
+    - name: Setup .NET 2.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.x
+        dotnet-version: 2.0.x
         
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v1.1
diff --git a/README.md b/README.md
@@ -3,5 +3,39 @@
 [![CD](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/actions/workflows/CD.yml/badge.svg)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/actions/workflows/CD.yml)
 [![Nuget](https://img.shields.io/nuget/v/ThunderDesign.Net-PCL.Dynamic)](https://www.nuget.org/packages/ThunderDesign.Net-PCL.Dynamic)
 [![License](https://img.shields.io/github/license/ThunderDesign/ThunderDesign.Net-PCL.Dynamic)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/blob/main/LICENSE)
+[![Net](https://img.shields.io/badge/.net%20standard-2.0-blue)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/blob/main/README.md)
 
-Thread-Safe Objects
+A combination of generic Dynamic Thread-Safe objects that can be used in all application types.
+
+----
+
+### Highlights include:
+
+- Collections
+  - DynamicExpandObjectList
+  - DynamicPropertyList
+- DataObjects
+  - DynamicExpandObject
+  - DynamicProperty
+- Extentions
+  - DynamicExpandObjectExtention
+
+----
+
+## Installation
+
+Grab the latest [ThunderDesign.Net-PCL.Dynamic NuGet](https://www.nuget.org/packages/ThunderDesign.Net-PCL.Dynamic) package and install in your solution.
+
+> Install-Package ThunderDesign.Net-PCL.Dynamic
+
+Use the `-version` option to specify an [older version](https://www.nuget.org/packages/ThunderDesign.Net-PCL.Dynamic#versions-tab) to install.
+
+## Examples
+
+*(TIP: Clone repo, open the solution, build it and run sample app.)*
+- Xamarin
+  - [SimpleContacts Example](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/tree/main/samples/Xamarin/SimpleContacts)
+
+## Please Contribute!
+
+This is an open source project that welcomes contributions/suggestions/bug reports from those who use it. If you have any ideas on how to improve the library, please [post an issue here on GitHub](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/issues). Please check out the [How to Contribute](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/blob/main/.github/CONTRIBUTING.md).
diff --git a/src/ThunderDesign.Net-PCL.Dynamic/Collections/DynamicPropertyList.cs b/src/ThunderDesign.Net-PCL.Dynamic/Collections/DynamicPropertyList.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 using ThunderDesign.Net.Dynamic.Interfaces;
 using ThunderDesign.Net.Threading.Collections;
 
@@ -13,6 +14,11 @@ public class DynamicPropertyList : ObservableDictionaryThreadSafe<string, IDynam
             //Hiding base.Add(TKey key, TValue value);
         }
 
+        void IDictionary<string, IDynamicProperty>.Add(string key, IDynamicProperty value)
+        {
+            this.Add(value);
+        }
+
         public void Add(IDynamicProperty value)
         {
             base.Add(value.Name, value);
diff --git a/src/ThunderDesign.Net-PCL.Dynamic/DataObjects/DynamicExpandObject.cs b/src/ThunderDesign.Net-PCL.Dynamic/DataObjects/DynamicExpandObject.cs
@@ -9,7 +9,7 @@ namespace ThunderDesign.Net.Dynamic.DataObjects
     public class DynamicExpandObject : ThreadObject, IDynamicExpandObject
     {
         #region event handlers
-        public event PropertyChangedEventHandler? PropertyChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
         #endregion
 
         #region properties
diff --git a/src/ThunderDesign.Net-PCL.Dynamic/DataObjects/DynamicProperty.cs b/src/ThunderDesign.Net-PCL.Dynamic/DataObjects/DynamicProperty.cs
@@ -23,7 +23,7 @@ public DynamicProperty(string name, object value) : this(name)
         #endregion
 
         #region event handlers
-        public event PropertyChangedEventHandler? PropertyChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
         #endregion
 
         #region properties
@@ -33,7 +33,7 @@ public string Name
             private set;
         }
 
-        public object? Value
+        public object Value
         {
             get { return this.GetProperty(ref _Value, _Locker); }
             set { this.SetProperty(ref _Value, value, _Locker, true); }
@@ -48,7 +48,7 @@ public virtual void OnPropertyChanged(string propertyName)
         #endregion
 
         #region variables
-        protected object? _Value = null;
+        protected object _Value = null;
         #endregion
     }
 }
diff --git a/src/ThunderDesign.Net-PCL.Dynamic/Extentions/DynamicExpandObjectExtention.cs b/src/ThunderDesign.Net-PCL.Dynamic/Extentions/DynamicExpandObjectExtention.cs
@@ -30,10 +30,13 @@ private static void Parse(IDynamicExpandObject parent, XElement node)
                 {
                     IDynamicExpandObjectList<IDynamicExpandObject> dynamicExpandObjectList = new DynamicExpandObjectList<IDynamicExpandObject>();
 
-                    foreach (var element in node.Elements())
+                    foreach (var elementList in node.Elements())
                     {
                         IDynamicExpandObject dynamicExpandObject = (IDynamicExpandObject)Activator.CreateInstance(parent.GetType());
-                        Parse(dynamicExpandObject, element);
+                        foreach (var element in elementList.Elements())
+                        {
+                            Parse(dynamicExpandObject, element);
+                        }
                         dynamicExpandObjectList.Add(dynamicExpandObject);
                     }
                     IDynamicExpandObject parentExpandObject = (IDynamicExpandObject)Activator.CreateInstance(parent.GetType());
diff --git a/src/ThunderDesign.Net-PCL.Dynamic/Interfaces/IDynamicProperty.cs b/src/ThunderDesign.Net-PCL.Dynamic/Interfaces/IDynamicProperty.cs
@@ -6,7 +6,7 @@ public interface IDynamicProperty : IBindableObject
     {
         #region properties
         string Name { get; }
-        object? Value { get; set; }
+        object Value { get; set; }
         #endregion
     }
 }
diff --git a/src/ThunderDesign.Net-PCL.Dynamic/ThunderDesign.Net-PCL.Dynamic.csproj b/src/ThunderDesign.Net-PCL.Dynamic/ThunderDesign.Net-PCL.Dynamic.csproj
@@ -1,11 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<RootNamespace>ThunderDesign.Net_PCL.Dynamic</RootNamespace>
-		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.2" />
+		<PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.5" />
 	</ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace ThunderDesign.Net.Dynamic.DataObjects`
`9`	`9`	`public class DynamicExpandObject : ThreadObject, IDynamicExpandObject`
`10`	`10`	`{`
`11`	`11`	`#region event handlers`
`12`		`- public event PropertyChangedEventHandler? PropertyChanged;`
	`12`	`+ public event PropertyChangedEventHandler PropertyChanged;`
`13`	`13`	`#endregion`
`14`	`14`
`15`	`15`	`#region properties`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public DynamicProperty(string name, object value) : this(name)`
`23`	`23`	`#endregion`
`24`	`24`
`25`	`25`	`#region event handlers`
`26`		`- public event PropertyChangedEventHandler? PropertyChanged;`
	`26`	`+ public event PropertyChangedEventHandler PropertyChanged;`
`27`	`27`	`#endregion`
`28`	`28`
`29`	`29`	`#region properties`
`@@ -33,7 +33,7 @@ public string Name`
`33`	`33`	`private set;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public object? Value`
	`36`	`+ public object Value`
`37`	`37`	`{`
`38`	`38`	`get { return this.GetProperty(ref _Value, _Locker); }`
`39`	`39`	`set { this.SetProperty(ref _Value, value, _Locker, true); }`
`@@ -48,7 +48,7 @@ public virtual void OnPropertyChanged(string propertyName)`
`48`	`48`	`#endregion`
`49`	`49`
`50`	`50`	`#region variables`
`51`		`- protected object? _Value = null;`
	`51`	`+ protected object _Value = null;`
`52`	`52`	`#endregion`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,13 @@ private static void Parse(IDynamicExpandObject parent, XElement node)`
`30`	`30`	`{`
`31`	`31`	`IDynamicExpandObjectList<IDynamicExpandObject> dynamicExpandObjectList = new DynamicExpandObjectList<IDynamicExpandObject>();`
`32`	`32`
`33`		`- foreach (var element in node.Elements())`
	`33`	`+ foreach (var elementList in node.Elements())`
`34`	`34`	`{`
`35`	`35`	`IDynamicExpandObject dynamicExpandObject = (IDynamicExpandObject)Activator.CreateInstance(parent.GetType());`
`36`		`- Parse(dynamicExpandObject, element);`
	`36`	`+ foreach (var element in elementList.Elements())`
	`37`	`+ {`
	`38`	`+ Parse(dynamicExpandObject, element);`
	`39`	`+ }`
`37`	`40`	`dynamicExpandObjectList.Add(dynamicExpandObject);`
`38`	`41`	`}`
`39`	`42`	`IDynamicExpandObject parentExpandObject = (IDynamicExpandObject)Activator.CreateInstance(parent.GetType());`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public interface IDynamicProperty : IBindableObject`
`6`	`6`	`{`
`7`	`7`	`#region properties`
`8`	`8`	`string Name { get; }`
`9`		`- object? Value { get; set; }`
	`9`	`+ object Value { get; set; }`
`10`	`10`	`#endregion`
`11`	`11`	`}`
`12`	`12`	`}`