Adding missing configurations and update build scripts to due with du…

…plicate Core dependency
DynamicsValue · Sep 12, 2024 · 747380a · 747380a
1 parent ab647e2
commit 747380a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/FakeXrmEasy.Core.sln b/FakeXrmEasy.Core.sln
@@ -153,6 +153,10 @@ Global
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_9|x64.Build.0 = FAKE_XRM_EASY_9|Any CPU
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_9|x86.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_9|x86.Build.0 = FAKE_XRM_EASY_9|Any CPU
+		{0924D408-0AC0-4184-BF73-8DCBE14A7D69}.FAKE_XRM_EASY_9|Any CPU.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
+		{0924D408-0AC0-4184-BF73-8DCBE14A7D69}.FAKE_XRM_EASY_9|Any CPU.Build.0 = FAKE_XRM_EASY_9|Any CPU
+		{73CC2217-C43C-459B-8625-C130F141A645}.FAKE_XRM_EASY_9|Any CPU.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
+		{73CC2217-C43C-459B-8625-C130F141A645}.FAKE_XRM_EASY_9|Any CPU.Build.0 = FAKE_XRM_EASY_9|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/pack-configuration.ps1 b/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
     }
 }
 

diff --git a/src/FakeXrmEasy.Integration/FakeXrmEasy.Integration.csproj b/src/FakeXrmEasy.Integration/FakeXrmEasy.Integration.csproj
@@ -97,7 +97,7 @@
         <Reference Include="System.ServiceModel" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(PackTests)' == ''">
+    <ItemGroup Condition="'$(IsPacking)' == ''">
         <ProjectReference Include="..\FakeXrmEasy.Core\FakeXrmEasy.Core.csproj" />
     </ItemGroup>
 
@@ -107,27 +107,27 @@
 
     <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
         <PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.6.0-*,3.0)" />
-        <PackageReference Include="FakeXrmEasy.Core.v2011" Version="[2.6.0-*,3.0)" />
+        <PackageReference Condition="'$(IsPacking)' == 'true'" Include="FakeXrmEasy.Core.v2011" Version="[2.6.0-*,3.0)" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
         <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.6.0-*,3.0)" />
-        <PackageReference Include="FakeXrmEasy.Core.v2013" Version="[2.6.0-*,3.0)" />
+        <PackageReference Condition="'$(IsPacking)' == 'true'" Include="FakeXrmEasy.Core.v2013" Version="[2.6.0-*,3.0)" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
         <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.6.0-*,3.0)" />
-        <PackageReference Include="FakeXrmEasy.Core.v2015" Version="[2.6.0-*,3.0)" />
+        <PackageReference Condition="'$(IsPacking)' == 'true'" Include="FakeXrmEasy.Core.v2015" Version="[2.6.0-*,3.0)" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
         <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.6.0-*,3.0)" />
-        <PackageReference Include="FakeXrmEasy.Core.v2016" Version="[2.6.0-*,3.0)" />
+        <PackageReference Condition="'$(IsPacking)' == 'true'" Include="FakeXrmEasy.Core.v2016" Version="[2.6.0-*,3.0)" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
         <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.6.0-*,3.0)" />
-        <PackageReference Include="FakeXrmEasy.Core.v365" Version="[2.6.0-*,3.0)" />
+        <PackageReference Condition="'$(IsPacking)' == 'true'" Include="FakeXrmEasy.Core.v365" Version="[2.6.0-*,3.0)" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
         <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.6.0-*,3.0)" />
-        <PackageReference Include="FakeXrmEasy.Core.v9" Version="[2.6.0-*,3.0)" />
+        <PackageReference Condition="'$(IsPacking)' == 'true'" Include="FakeXrmEasy.Core.v9" Version="[2.6.0-*,3.0)" />
     </ItemGroup>
 
     <Target Name="PreparePackageReleaseNotesFromFile" BeforeTargets="GenerateNuspec">

diff --git a/tests/FakeXrmEasy.Integration.Tests/FakeXrmEasy.Integration.Tests.csproj b/tests/FakeXrmEasy.Integration.Tests/FakeXrmEasy.Integration.Tests.csproj
@@ -134,6 +134,7 @@
 
   <ItemGroup Condition="'$(PackTests)' == ''">
     <ProjectReference Include="..\..\src\FakeXrmEasy.Core\FakeXrmEasy.Core.csproj" />
+    <ProjectReference Include="..\..\src\FakeXrmEasy.Integration\FakeXrmEasy.Integration.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY'">

diff --git a/tests/FakeXrmEasy.Integration.Tests/FakeXrmEasyTestsBase.cs b/tests/FakeXrmEasy.Integration.Tests/FakeXrmEasyTestsBase.cs
@@ -0,0 +1,19 @@
+using FakeXrmEasy.Abstractions;
+using FakeXrmEasy.Abstractions.Enums;
+using FakeXrmEasy.Middleware;
+using Microsoft.Xrm.Sdk;
+
+namespace FakeXrmEasy.Core.Tests
+{
+    public class FakeXrmEasyTestsBase
+    {
+        protected readonly IXrmFakedContext _context;
+        protected readonly IOrganizationService _service;
+
+        protected FakeXrmEasyTestsBase()
+        {
+            _context = XrmFakedContextFactory.New(FakeXrmEasyLicense.RPL_1_5);
+            _service = _context.GetOrganizationService();
+        }
+    }
+}