Remove FAKE_XRM_EASY config (2011) in 3x branch

DynamicsValue · Jan 24, 2025 · 1bd82c0 · 1bd82c0
1 parent 57ef564
commit 1bd82c0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 47 deletions.
diff --git a/FakeXrmEasy.Core.sln b/FakeXrmEasy.Core.sln
@@ -36,9 +36,6 @@ Global
 		FAKE_XRM_EASY_365|Any CPU = FAKE_XRM_EASY_365|Any CPU
 		FAKE_XRM_EASY_365|x64 = FAKE_XRM_EASY_365|x64
 		FAKE_XRM_EASY_365|x86 = FAKE_XRM_EASY_365|x86
-		FAKE_XRM_EASY|Any CPU = FAKE_XRM_EASY|Any CPU
-		FAKE_XRM_EASY|x64 = FAKE_XRM_EASY|x64
-		FAKE_XRM_EASY|x86 = FAKE_XRM_EASY|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_9|Any CPU.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
@@ -71,12 +68,6 @@ Global
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_365|x64.Build.0 = FAKE_XRM_EASY_365|Any CPU
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_365|x86.ActiveCfg = FAKE_XRM_EASY_365|Any CPU
 		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY_365|x86.Build.0 = FAKE_XRM_EASY_365|Any CPU
-		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY|Any CPU.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY|Any CPU.Build.0 = FAKE_XRM_EASY|Any CPU
-		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY|x64.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY|x64.Build.0 = FAKE_XRM_EASY|Any CPU
-		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY|x86.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{CE7EE93C-E98A-4AE7-AE84-B4FA7CEB49FE}.FAKE_XRM_EASY|x86.Build.0 = FAKE_XRM_EASY|Any CPU
 		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY_2013|Any CPU.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
 		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY_2013|Any CPU.Build.0 = FAKE_XRM_EASY_2013|Any CPU
 		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY_2013|x64.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
@@ -107,20 +98,8 @@ Global
 		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY_9|x64.Build.0 = FAKE_XRM_EASY_9|Any CPU
 		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY_9|x86.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
 		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY_9|x86.Build.0 = FAKE_XRM_EASY_9|Any CPU
-		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY|Any CPU.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY|Any CPU.Build.0 = FAKE_XRM_EASY|Any CPU
-		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY|x64.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY|x64.Build.0 = FAKE_XRM_EASY|Any CPU
-		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY|x86.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{E7FD9BE3-5CD1-4B50-A23E-53EA1AE2EBB8}.FAKE_XRM_EASY|x86.Build.0 = FAKE_XRM_EASY|Any CPU
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_9|Any CPU.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_9|Any CPU.Build.0 = FAKE_XRM_EASY_9|Any CPU
-		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY|Any CPU.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY|Any CPU.Build.0 = FAKE_XRM_EASY|Any CPU
-		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY|x64.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY|x64.Build.0 = FAKE_XRM_EASY|Any CPU
-		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY|x86.ActiveCfg = FAKE_XRM_EASY|Any CPU
-		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY|x86.Build.0 = FAKE_XRM_EASY|Any CPU
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_2013|Any CPU.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_2013|Any CPU.Build.0 = FAKE_XRM_EASY_2013|Any CPU
 		{7638E014-9149-4125-860F-D478CFD36C06}.FAKE_XRM_EASY_2013|x64.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU

diff --git a/pack-src-project.ps1 b/pack-src-project.ps1
@@ -18,7 +18,6 @@ Write-Host "Packing All Configurations for project $($projectName)" -ForegroundC
     ./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"

diff --git a/pack-tests-project.ps1 b/pack-tests-project.ps1
@@ -18,7 +18,6 @@ Write-Host "Packing All Configurations for project $($projectName)" -ForegroundC
     ./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"

diff --git a/src/FakeXrmEasy.Core/FakeXrmEasy.Core.csproj b/src/FakeXrmEasy.Core/FakeXrmEasy.Core.csproj
@@ -6,7 +6,6 @@
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY'">net6.0</TargetFrameworks>
     <PackageId>FakeXrmEasy.Core</PackageId>
     <VersionPrefix>3.6.0</VersionPrefix>
     <Authors>Jordi Montaña</Authors>
@@ -19,7 +18,7 @@
     <PackageIcon>FakeXrmEasyLogo_128x128.png</PackageIcon>
     <PackageTags>dynamics;crm;365;unit testing;xrm;mock;mocking;fake;fakes;cds;common data service;power platform;fakexrmeasy</PackageTags>
     <RepositoryUrl>https://github.com/DynamicsValue/fake-xrm-easy-core</RepositoryUrl>
-    <Configurations>FAKE_XRM_EASY_9;FAKE_XRM_EASY_365;FAKE_XRM_EASY_2016;FAKE_XRM_EASY_2015;FAKE_XRM_EASY_2013;FAKE_XRM_EASY</Configurations>
+    <Configurations>FAKE_XRM_EASY_9;FAKE_XRM_EASY_365;FAKE_XRM_EASY_2016;FAKE_XRM_EASY_2015;FAKE_XRM_EASY_2013;</Configurations>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>..\..\fakexrmeasy.snk</AssemblyOriginatorKeyFile>
 		<SignAssembly>True</SignAssembly>
@@ -31,10 +30,6 @@
     <None Include="../../LICENSE.txt" Pack="true" PackagePath="$(PackageLicenseFile)" />
     <None Include="../../FakeXrmEasyLogo_128x128.png" Pack="true" PackagePath="/" />
   </ItemGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
-    <DefineConstants>DEBUG;TRACE;FAKE_XRM_EASY;FXE_V2</DefineConstants>
-  </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <DefineConstants>DEBUG;TRACE;FAKE_XRM_EASY_2013;FXE_V2</DefineConstants>
@@ -68,10 +63,7 @@
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="[6.0.0,7.0)" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="3.6.0-*" />
-  </ItemGroup>
+
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="3.6.0-*" />
   </ItemGroup>

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeXrmEasy.Core.Tests.csproj b/tests/FakeXrmEasy.Core.Tests/FakeXrmEasy.Core.Tests.csproj
@@ -6,7 +6,6 @@
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY'">net6.0</TargetFrameworks>
 
     <IsPackable>true</IsPackable>
 
@@ -23,7 +22,7 @@
     <PackageTags>dynamics;crm;365;unit testing;xrm;mock;mocking;fake;fakes;cds;common data service;power platform</PackageTags>
     <RepositoryUrl>https://github.com/DynamicsValue/fake-xrm-easy-core</RepositoryUrl>
 
-    <Configurations>FAKE_XRM_EASY_9;FAKE_XRM_EASY_365;FAKE_XRM_EASY_2016;FAKE_XRM_EASY_2015;FAKE_XRM_EASY_2013;FAKE_XRM_EASY</Configurations>
+    <Configurations>FAKE_XRM_EASY_9;FAKE_XRM_EASY_365;FAKE_XRM_EASY_2016;FAKE_XRM_EASY_2015;FAKE_XRM_EASY_2013;</Configurations>
 
     <AssemblyOriginatorKeyFile>..\..\fakexrmeasy.snk</AssemblyOriginatorKeyFile>
 		<SignAssembly>True</SignAssembly>
@@ -35,10 +34,6 @@
     <None Include="../../FakeXrmEasyLogo_128x128.png" Pack="true" PackagePath="/" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
-    <DefineConstants>DEBUG;TRACE;FAKE_XRM_EASY;FXE_V2</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <DefineConstants>DEBUG;TRACE;FAKE_XRM_EASY_2013;FXE_V2</DefineConstants>
   </PropertyGroup>
@@ -80,10 +75,7 @@
     <PackageReference Include="xunit.runner.console" Version="2.4.1" />
     <PackageReference Include="coverlet.collector" Version="1.2.1" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="3.6.0-*" />
-  </ItemGroup>
+
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="3.6.0-*" />
   </ItemGroup>
@@ -106,10 +98,7 @@
   <ItemGroup Condition="'$(PackTests)' == ''">
     <ProjectReference Include="..\..\src\FakeXrmEasy.Core\FakeXrmEasy.Core.csproj" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY'">
-    <PackageReference Include="FakeXrmEasy.Core.v2011" Version="3.6.0-*" />
-  </ItemGroup>
+
   <ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2013'">
     <PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.6.0-*" />
   </ItemGroup>