Merge pull request #44 from DynamicsValue/bugfix/several-updates-fixes

Updated build scripts, added new helper method to create new instances.

.github/workflows/CI-2x.yml

@@ -45,10 +45,11 @@ jobs:
     name: Sonar Quality Gate
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          distribution: 'temurin'
+          java-version: '17'
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis

.github/workflows/CI-PullRequest-2x.yml

@@ -45,10 +45,11 @@ jobs:
     name: Sonar Quality Gate
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          distribution: 'temurin'
+          java-version: '17'
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis

.github/workflows/PushNuget-2x.yml

@@ -42,10 +42,11 @@ jobs:
     name: Sonar Quality Gate
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          distribution: 'temurin'
+          java-version: '17'
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ### Changed
 
+-  Upgraded GitHub Actions to update Java major version to run SonarCloud analysis - https://github.com/DynamicsValue/fake-xrm-easy/issues/110
+ - Updated build scripts so that it actually deletes bin folders as opposed to doing dotnet clean -  https://github.com/DynamicsValue/fake-xrm-easy/issues/76
+ - Introduced new NewEntityRecord method to easily create instances of entity records based on the current use of early-bound or late-bound entities 
  - Resolves an issue with query evaluation and MultiOptionSets when using late bound entities or if type information is not present. - https://github.com/DynamicsValue/fake-xrm-easy/issues/66
 
 ## [2.3.2]

FakeXrmEasy.Core.sln

@@ -14,6 +14,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ED506DF3-19B6-420B-9172-13D54CC1A020}"
 	ProjectSection(SolutionItems) = preProject
 		CHANGELOG.md = CHANGELOG.md
+		build.ps1 = build.ps1
 	EndProjectSection
 EndProject
 Global

build.ps1

@@ -30,13 +30,10 @@ else
 }
 
 Write-Host " -> Cleaning..." -ForegroundColor Yellow
-if($targetFrameworks -eq "all")
-{
-    dotnet clean /p:Configuration=$configuration /p:PackTests=$packTests --verbosity quiet
-}
-else {
-    dotnet clean /p:Configuration=$configuration /p:PackTests=$packTests /p:TargetFrameworks=$targetFrameworks --verbosity quiet
-}
+./clean.ps1 -folderPath "./src/FakeXrmEasy.Core/bin"
+./clean.ps1 -folderPath "./src/FakeXrmEasy.Core/obj"
+./clean.ps1 -folderPath "./tests/FakeXrmEasy.Core.Tests/bin"
+./clean.ps1 -folderPath "./tests/FakeXrmEasy.Core.Tests/obj"
 
 if($targetFrameworks -eq "all")
 {

clean.ps1

@@ -0,0 +1,7 @@
+param (
+    [string]$folderPath = "./src/FakeXrmEasy.Core/bin"
+)
+
+if (Test-Path -Path $folderPath) {
+  Get-ChildItem -Path $folderPath -Include * -File -Recurse | foreach { $_.Delete()}
+}

src/FakeXrmEasy.Core/XrmFakedContext.cs

@@ -72,12 +72,11 @@ public IEnumerable<Assembly> ProxyTypesAssemblies
         /// <summary>
         /// 
         /// </summary>
-        [Obsolete("Please use ProxyTypesAssemblies to retrieve assemblies and EnableProxyTypes to add new ones")]
+        [Obsolete("Please use ProxyTypesAssemblies to retrieve assemblies and EnableProxyTypes to add new ones. This method is solely maintained for making a smoother transition to the latest versions from v1")]
         public Assembly ProxyTypesAssembly
         {
             get
             {
-                // TODO What we should do when ProxyTypesAssemblies contains multiple assemblies? One shouldn't throw exceptions from properties.
                 return _proxyTypesAssemblies.FirstOrDefault();
             }
             set
@@ -310,12 +309,12 @@ public virtual void Initialize(IEnumerable<Entity> entities)
         }
 
         /// <summary>
-        /// 
+        /// Initializes the context with a single entity record
         /// </summary>
         /// <param name="e"></param>
-        public void Initialize(Entity e)
+        public void Initialize(Entity entity)
         {
-            this.Initialize(new List<Entity>() { e });
+            this.Initialize(new List<Entity>() { entity });
         }
 
         /// <summary>
@@ -486,5 +485,29 @@ protected IOrganizationService GetFakedOrganizationService(XrmFakedContext conte
             return context._service;
         }
 
+        /// <summary>
+        /// Creates a new entity record that is consistent with the current use of early-bound or late-bound entities by the current context
+        /// </summary>
+        /// <param name="logicalName">The entity logical name of the entity</param>
+        /// <returns>An early-bound record dif the context is already using early-bound entity records, a late bound entity otherwise</returns>
+        public Entity NewEntityRecord(string logicalName)
+        {
+            if (_proxyTypesAssemblies.Any())
+            {                
+                var subClassType = FindReflectedType(logicalName);
+                if (subClassType != null)
+                {
+                    var instance = Activator.CreateInstance(subClassType);
+                    return (Entity) instance;                    
+                }
+            }
+
+            return new Entity
+            {
+                LogicalName = logicalName,
+                Id = Guid.Empty
+            };
+        }
+
     }
 }

tests/FakeXrmEasy.Core.Tests/FakeContextTests/NewEntityRecordTests.cs

@@ -0,0 +1,26 @@
+using System;
+using Crm;
+using FakeXrmEasy.Tests;
+using Xunit;
+
+namespace FakeXrmEasy.Core.Tests.FakeContextTests
+{
+
+    public class NewEntityRecordTests: FakeXrmEasyTestsBase
+    {
+        [Fact]
+        public void Should_use_late_bound_if_no_early_bound_entity_has_been_used()
+        {
+            var contact = ((XrmFakedContext)_context).NewEntityRecord("contact");
+            Assert.IsNotType<Contact>(contact);
+        }
+
+        [Fact]
+        public void Should_use_early_bound_if_the_context_is_using_early_bound()
+        {
+            _context.Initialize(new Contact() { Id = Guid.NewGuid()});
+            var contact = ((XrmFakedContext)_context).NewEntityRecord("contact");
+            Assert.IsType<Contact>(contact);
+        }
+    }
+}