Merge pull request #91 from delegateas/dev

Dev

Author: thygesteffensen

.github/workflows/.releaserc

@@ -17,8 +17,5 @@ plugins:
         - path: ../../artifacts/Documentation.md
           label: Documentation
 
-  - - "@semantic-release/exec"
-    - publishCmd: "dotnet nuget push ..\\..\\artifacts\\Delegate.ExpressionEngine.*.nupkg --source https://nuget.pkg.github.com/delegateas/index.json --api-key ${process.env.GITHUB_TOKEN}"
-
   - - "@semantic-release/exec"
     - publishCmd: "dotnet nuget push ..\\..\\artifacts\\Delegate.ExpressionEngine.*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${process.env.CI_NUGET_API_KEY}"

.github/workflows/build.yml

@@ -13,11 +13,15 @@ jobs:
     name: Testing
     strategy:
       matrix:
-        dotnet: [ 'netcoreapp3.1', 'net5.0' ]
+        dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
     steps:
       - name: Checkout code base
         uses: actions/checkout@v2
 
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '7.0.x'
+
       - name: Run tests
         run: dotnet test --verbosity normal -f ${{ matrix.dotnet }}
 
@@ -26,14 +30,14 @@ jobs:
     name: Building
     strategy:
       matrix: 
-        dotnet: ['netcoreapp3.1', 'net5.0']
+        dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
     steps:
       - name: Checkout code base
         uses: actions/checkout@v2
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '5.0.x'
+          dotnet-version: '7.0.x'
 
       - name: Cleaning
         run: dotnet clean
@@ -67,9 +71,9 @@ jobs:
           path: build/netcoreapp3.1
           key: ${{ runner.os }}-build-netcoreapp3.1
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '5.0.x'
+          dotnet-version: '7.0.x'
 
       - name: Install Xml to Markdown tool
         run: dotnet new tool-manifest && dotnet tool install EAVFW.Extensions.Docs.TransformToMarkdown

.github/workflows/release.yml

@@ -12,10 +12,14 @@ jobs:
     name: Testing
     strategy:
       matrix:
-        dotnet: [ 'netcoreapp3.1', 'net5.0' ]
+        dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
     steps:
       - name: Checkout code base
         uses: actions/checkout@v2
+        
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '7.0.x'
 
       - name: Run tests
         run: dotnet test --verbosity normal -f ${{ matrix.dotnet }}
@@ -30,9 +34,9 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '5.0.x'
+          dotnet-version: '7.0.x'
 
       - uses: actions/setup-node@v2
         with:

ExpressionEngine/ExpressionEngine.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
 
         <PackageId>Delegate.ExpressionEngine</PackageId>
         <Authors>Delegate A/S,thygesteffensen</Authors>

ExpressionEngine/ValueContainer.cs

@@ -158,7 +158,7 @@ public bool IsNumber()
         }
 
         /// <summary>
-        /// Get the value of the ValueContainer has it's respective C# type
+        /// Get the value of the ValueContainer as its respective C# type
         ///
         /// <code>double</code> and <code>float</code> is converted to <code>decimal</code>.
         /// </summary>
@@ -184,11 +184,14 @@ public T GetValue<T>()
                 {
                     case { } iEnumerable when iEnumerable == typeof(IEnumerable<ValueContainer>):
                         return (T) GetValue<List<ValueContainer>>().AsEnumerable();
-                    // case { } array when array == typeof(ValueContainer[]):
-                        // return GetValue<List<ValueContainer>>().ToArray();
                 }
             }
 
+            if (typeof(T) == typeof(object))
+            {
+                return (T) _value;
+            }
+
             throw new ExpressionEngineException(
                 $"Cannot convert ValueContainer of type {_value.GetType()} to {typeof(T)}");
         }

Test/Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>

Test/ValueContainer/TestGetObject.cs

@@ -0,0 +1,19 @@
+using ExpressionEngine;
+using NUnit.Framework;
+
+namespace Test
+{
+    [TestFixture]
+    public class TestGetObject
+    {
+        [TestCase]
+        public void TestImplicitConversionThingy()
+        {
+            var valueContainer = new ValueContainer("Hello CLR Type!");
+
+            var value = valueContainer.GetValue<object>();
+
+            Assert.AreEqual(typeof(string), value.GetType());
+        }
+    }
+}