Merge branch '2x-dev' into 3x-improvements

DynamicsValue · Feb 14, 2024 · 9661778 · 9661778
2 parents 28f097e + 26a35c2
commit 9661778
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,16 @@
+## [3.4.1]
+
+### Changed
+
+- Fix for GetServiceProvider should return null for unsupported types - https://github.com/DynamicsValue/fake-xrm-easy/issues/127
+
 ## [3.4.0]
 
-## Added
+### Added
 
 - **Alpha**: Introduced subscription usage monitoring based on customer feedback
 
-## Changed
+### Changed
 
 - Set default build configuration in solution file to FAKE_XRM_EASY_9
 - build.ps1 improvements: do not build project twice (added --no-build) when running dotnet test, do not build again either when packing assemblies either: https://github.com/DynamicsValue/fake-xrm-easy/issues/119

diff --git a/performance/FakeXrmEasy.Plugins.Performance/FakeXrmEasy.Plugins.Performance.csproj b/performance/FakeXrmEasy.Plugins.Performance/FakeXrmEasy.Plugins.Performance.csproj
@@ -51,47 +51,47 @@
 
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v365" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v365" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.2-*" />
   </ItemGroup>
 
 
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2013'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v2013" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v2013" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2015'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v2015" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v2015" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2016'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v2016" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v2016" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_365'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v365" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v365" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_9'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v9" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v9" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='Debug'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v9" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v9" Version="3.4.1-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/FakeXrmEasy.Plugins/FakeXrmEasy.Plugins.csproj b/src/FakeXrmEasy.Plugins/FakeXrmEasy.Plugins.csproj
@@ -7,7 +7,7 @@
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">net6.0</TargetFrameworks>
     <PackageId>FakeXrmEasy.Plugins</PackageId>
-    <VersionPrefix>3.4.0</VersionPrefix>
+    <VersionPrefix>3.4.1</VersionPrefix>
     <Authors>Jordi Montaña</Authors>
     <Company>Dynamics Value</Company>
     <Title>FakeXrmEasy Plugins</Title>
@@ -70,23 +70,23 @@
 
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v365" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v365" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.2-*" />
   </ItemGroup>
 
   <Target Name="PreparePackageReleaseNotesFromFile" BeforeTargets="GenerateNuspec">

diff --git a/src/FakeXrmEasy.Plugins/XrmFakedPluginContextProperties.cs b/src/FakeXrmEasy.Plugins/XrmFakedPluginContextProperties.cs
@@ -143,7 +143,7 @@ public IServiceProvider GetServiceProvider(IPluginExecutionContext plugCtx)
                        return _entityDataSourceRetrieverService;
                    }
 #endif
-                   throw UnsupportedExceptionFactory.New(_context.LicenseContext.Value, "The specified service type is not supported");
+                   return null;
                });
 
             return fakedServiceProvider;

diff --git a/tests/FakeXrmEasy.Plugins.Tests/FakeXrmEasy.Plugins.Tests.csproj b/tests/FakeXrmEasy.Plugins.Tests/FakeXrmEasy.Plugins.Tests.csproj
@@ -10,7 +10,7 @@
     <IsPackable>true</IsPackable>
 
     <PackageId>FakeXrmEasy.PluginsTests</PackageId>
-    <VersionPrefix>3.4.0</VersionPrefix>
+    <VersionPrefix>3.4.1</VersionPrefix>
     <Authors>Jordi Montaña</Authors>
     <Company>Dynamics Value S.L.</Company>
     <Title>Internal Unit test suite for FakeXrmEasy.Plugins package</Title>
@@ -83,38 +83,38 @@
 
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v365" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v365" Version="3.4.2-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.4.0-*" />
-    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.2-*" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2013'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v2013" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v2013" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2015'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v2015" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v2015" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2016'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v2016" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v2016" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_365'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v365" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v365" Version="3.4.1-*" />
   </ItemGroup>
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_9'">
-    <PackageReference Include="FakeXrmEasy.Plugins.v9" Version="3.4.0-*" />
+    <PackageReference Include="FakeXrmEasy.Plugins.v9" Version="3.4.1-*" />
   </ItemGroup>
 </Project>
diff --git a/tests/FakeXrmEasy.Plugins.Tests/XrmFakedPluginContextPropertiesTests.cs b/tests/FakeXrmEasy.Plugins.Tests/XrmFakedPluginContextPropertiesTests.cs
@@ -52,13 +52,14 @@ public void Retrieving_The_TracingService_Twice_Should_Return_The_Same_Instance(
         }
 
         [Fact]
-        public void Should_return_unsupported_exception_when_getting_an_invalid_service()
+        public void Should_return_null_when_getting_an_invalid_service()
         {
             _context.PluginContextProperties = new XrmFakedPluginContextProperties(_context, _context.GetOrganizationService(), _context.GetTracingService());
 
             var serviceProvider = _context.PluginContextProperties.GetServiceProvider(_context.GetDefaultPluginContext());
-
-            Assert.Throws<OpenSourceUnsupportedException>(() => serviceProvider.GetService(typeof(XrmFakedPluginContextPropertiesTests)));
+            var service = serviceProvider.GetService(typeof(XrmFakedPluginContextPropertiesTests));
+
+            Assert.Null(service);
         }
 
         [Fact]