Skip to content

Commit

Permalink
Merge branch '2x-dev' into 3x-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
jordimontana82 committed Feb 4, 2024
2 parents ca15610 + 4791114 commit 2b6bf98
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 88 deletions.
9 changes: 9 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
**What issue does this PR address?**


**Important: Any code or remarks in your Pull Request are under the following terms:**

You acknowledge and agree that by submitting a request or making any code, comment, remark, feedback, enhancements, or modifications proposed or suggested by You in your pull request, You are deemed to accept the terms of our [Contributor License Agreement (CLA)](https://github.com/DynamicsValue/licence-agreements/blob/main/FakeXrmEasy/CLA.md).

Please follow the instructions provided by the bot.

14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## [3.4.0]

## Added

- **Alpha**: Introduced subscription usage monitoring based on customer feedback

### Changed

- Set default build configuration in solution file to FAKE_XRM_EASY_9
- Remove ReleaseNotes from package description - https://github.com/DynamicsValue/fake-xrm-easy/issues/115
- 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
- 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]

### Changed
Expand Down
48 changes: 9 additions & 39 deletions FakeXrmEasy.Messages.sln
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|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
Expand All @@ -33,23 +33,17 @@ 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_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|Any CPU = FAKE_XRM_EASY|Any CPU
FAKE_XRM_EASY|x64 = FAKE_XRM_EASY|x64
FAKE_XRM_EASY|x86 = FAKE_XRM_EASY|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Debug|x64.ActiveCfg = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Debug|x64.Build.0 = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Debug|x86.ActiveCfg = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Debug|x86.Build.0 = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|Any CPU.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|Any CPU.Build.0 = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x64.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x64.Build.0 = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x86.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x86.Build.0 = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_2013|Any CPU.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_2013|Any CPU.Build.0 = FAKE_XRM_EASY_2013|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_2013|x64.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
Expand All @@ -74,30 +68,12 @@ Global
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_365|x64.Build.0 = FAKE_XRM_EASY_365|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_365|x86.ActiveCfg = FAKE_XRM_EASY_365|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_365|x86.Build.0 = FAKE_XRM_EASY_365|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|Any CPU.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|Any CPU.Build.0 = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x64.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x64.Build.0 = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x86.ActiveCfg = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY_9|x86.Build.0 = FAKE_XRM_EASY_9|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY|Any CPU.ActiveCfg = FAKE_XRM_EASY|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY|Any CPU.Build.0 = FAKE_XRM_EASY|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY|x64.ActiveCfg = FAKE_XRM_EASY|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY|x64.Build.0 = FAKE_XRM_EASY|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY|x86.ActiveCfg = FAKE_XRM_EASY|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.FAKE_XRM_EASY|x86.Build.0 = FAKE_XRM_EASY|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Release|Any CPU.Build.0 = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Release|x64.ActiveCfg = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Release|x64.Build.0 = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Release|x86.ActiveCfg = Debug|Any CPU
{DACCCFB6-3757-4F7B-9DE7-D2F0E8B4EE2B}.Release|x86.Build.0 = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Debug|x64.ActiveCfg = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Debug|x64.Build.0 = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Debug|x86.ActiveCfg = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Debug|x86.Build.0 = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.FAKE_XRM_EASY_2013|Any CPU.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.FAKE_XRM_EASY_2013|Any CPU.Build.0 = FAKE_XRM_EASY_2013|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.FAKE_XRM_EASY_2013|x64.ActiveCfg = FAKE_XRM_EASY_2013|Any CPU
Expand Down Expand Up @@ -134,12 +110,6 @@ Global
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.FAKE_XRM_EASY|x64.Build.0 = FAKE_XRM_EASY|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.FAKE_XRM_EASY|x86.ActiveCfg = FAKE_XRM_EASY|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.FAKE_XRM_EASY|x86.Build.0 = FAKE_XRM_EASY|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Release|Any CPU.Build.0 = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Release|x64.ActiveCfg = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Release|x64.Build.0 = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Release|x86.ActiveCfg = Debug|Any CPU
{3D9C367A-B497-4D80-A81E-7F60EEAA85A0}.Release|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion build-push-local.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

param (
[string]$targetFrameworks = "net6.0"
[string]$targetFrameworks = "all"
)


Expand Down
6 changes: 3 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
param (
[string]$targetFrameworks = "net6.0",
[string]$targetFrameworks = "all",
[string]$configuration = "FAKE_XRM_EASY_9",
[string]$packTests = ""
)
Expand Down Expand Up @@ -63,12 +63,12 @@ if(!($LASTEXITCODE -eq 0)) {

if($targetFrameworks -eq "all")
{
dotnet test --configuration $configuration --no-restore --verbosity normal /p:PackTests=$packTests --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
dotnet test --configuration $configuration --no-build --verbosity normal /p:PackTests=$packTests --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage

}
else
{
dotnet test --configuration $configuration --no-restore --framework $targetFrameworks --verbosity normal /p:PackTests=$packTests --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
dotnet test --configuration $configuration --no-build --framework $targetFrameworks --verbosity normal /p:PackTests=$packTests --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
}

if(!($LASTEXITCODE -eq 0)) {
Expand Down
8 changes: 4 additions & 4 deletions pack-configuration.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ if($targetFrameworks -eq "all")
{
if($versionSuffix -eq "")
{
dotnet pack --no-build --no-restore --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 -o $tempNupkgFolder $projectPath/$projectName.csproj
}
else {
dotnet pack --no-build --no-restore --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 -o $tempNupkgFolder $projectPath/$projectName.csproj --version-suffix $versionSuffix
}
}
else
{
if($versionSuffix -eq "")
{
dotnet pack --no-build --no-restore --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:TargetFrameworks=$targetFrameworks -o $tempNupkgFolder $projectPath/$projectName.csproj
}
else {
dotnet pack --no-build --no-restore --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:TargetFrameworks=$targetFrameworks -o $tempNupkgFolder $projectPath/$projectName.csproj --version-suffix $versionSuffix
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

namespace FakeXrmEasy.FakeMessageExecutors
{
/// <summary>
/// Implements a fake OrganizationRequest for AddMembersTeamRequest
/// </summary>
public class AddMembersTeamRequestExecutor : IFakeMessageExecutor
{
/// <summary>
Expand Down
36 changes: 16 additions & 20 deletions src/FakeXrmEasy.Messages/FakeXrmEasy.Messages.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY'">net6.0</TargetFrameworks>
<PackageId>FakeXrmEasy.Messages</PackageId>
<VersionPrefix>3.3.3</VersionPrefix>
<VersionPrefix>3.4.0</VersionPrefix>
<Authors>Jordi Montaña</Authors>
<Company>Dynamics Value</Company>
<Title>FakeXrmEasy Messages</Title>
Expand All @@ -19,7 +19,7 @@
<PackageReleaseNotes>Please write release notes in CHANGELOG.md</PackageReleaseNotes>
<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-messages</RepositoryUrl>
<Configurations>Debug;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;FAKE_XRM_EASY</Configurations>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyOriginatorKeyFile>..\..\fakexrmeasy.snk</AssemblyOriginatorKeyFile>
<SignAssembly>True</SignAssembly>
Expand Down Expand Up @@ -70,32 +70,32 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
<PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Core.v2011" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="3.4.0-*" />
<PackageReference Include="FakeXrmEasy.Core.v2011" Version="3.4.0-*" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
<PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="3.4.0-*" />
<PackageReference Include="FakeXrmEasy.Core.v2013" Version="3.4.0-*" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
<PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="3.4.0-*" />
<PackageReference Include="FakeXrmEasy.Core.v2015" Version="3.4.0-*" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
<PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="3.4.0-*" />
<PackageReference Include="FakeXrmEasy.Core.v2016" Version="3.4.0-*" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
<PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Core.v365" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="3.4.0-*" />
<PackageReference Include="FakeXrmEasy.Core.v365" Version="3.4.0-*" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Core.v9" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.4.0-*" />
<PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.0-*" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Debug'">
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Core.v9" Version="3.3.3-*" />
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="3.4.0-*" />
<PackageReference Include="FakeXrmEasy.Core.v9" Version="3.4.0-*" />
</ItemGroup>

<Target Name="PreparePackageReleaseNotesFromFile" BeforeTargets="GenerateNuspec">
Expand All @@ -107,10 +107,6 @@
<PropertyGroup>
<PackageDescription>
This package contains implemented default fake messages.

RELEASE NOTES
------------------
@(ReleaseNoteLines, '%0a')
</PackageDescription>
<PackageReleaseNotes>@(ReleaseNoteLines, '%0a')</PackageReleaseNotes>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 2b6bf98

Please sign in to comment.