Push into Nuget

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

@@ -36,7 +36,7 @@ jobs:
       run: dotnet nuget enable source github
 
     - name: Build
-      run: pwsh ./build.ps1 -configuration ${{matrix.configuration}} -targetFramework 'all'
+      run: pwsh ./build.ps1 -configuration ${{matrix.configuration}} -targetFrameworks 'all'
       env: 
         NUGET_USERNAME: ${{github.repository_owner}}
         NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }} 

CHANGELOG.md

@@ -1,3 +1,19 @@
+## [2.6.0]
+
+### Added
+
+- Added new InMemoryFileDb implementation to support file and image storage - https://github.com/DynamicsValue/fake-xrm-easy/issues/157
+- Added default max file size for file and image uploads - https://github.com/DynamicsValue/fake-xrm-easy/issues/157
+
+### Changed
+
+- Resolves many issues in Create, Upsert, and CreateMultiple and UpsertMultiple when alternate keys were used - https://github.com/DynamicsValue/fake-xrm-easy/issues/172 
+- TracingService will also output to the default standard output - https://github.com/DynamicsValue/fake-xrm-easy/issues/163
+- **BREAKING CHANGE**: This will **only** affect you if you use XrmRealContext class. Moved XrmRealContext to a separate FakeXrmEasy.Integration package to remove dependency on XrmTooling - https://github.com/DynamicsValue/fake-xrm-easy/issues/160
+- Resolves an issue in FetchXml queries when using arithmetic values and no early bound assemblies are used. It will now read from injected metadata in absence of proxy type assemblies - https://github.com/DynamicsValue/fake-xrm-easy/issues/158 
+- Resolves issue in MetadataGenerator where relationship properties were generated in the wrong order, also generates ManyToMany relationship properties - https://github.com/DynamicsValue/fake-xrm-easy/issues/135
+- Adds implementation of RelatedEntities in Update message , before it was implemented only for Create - https://github.com/DynamicsValue/fake-xrm-easy/issues/154
+
 ## [2.5.1]
 
 ### Changed

FakeXrmEasy.Core.sln

@@ -21,9 +21,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataverseEntities", "tests\
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-	    FAKE_XRM_EASY_9|Any CPU = FAKE_XRM_EASY_9|Any CPU
-        FAKE_XRM_EASY_9|x64 = FAKE_XRM_EASY_9|x64
-        FAKE_XRM_EASY_9|x86 = FAKE_XRM_EASY_9|x86
+		FAKE_XRM_EASY_9|Any CPU = FAKE_XRM_EASY_9|Any CPU
+		FAKE_XRM_EASY_9|x64 = FAKE_XRM_EASY_9|x64
+		FAKE_XRM_EASY_9|x86 = FAKE_XRM_EASY_9|x86
 		FAKE_XRM_EASY_2013|Any CPU = FAKE_XRM_EASY_2013|Any CPU
 		FAKE_XRM_EASY_2013|x64 = FAKE_XRM_EASY_2013|x64
 		FAKE_XRM_EASY_2013|x86 = FAKE_XRM_EASY_2013|x86
@@ -46,7 +46,7 @@ Global
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_9|x64.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_9|x64.Build.0 = FAKE_XRM_EASY_9|Any CPU
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_9|x86.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
-		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_9|x86.Build.0 = FAKE_XRM_EASY_9|Any CPU	
+		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_9|x86.Build.0 = FAKE_XRM_EASY_9|Any CPU
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_2013|Any CPU.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_2013|Any CPU.Build.0 = FAKE_XRM_EASY_2013|Any CPU
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_2013|x64.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU

pack-configuration.ps1

@@ -48,20 +48,20 @@ if($targetFrameworks -eq "all")
 {
     if($versionSuffix -eq "") 
     {
-        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -o $tempNupkgFolder $projectPath/$projectName.csproj
+        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -p:IsPacking="true" -o $tempNupkgFolder $projectPath/$projectName.csproj
     }
     else {
-        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -o $tempNupkgFolder $projectPath/$projectName.csproj --version-suffix $versionSuffix
+        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -p:IsPacking="true" -o $tempNupkgFolder $projectPath/$projectName.csproj --version-suffix $versionSuffix
     }
 }
 else 
 {
     if($versionSuffix -eq "") 
     {
-        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -p:TargetFrameworks=$targetFrameworks -o $tempNupkgFolder $projectPath/$projectName.csproj
+        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -p:IsPacking="true" -p:TargetFrameworks=$targetFrameworks -o $tempNupkgFolder $projectPath/$projectName.csproj
     }
     else {
-        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -p:TargetFrameworks=$targetFrameworks -o $tempNupkgFolder $projectPath/$projectName.csproj --version-suffix $versionSuffix
+        dotnet pack --no-build --configuration $configuration -p:PackageID=$packageId -p:Title=$packageId -p:PackTests=$packTests -p:IsPacking="true" -p:TargetFrameworks=$targetFrameworks -o $tempNupkgFolder $projectPath/$projectName.csproj --version-suffix $versionSuffix
     }
 }
 

pack-src-project.ps1

@@ -0,0 +1,29 @@
+param (
+    [string]$versionSuffix = "",
+    [string]$targetFrameworks = "netcoreapp3.1",
+    [string]$packageIdPrefix = "",
+    [string]$projectName = "",
+    [string]$projectPath = ""   
+ )
+
+Write-Host "Running with versionSuffix '$($versionSuffix)'..."
+
+$tempNupkgFolder = './nupkgs'
+
+Write-Host "Packing All Configurations for project $($projectName)" -ForegroundColor Green
+
+ if($targetFrameworks -eq "netcoreapp3.1")
+ {
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_365" 
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_9" 
+ }
+ else {
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY" 
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_2013"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_2015"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_2016"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_365"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_9"
+ }
+
+Write-Host "Pack Succeeded  :)" -ForegroundColor Green

pack-src.ps1

@@ -13,18 +13,6 @@ $projectPath = "src/FakeXrmEasy.Core"
 
 Write-Host "Packing All Configurations for project $($projectName)" -ForegroundColor Green
 
- if($targetFrameworks -eq "netcoreapp3.1")
- {
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_365" 
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_9" 
- }
- else {
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY" 
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_2013"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_2015"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_2016"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_365"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -configuration "FAKE_XRM_EASY_9"
- }
+./pack-src-project.ps1 -targetFrameworks $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix
 
 Write-Host "Pack Succeeded  :)" -ForegroundColor Green

pack-tests-project.ps1

@@ -0,0 +1,29 @@
+param (
+    [string]$versionSuffix = "",
+    [string]$targetFrameworks = "netcoreapp3.1",
+    [string]$packageIdPrefix = "",
+    [string]$projectName = "",
+    [string]$projectPath = ""    
+ )
+
+Write-Host "Running with versionSuffix '$($versionSuffix)'..."
+
+$tempNupkgFolder = './nupkgs'
+
+Write-Host "Packing All Configurations for project $($projectName)" -ForegroundColor Green
+
+ if($targetFrameworks -eq "netcoreapp3.1")
+ {
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_365" 
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_9" 
+ }
+ else {
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY" 
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_2013"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_2015"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_2016"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_365"
+    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_9"
+ }
+
+Write-Host "Pack Succeeded  :)" -ForegroundColor Green

pack-tests.ps1

@@ -13,18 +13,6 @@ $projectPath = "tests/FakeXrmEasy.Core.Tests"
 
 Write-Host "Packing All Configurations for project $($projectName)" -ForegroundColor Green
 
- if($targetFrameworks -eq "netcoreapp3.1")
- {
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_365" 
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_9" 
- }
- else {
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY" 
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_2013"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_2015"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_2016"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_365"
-    ./pack-configuration.ps1 -targetFramework $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix -packTests "true" -configuration "FAKE_XRM_EASY_9"
- }
+./pack-tests-project.ps1 -targetFrameworks $targetFrameworks -projectName $projectName -projectPath $projectPath -packageIdPrefix $packageIdPrefix -versionSuffix $versionSuffix
 
 Write-Host "Pack Succeeded  :)" -ForegroundColor Green

push.ps1

@@ -1,6 +1,6 @@
 param (
     [string]$packageSource = "local-packages",
-    [string]$packagePrefix = "FakeXrmEasy.Abstractions"
+    [string]$packagePrefix = "FakeXrmEasy.Core"
  )
 
 Write-Host "Running with packageSource '$($packageSource)'..."

src/FakeXrmEasy.Core/Db/InMemoryDb.cs

@@ -1,4 +1,5 @@
-using FakeXrmEasy.Core.Db.Exceptions;
+using System;
+using FakeXrmEasy.Core.Db.Exceptions;
 using FakeXrmEasy.Extensions;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;
@@ -105,13 +106,30 @@ protected internal void AddOrUpdateMetadata(string logicalName, EntityMetadata e
 
         protected internal void AddEntityRecord(Entity e)
         {
+            InMemoryTable table;
             if (!ContainsTable(e.LogicalName))
             {
-                InMemoryTable table;
                 AddTable(e.LogicalName, out table);
             }
+            else
+            {
+                table = GetTable(e.LogicalName);
+            }
+
+            table.Add(e);
         }
 
+        protected internal bool ContainsEntityRecord(string logicalName, Guid id)
+        {
+            if (!ContainsTable(logicalName))
+            {
+                return false;
+            }
+
+            var table = GetTable(logicalName);
+            return table.Contains(id);
+        }
+
         protected internal void AddOrReplaceEntityRecord(Entity e)
         {
             InMemoryTable table = null;

src/FakeXrmEasy.Core/Db/InMemoryTable.cs

@@ -3,6 +3,8 @@
 using Microsoft.Xrm.Sdk.Metadata;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using FakeXrmEasy.Abstractions;
 
 namespace FakeXrmEasy.Core.Db
 {
@@ -107,6 +109,8 @@
             return _rows[key];
         }
 
+
+
         /// <summary>
         /// Returns an IEnumerable of all rows in the current table
         /// </summary>
@@ -126,5 +130,62 @@
         {
             _metadata._entityMetadata = entityMetadata.Copy();
         }
+
+        /// <summary>
+        /// Returns the entity metadata associated to this column
+        /// </summary>
+        /// <returns></returns>
+        protected internal EntityMetadata GetEntityMetadata()
+        {
+            return _metadata._entityMetadata;
+        }
+
+        #if !FAKE_XRM_EASY && !FAKE_XRM_EASY_2013 
+        /// <summary>
+        /// Checks if there is a matching record that matches the alternate key provided.
+        /// </summary>
+        /// <param name="key">The metadata of the Alternate Key</param>
+        /// <param name="key">The key values</param>
+        /// <returns></returns>
+        protected internal Entity GetByKeyAttributeCollection(KeyAttributeCollection keyAttributeValues)
+        {
+            return Rows.FirstOrDefault(row => keyAttributeValues.All(k => row.Attributes.ContainsKey(k.Key) && row.Attributes[k.Key] != null && row.Attributes[k.Key].Equals(k.Value)));
+        }
+
+
+        /// <summary>
+        /// Checks if the record exists using any of the alternate keys currently present in metadata, and if so, returns the matched key metadata
+        /// </summary>
+        /// <param name="record">The record whose attribute values will be used for searching</param>
+        /// <returns>The record that matches one of the entity key metadata, null if none found otherwise</returns>
+        protected internal Entity GetByAlternateKeys(Entity record, out EntityKeyMetadata matchedKeyMetadata)
+        {
+            matchedKeyMetadata = null;
+            var entityMetadata = _metadata._entityMetadata;
+
+            var keyMetadata = entityMetadata?.Keys;
+            if (keyMetadata == null)
+            {
+                return null;
+            }
+
+            foreach (var key in keyMetadata)
+            {
+                var keyAttributes = record.ToAlternateKeyAttributeCollection(key);
+                if (keyAttributes != null)
+                {
+                    var matchedRecord = GetByKeyAttributeCollection(keyAttributes);
+                    if (matchedRecord != null)
+                    {
+                        matchedKeyMetadata = key;
+                        return matchedRecord.Clone();
+                    }
+                }
+            }
+
+            return null;
+        }
+#endif
+
     }
 }

src/FakeXrmEasy.Core/Exceptions/Query/FetchXml/ArithmeticTypeConversionException.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace FakeXrmEasy.Core.Exceptions.Query.FetchXml
+{
+    /// <summary>
+    /// Exception raised in a query when an attribute value type could not be determined correctly
+    /// </summary>
+    public class ArithmeticTypeConversionException: Exception
+    {
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="attributeName"></param>
+        internal ArithmeticTypeConversionException(string entityName, string attributeName) : 
+            base($"When using arithmetic values in a condition of attribute '{attributeName}' of entity '{entityName}' in a Fetch a ProxyTypesAssembly must be used in order to know which types to cast values to. If you are using early bound types, please make sure the early bound type was generated for entity '{entityName}'")
+        {
+
+        }
+    }
+}