Merge pull request #82 from DynamicsValue/revert-81-feature/35x-updates

Revert "Feature/35x updates"

.github/workflows/CI-3x.yml

@@ -9,7 +9,7 @@ on:
       - '*.txt'
 
 env: 
-  dotnet-version: 6.0.407
+  dotnet-version: 3.1.201
   source-url: "https://nuget.pkg.github.com/${{github.repository_owner}}/index.json"
 
 jobs:
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false 
       matrix: 
-        configuration: ['FAKE_XRM_EASY_9', 'FAKE_XRM_EASY_365', 'FAKE_XRM_EASY_2016','FAKE_XRM_EASY_2015','FAKE_XRM_EASY_2013']
+        configuration: ['FAKE_XRM_EASY_9', 'FAKE_XRM_EASY_365', 'FAKE_XRM_EASY_2016','FAKE_XRM_EASY_2015','FAKE_XRM_EASY_2013','FAKE_XRM_EASY']
 
     runs-on: windows-latest
 
@@ -88,10 +88,10 @@ jobs:
       run: dotnet nuget enable source github 
 
     - name: Quality Gate
-      uses: DynamicsValue/dotnet-sonarscanner@v2.4.7
+      uses: DynamicsValue/dotnet-sonarscanner@v2.3
       with:
-        buildCommand: dotnet build . --configuration 'FAKE_XRM_EASY_9' --framework net6.0
-        testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework net6.0 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
+        buildCommand: dotnet build . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1
+        testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
         projectKey: ${{ secrets.SONAR_PROJECT_KEY }}
         projectName: fake-xrm-easy-core
         sonarOrganisation: ${{ vars.SONAR_ORG_NAME }}

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

@@ -9,7 +9,7 @@ on:
       - '*.txt'
 
 env: 
-  dotnet-version: 6.0.407
+  dotnet-version: 3.1.201
   source-url: "https://nuget.pkg.github.com/${{github.repository_owner}}/index.json"
 
 jobs:
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false 
       matrix: 
-        configuration: ['FAKE_XRM_EASY_9', 'FAKE_XRM_EASY_365', 'FAKE_XRM_EASY_2016','FAKE_XRM_EASY_2015','FAKE_XRM_EASY_2013']
+        configuration: ['FAKE_XRM_EASY_9', 'FAKE_XRM_EASY_365', 'FAKE_XRM_EASY_2016','FAKE_XRM_EASY_2015','FAKE_XRM_EASY_2013','FAKE_XRM_EASY']
 
     runs-on: windows-latest
 
@@ -88,10 +88,10 @@ jobs:
       run: dotnet nuget enable source github 
 
     - name: Quality Gate
-      uses: DynamicsValue/dotnet-sonarscanner@v2.4.7
+      uses: DynamicsValue/dotnet-sonarscanner@v2.3
       with:
-        buildCommand: dotnet build . --configuration 'FAKE_XRM_EASY_9' --framework net6.0
-        testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework net6.0 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
+        buildCommand: dotnet build . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1
+        testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
         projectKey: ${{ secrets.SONAR_PROJECT_KEY }}
         projectName: fake-xrm-easy-core
         sonarOrganisation: ${{ vars.SONAR_ORG_NAME }}

.github/workflows/PushNuget-3x.yml

@@ -9,7 +9,7 @@ on:
       - '*.txt'
 
 env: 
-  dotnet-version: 6.0.407
+  dotnet-version: 3.1.201
   source-url: "https://api.nuget.org/v3/index.json"
 
 jobs:
@@ -85,12 +85,12 @@ jobs:
       run: dotnet nuget enable source github 
 
     - name: Quality Gate
-      uses: DynamicsValue/dotnet-sonarscanner@v2.4.7
+      uses: DynamicsValue/dotnet-sonarscanner@v2.3
       with:
-        buildCommand: dotnet build . --configuration 'FAKE_XRM_EASY_9' --framework net6.0
-        testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework net6.0 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
+        buildCommand: dotnet build . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1
+        testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
         projectKey: ${{ secrets.SONAR_PROJECT_KEY }}
-        projectName: fake-xrm-easy-core
+        projectName: fake-xrm-easy
         sonarOrganisation: dynamicsvalue
         beginArguments: >
             /d:sonar.verbose="true"

.vscode/launch.json

@@ -8,9 +8,9 @@
             "name": ".NET Core Launch (console)",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build --framework 'net6.0' --configuration 'FAKE_XRM_EASY_9'",
+            "preLaunchTask": "build --framework 'netcoreapp3.1' --configuration 'FAKE_XRM_EASY_9'",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/tests/bin/FAKE_XRM_EASY_9/net6.0/FakeXrmEasy.Core.Tests.dll",
+            "program": "${workspaceFolder}/tests/bin/FAKE_XRM_EASY_9/netcoreapp3.1/FakeXrmEasy.Core.Tests.dll",
             "args": [],
             "cwd": "${workspaceFolder}/tests",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
     "dotnet-test-explorer.testProjectPath": "tests/FakeXrmEasy.Core.Tests",
-    "dotnet-test-explorer.testArguments": "--framework 'net6.0' --configuration 'FAKE_XRM_EASY_9'",
+    "dotnet-test-explorer.testArguments": "--framework 'netcoreapp3.1' --configuration 'FAKE_XRM_EASY_9'",
     "dotnet-test-explorer.enableTelemetry": false
 }

CHANGELOG.md

@@ -1,11 +1,10 @@
-
-## [3.5.1]
+## [2.5.1]
 
 ### Changed
 
 - Resolves exception when searching attribute type that contains an alias in query expressions with linked entities - https://github.com/DynamicsValue/fake-xrm-easy/issues/151
 
-## [3.5.0]
+## [2.5.0]
 
 ### Added
 
@@ -22,23 +21,22 @@
 - Resolves Resolving entity references by Alternate Keys when EntityMetadata doesn't have any Keys. - https://github.com/DynamicsValue/fake-xrm-easy/issues/138
 - Resolves an issue where a ConditionExpression with an In operator should to not take array of integers as an input, but instead separate values (thanks Ben and Betim) - https://github.com/DynamicsValue/fake-xrm-easy/issues/96
 - Resolves filtering Money attributes by an integer value (thanks Ben and Betim) - https://github.com/DynamicsValue/fake-xrm-easy/issues/64
-- Upgraded DataverseClient dependency to 1.1.22 
 
 
-## [3.4.2]
+## [2.4.2]
 
 ### Added
 
 - Added link to docs in exceptions
 - Added some logging in subscription usage for CI builds
 
-## [3.4.1]
+## [2.4.1]
 
 ### Changed
 
 - Should not read subscription usage while in a CI build
 
-## [3.4.0]
+## [2.4.0]
 
 ## Added
 
@@ -52,7 +50,7 @@
 - Update build scripts to use 'all' target frameworks by default - https://github.com/DynamicsValue/fake-xrm-easy/issues/126
 - Update github actions to use new Sonar environment variables - https://github.com/DynamicsValue/fake-xrm-easy/issues/120
 
-## [3.3.3]
+## [2.3.3]
 
 ### Added
 
@@ -65,57 +63,48 @@
  - Upgraded GitHub Actions to update Java major version to run SonarCloud analysis - https://github.com/DynamicsValue/fake-xrm-easy/issues/110
  - 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
- - Update legacy CRM SDK 2011 dependency to use official MS package - https://github.com/DynamicsValue/fake-xrm-easy/issues/105
 
-## [3.3.1]
+## [2.3.2]
 
 ### Changed
 
-- Bump DataversClient nuget package to use net6.0 - https://github.com/DynamicsValue/fake-xrm-easy/issues/90
+- Update legacy CRM SDK 2011 dependency to use official MS package - https://github.com/DynamicsValue/fake-xrm-easy/issues/105
 
-## [3.3.0]
+## [2.3.0]
 
 ### Changed
 
 - Adding tests for MetadataGenerator - https://github.com/DynamicsValue/fake-xrm-easy/issues/77
 - Moved GetContextFromSerialisedCompressedProfile method into the Plugins package and FakeXrmEasy.Plugins namespace
 
-## [3.2.0]
+## [2.2.0]
 
 ### Changed
 
 - Added extension methods to detect and execute generic CRUD requests (of type OrganizationRequest) - DynamicsValue/fake-xrm-easy#31
 - Replaced references to PullRequestException by references to UnsupportedExceptionFactory to make it easier raising requests based on the license context
 - **BREAKING**: In-Memory data dictionary that was defined as a public dictionary is now internal using a rewritten data structure to prepare for parallelization and concurrency. If you were accessing this property, please use the GetEntity or CreateQuery public methods in the IXrmFakedContext interface to query the state of the In-Memory database state instead. For any other use, always rely on the IOrganizationService* interfaces only. This breaking change will affect you only if you were accessing the 'Data' dictionary directly.
 - Fix Sonar Quality Gate settings: DynamicsValue/fake-xrm-easy#28
+
 
-## [3.1.2]
-
-- Bump dataverse dependency to production ready version 1.0.1
-## [3.1.1]
+## [2.1.1]
 
 ### Changed
 
+- Made CRM SDK v8.2 dependencies less specific - DynamicsValue/fake-xrm-easy#21
 - Limit FakeItEasy package dependency to v6.x versions - DynamicsValue/fake-xrm-easy#37
 - Updated build script to also include the major version in the Title property of the generated .nuspec file - DynamicsValue/fake-xrm-easy#41
 - Modified TopCount support in QueryByAttribute and QueryExpression, to not throw exception if PageInfo was set but empty: DynamicsValue/fake-xrm-easy#16
 - Do not clear previous FakeMessageExecutors or GenericFakeMessageExecutors when adding new ones or when calling them multiple times: DynamicsValue/fake-xrm-easy#15
 - Allow creating records with any statecode attribute, which will be overriden by the platform as Active - DynamicsValue/fake-xrm-easy#36
 - Both GetEntityById and GetEntityById<T> now clone the entity record before returning it - DynamicsValue/fake-xrm-easy#27
 
-## [3.1.0]
+## [2.1.0]
 
 ### Changed
 
-- Added TopCount support in QueryByAttribute, and throw exception if both TopCount and PageInfo are set: DynamicsValue/fake-xrm-easy#16
-- Removed .netcoreapp3.1 target framework in versions 2.x, it'll be supported from versions 3.x onwards. Bump
-
-## [3.0.2]
-
-### Changed 
-
-- Bump Dataverse dependency to 0.6.1 from 0.5.10 to solve DynamicsValue/fake-xrm-easy#20
-- Also replaced Microsoft.Dynamics.Sdk.Messages dependency, as it has also been deprecated by MSFT, to Microsoft.PowerPlatform.Dataverse.Client.Dynamics 0.6.1 DynamicsValue/fake-xrm-easy#20
-
-## [3.0.1-rc1] - Initial release
+Added TopCount support in QueryByAttribute, and throw exception if both TopCount and PageInfo are set: DynamicsValue/fake-xrm-easy#16
+Removed .netcoreapp3.1 target framework in versions 2.x, it'll be supported from versions 3.x onwards.
+Bump Microsoft.CrmSdk.CoreAssemblies to version 9.0.2.27 to support plugin telemetry - DynamicsValue/fake-xrm-easy#24
 
+## [2.0.1-rc1] - Initial release

README.md

@@ -35,6 +35,6 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
 ## License
 -------------------
 
-Please see [LICENSE.txt](https://github.com/DynamicsValue/fake-xrm-easy/blob/main/LICENSE.txt).
+Please see [LICENSE.txt](https://github.com/DynamicsValue/fake-xrm-easy/blob/master/LICENSE.txt).
 
 License questions? Please see our [License FAQ](https://github.com/DynamicsValue/licence-agreements/blob/main/FakeXrmEasy/FAQ.md).

pack-configuration.ps1

@@ -1,6 +1,6 @@
 param (
     [string]$versionSuffix = "",
-    [string]$targetFrameworks = "net6.0",
+    [string]$targetFrameworks = "netcoreapp3.1",
     [string]$configuration = "FAKE_XRM_EASY_9",
     [string]$projectName = "FakeXrmEasy.Core",
     [string]$projectPath = "src/FakeXrmEasy.Core",

pack-push.ps1

@@ -1,7 +1,7 @@
 param (
     [string]$packageSource = "local-packages",
     [string]$versionSuffix = "",
-    [string]$targetFrameworks = "net6.0"
+    [string]$targetFrameworks = "netcoreapp3.1"
  )
 
 Write-Host "Running with versionSuffix '$($versionSuffix)'..."

pack-src.ps1

@@ -1,6 +1,6 @@
 param (
     [string]$versionSuffix = "",
-    [string]$targetFrameworks = "net6.0"
+    [string]$targetFrameworks = "netcoreapp3.1"
  )
 
 Write-Host "Running with versionSuffix '$($versionSuffix)'..."
@@ -13,12 +13,18 @@ $projectPath = "src/FakeXrmEasy.Core"
 
 Write-Host "Packing All Configurations for project $($projectName)" -ForegroundColor Green
 
-# ./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"
-
+ 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-tests.ps1

@@ -1,6 +1,6 @@
 param (
     [string]$versionSuffix = "",
-    [string]$targetFrameworks = "net6.0"
+    [string]$targetFrameworks = "netcoreapp3.1"
  )
 
 Write-Host "Running with versionSuffix '$($versionSuffix)'..."
@@ -13,11 +13,18 @@ $projectPath = "tests/FakeXrmEasy.Core.Tests"
 
 Write-Host "Packing All Configurations for project $($projectName)" -ForegroundColor Green
 
-# ./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"
-
+ 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

scripts-dotnet/GetAssemblyName.cs

@@ -1 +1 @@
-Console.WriteLine(System.Reflection.Assembly.LoadFile("/home/jordi/code/DynamicsValue/fake-xrm-easy-core/tests/FakeXrmEasy.Core.Tests/bin/FAKE_XRM_EASY_9/net6.0/FakeXrmEasy.Core.Tests.dll").FullName);
+Console.WriteLine(System.Reflection.Assembly.LoadFile("/home/jordi/code/DynamicsValue/fake-xrm-easy-core/tests/FakeXrmEasy.Core.Tests/bin/FAKE_XRM_EASY_9/netcoreapp3.1/FakeXrmEasy.Core.Tests.dll").FullName);