Add explicit GetField and SetField methods to make up for recent changes to behavior to GetProperty/SetProperty related operations that no longer retrieve fields. You can now use the explicit methods.

- Updated binary signing process using Azure Trusted Signing

Author: RickStrahl

ClrHost/ClrHost.rc

@@ -52,7 +52,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,1,2,0
+ FILEVERSION 8,4,5,0
  PRODUCTVERSION 8,0,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -70,9 +70,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "West Wind Technologies"
             VALUE "FileDescription", "West Wind .NET Connector (Win32)"
-            VALUE "FileVersion", "8.1.2.0"
+            VALUE "FileVersion", "8.4.5.0"
             VALUE "InternalName", "wwDotNetBridge"
-            VALUE "LegalCopyright", "© West Wind Technologies, 2010-2024"
+            VALUE "LegalCopyright", "© West Wind Technologies, 2010-2025"
             VALUE "OriginalFilename", "ClrHost.dll"
             VALUE "ProductName", "wwDotnetBridge"
             VALUE "ProductVersion", "8.0.0.0"

Distribution/.gitignore

@@ -0,0 +1 @@
+sign*.*

Distribution/ClrHost.dll

@@ -1,4 +1,2 @@
-~\Dropbox\utl\signtool.exe sign /v /n "West Wind Technologies" /sm /s MY /tr "http://timestamp.digicert.com" /td SHA256 /fd SHA256 ".\wwdotnetbridge.dll"
-~\Dropbox\utl\signtool.exe sign /v /n "West Wind Technologies" /sm /s MY /tr "http://timestamp.digicert.com" /td SHA256 /fd SHA256 ".\clrhost.dll"
-
-~\Dropbox\utl\7z.exe  a -tzip -r .\wwDotnetBridge-Oss.zip .\wwdotnetbridge.dll .\clrhost.dll .\wwDotnetBridge.prg
+.\signFile.ps1 -file "clrhost.dll" -file2 "wwDotnetBridge.dll"
+~\Dropbox\utl\7z.exe  a -tzip -r .\wwDotnetBridge-Oss.zip .\wwdotnetbridge.dll .\clrhost.dll .\wwDotnetBridge.prg

Distribution/SignAndPack.ps1

@@ -682,6 +682,19 @@ RETURN this.oDotNetBridge.GetProperty(loInstance, lcProperty)
 ENDFUNC
 *   GetProperty
 
+************************************************************************
+*  GetField
+****************************************
+***  Function: Gets a value from a .NET field.
+***    Assume:
+***      Pass:
+***    Return:
+************************************************************************
+FUNCTION GetField(loInstance, lcField)
+RETURN this.oDotNetBridge.GetField(loInstance, lcField) 
+ENDFUNC
+*   GetField
+
 ************************************************************************
 *  GetPropertyRaw
 ****************************************
@@ -740,6 +753,18 @@ this.oDotNetBridge.SetProperty(loInstance, lcProperty, lvValue)
 ENDFUNC
 *   SetProperty
 
+************************************************************************
+*  SetField
+****************************************
+***  Function: Sets a field on a .NET object
+***    Assume:
+***      Pass:
+***    Return:
+************************************************************************
+FUNCTION SetField(loInstance, lcField, lvValue)
+this.oDotNetBridge.SetField(loInstance, lcField, lvValue)
+ENDFUNC
+*   SetField
 
 ************************************************************************
 *  InvokeStaticMethod
@@ -1136,7 +1161,7 @@ ENDFUNC
 ***    Return: A subscription object. The subscription ends when this object goes out of scope.
 ************************************************************************
 FUNCTION SubscribeToEvents(loSource, loHandler, lcPrefix)
-IF EMPTY(lcPrefix)
+IF VARTYPE(lcPrefix) # "C"
 	lcPrefix = "On"
 ENDIF
 LOCAL loSubscription
@@ -1355,6 +1380,12 @@ IF FILE(lcAssembly)
 ENDIF
 
 IF AT(":\",lcAssembly) > 0 OR AT("\\",lcAssembly) > 0
+        *** Clear zone information
+        TRY 
+		DeleteFile(lcAssembly + ":Zone.Identifier")
+	CATCH
+	ENDTRY
+
 	*** It's a file based assembly path
 	IF !loBridge.LoadAssemblyFrom(lcAssembly)
 		this.SetError(lobridge.ErrorMessage)
@@ -1649,7 +1680,7 @@ ENDFUNC
 ****************************************
 ***  Function: Gets a property from a .NET object using .syntax for 
 ***            for the property as well as supporting arrays
-***    Assume: OBSOLETE - just use 
+***    Assume: OBSOLETE - just use GetProperty()
 ***      Pass: 
 ***    Return:
 ************************************************************************

Distribution/wwDotNetBridge.dll

@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Text;
+#if NETFULL
 using System.Windows.Forms;
+#endif
 
 namespace Westwind.WebConnection
 {
@@ -181,7 +184,7 @@ public static string GetRelativePath(string fullPath, string basePath)
             return relativeUri.ToString().Replace(oldValue: "/", newValue: "\\");
         }
 
-
+#if NETFULL
         /// <summary>
         /// Returns a filename for a file to save
         /// </summary>
@@ -283,6 +286,7 @@ public static string OpenFolderDialog(string startFolder, string description)
 
             return dialog.SelectedPath;
         }
+#endif
 
         /// <summary>
         /// Deletes files based on a file spec and a given timeout.
@@ -313,17 +317,36 @@ public static void DeleteFiles(string filespec,int seconds)
         /// <param name="outputZipFile"></param>
         /// <param name="folder"></param>
         /// <returns></returns>
-        public static bool ZipFolder(string outputZipFile, string folder, bool fast)
+        public static bool ZipFolder(string outputZipFile, string folder, string fileSpec = "*.*", bool fast = false)
         {
             try
             {
                 if (File.Exists(outputZipFile))
                     File.Delete(outputZipFile);
 
-                ZipFile.CreateFromDirectory(folder, 
-                        outputZipFile, 
-                        fast ? CompressionLevel.Fastest :CompressionLevel.Optimal, 
-                        false);
+                var tokens = fileSpec.Split(new char[] { ';',',' }, StringSplitOptions.RemoveEmptyEntries);
+                var files = new List<string>();
+                foreach (var token in tokens)
+                {
+                    var filesSub = Directory.GetFiles(folder, token, SearchOption.AllDirectories);
+                    files.AddRange(filesSub);
+                }                               
+
+                using (var zipFileStream = new FileStream(outputZipFile, FileMode.Create))
+                {
+                    using (var archive = new ZipArchive(zipFileStream, ZipArchiveMode.Create))
+                    {
+                        foreach(var file in files)
+                        {
+                            // filter some files before this, or ignore some files here
+
+                            var fileName = file;
+                            var entryName = GetRelativePath(file, folder);                            
+
+                            archive.CreateEntryFromFile(fileName, entryName, fast ? CompressionLevel.Fastest : CompressionLevel.Optimal );
+                        }
+                    }
+                }
             }
             catch
             {
@@ -333,6 +356,7 @@ public static bool ZipFolder(string outputZipFile, string folder, bool fast)
             return true;
         }
 
+        
         /// <summary>
         /// Unzips a zip file to a destination folder.
         /// </summary>
@@ -342,7 +366,7 @@ public static bool ZipFolder(string outputZipFile, string folder, bool fast)
         public static bool UnzipFolder(string zipFile, string folder)
         {
             try
-            {
+            {                
                 ZipFile.ExtractToDirectory(zipFile, folder);
             }
             catch

Distribution/wwDotNetBridge.xml

@@ -524,49 +524,56 @@ public static void InvokeEvent(object instance, string eventName, params object[
         /// <returns>Object - cast to proper type</returns>
         public static object GetProperty(object instance, string property)
         {
-            return instance.GetType().GetProperty(property, ReflectionUtils.MemberAccess).GetValue(instance, null);
+            var prop = instance.GetType().GetProperty(property, ReflectionUtils.MemberAccess);
+            if (prop == null)
+                throw new InvalidOperationException("Could not find property " + property + " on object of type " + instance.GetType().FullName);
+                        
+            return prop.GetValue(instance, null);
         }
 
         /// <summary>
         /// Parses Properties and Fields including Array and Collection references.
         /// Used internally for the 'Ex' Reflection methods.
         /// </summary>
-        /// <param name="Parent"></param>
-        /// <param name="Property"></param>
+        /// <param name="parent"></param>
+        /// <param name="property"></param>
         /// <returns></returns>
-        private static object GetPropertyInternal(object Parent, string Property)
+        private static object GetPropertyInternal(object parent, string property)
         {
-            if (Property == "this" || Property == "me")
-                return Parent;
+            if (property == "this" || property == "me")
+                return parent;
 
             object result = null;
-            string pureProperty = Property;
+            string pureProperty = property;
             string indexes = null;
             bool isArrayOrCollection = false;
 
             // Deal with Array Property
-            if (Property.IndexOf("[") > -1)
+            if (property.IndexOf("[") > -1)
             {
-                pureProperty = Property.Substring(0, Property.IndexOf("["));
-                indexes = Property.Substring(Property.IndexOf("["));
+                pureProperty = property.Substring(0, property.IndexOf("["));
+                indexes = property.Substring(property.IndexOf("["));
                 isArrayOrCollection = true;
             }
 
-            var parentType = Parent.GetType();
+            var parentType = parent.GetType();
 
             if (string.IsNullOrEmpty(pureProperty))
             {
                 // most likely an indexer
-                result = Parent;
+                result = parent;
             }
             else
             {
                 // Get the member
-                MemberInfo member = Parent.GetType().GetMember(pureProperty, ReflectionUtils.MemberAccess)[0];
+                MemberInfo member = parent.GetType().GetMember(pureProperty, ReflectionUtils.MemberAccess)[0];
+                if (member == null)
+                    throw new InvalidOperationException("Could not find property " + property + " on object of type " + parent.GetType().FullName);
+
                 if (member.MemberType == MemberTypes.Property)
-                    result = ((PropertyInfo) member).GetValue(Parent, null);
+                    result = ((PropertyInfo) member).GetValue(parent, null);
                 else
-                    result = ((FieldInfo) member).GetValue(Parent);
+                    result = ((FieldInfo) member).GetValue(parent);
             }
 
             if (isArrayOrCollection)
@@ -626,12 +633,15 @@ public static PropertyInfo GetPropertyInfoInternal(object Parent, string Propert
         /// Retrieve a field dynamically from an object. This is a simple implementation that's
         /// straight Reflection and doesn't support indexers.
         /// </summary>
-        /// <param name="Object">Object to retreve Field from</param>
-        /// <param name="Property">name of the field to retrieve</param>
+        /// <param name="instance">Object to retreve Field from</param>
+        /// <param name="property">name of the field to retrieve</param>
         /// <returns></returns>
-        public static object GetField(object Object, string Property)
+        public static object GetField(object instance, string property)
         {
-            return Object.GetType().GetField(Property, ReflectionUtils.MemberAccess | BindingFlags.GetField).GetValue(Object);
+            var field = instance.GetType().GetField(property, ReflectionUtils.MemberAccess | BindingFlags.GetField);
+            if (field == null)
+                throw new InvalidOperationException("Could not find public field " + property + " on object of type " + instance.GetType().FullName);
+            return field.GetValue(instance);            
         }
 
 
@@ -643,10 +653,12 @@ public static object GetField(object Object, string Property)
         /// <param name="property">Name of the property to set</param>
         /// <param name="value">value to set it to</param>
         public static void SetProperty(object obj, string property, object value)
-        {
+        {            
             obj.GetType().GetProperty(property, ReflectionUtils.MemberAccess).SetValue(obj, value, null);
         }
 
+
+     
         /// <summary>
         /// Parses Properties and Fields including Array and Collection references.
         /// </summary>
@@ -735,11 +747,15 @@ private static object SetPropertyInternal(object Parent, string Property, object
         /// and doesn't support indexers.
         /// </summary>
         /// <param name="obj">Object to set property on</param>
-        /// <param name="property">Name of the field to set</param>
+        /// <param name="fieldName">Name of the field to set</param>
         /// <param name="value">value to set it to</param>
-        public static void SetField(object obj, string property, object value)
+        public static void SetField(object instance, string fieldName, object value)
         {
-            obj.GetType().GetField(property, ReflectionUtils.MemberAccess).SetValue(obj, value);
+            var field = instance.GetType().GetField(fieldName, ReflectionUtils.MemberAccess | BindingFlags.GetField | BindingFlags.SetField);
+            if (field == null)
+                throw new InvalidOperationException("Could not find public field " + fieldName + " on object of type " + instance.GetType().FullName);
+            
+            field.SetValue(instance, value);
         }
 
 
@@ -1003,7 +1019,7 @@ public static object GetPropertyExCom(object parent, string property)
                     return parent;
 
                 // Get the member
-                return parent.GetType().InvokeMember(property, ReflectionUtils.MemberAccessCom | BindingFlags.GetProperty , null,
+                return parent.GetType().InvokeMember(property, ReflectionUtils.MemberAccessCom | BindingFlags.GetProperty | BindingFlags.GetField, null,
                     parent, null);
             }