Skip to content

Commit 0bfce39

Browse files
jordimontana82jordimontana82
authored
Merge pull request #19 from DynamicsValue/2x-dev
Push into Nuget
2 parents e24772a + fec9747 commit 0bfce39

File tree

5 files changed

+41
-81
lines changed

5 files changed

+41
-81
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1+
## [2.6.0]
2+
3+
### Changed
4+
5+
- Updated dependencies to 2.6.x
6+
17
## [2.5.0]
28

3-
## Changed
9+
### Changed
410

511
- Update package dependencies
612

713
## [2.4.0]
814

9-
## Added
15+
### Added
1016

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

13-
## Changed
19+
### Changed
1420

1521
- Set default build configuration in solution file to FAKE_XRM_EASY_9
1622
- 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

‎src/FakeXrmEasy.CodeActivities/FakeXrmEasy.CodeActivities.csproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">net452</TargetFrameworks>
99
<TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY'">net452</TargetFrameworks>
1010
<PackageId>FakeXrmEasy.CodeActivities</PackageId>
11-
<VersionPrefix>2.5.0</VersionPrefix>
11+
<VersionPrefix>2.6.0</VersionPrefix>
1212
<Authors>Jordi Montaña</Authors>
1313
<Company>Dynamics Value</Company>
1414
<Title>FakeXrmEasy CodeActivities</Title>
@@ -102,28 +102,28 @@
102102
</ItemGroup>
103103

104104
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
105-
<PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.5.0-*, 3.0)" />
106-
<PackageReference Include="FakeXrmEasy.Core.v2011" Version="[2.5.0-*, 3.0)" />
105+
<PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.6.0-*, 3.0)" />
106+
<PackageReference Include="FakeXrmEasy.Core.v2011" Version="[2.6.0-*, 3.0)" />
107107
</ItemGroup>
108108
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
109-
<PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.5.0-*, 3.0)" />
110-
<PackageReference Include="FakeXrmEasy.Core.v2013" Version="[2.5.0-*, 3.0)" />
109+
<PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.6.0-*, 3.0)" />
110+
<PackageReference Include="FakeXrmEasy.Core.v2013" Version="[2.6.0-*, 3.0)" />
111111
</ItemGroup>
112112
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
113-
<PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.5.0-*, 3.0)" />
114-
<PackageReference Include="FakeXrmEasy.Core.v2015" Version="[2.5.0-*, 3.0)" />
113+
<PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.6.0-*, 3.0)" />
114+
<PackageReference Include="FakeXrmEasy.Core.v2015" Version="[2.6.0-*, 3.0)" />
115115
</ItemGroup>
116116
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
117-
<PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.5.0-*, 3.0)" />
118-
<PackageReference Include="FakeXrmEasy.Core.v2016" Version="[2.5.0-*, 3.0)" />
117+
<PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.6.0-*, 3.0)" />
118+
<PackageReference Include="FakeXrmEasy.Core.v2016" Version="[2.6.0-*, 3.0)" />
119119
</ItemGroup>
120120
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
121-
<PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.5.0-*, 3.0)" />
122-
<PackageReference Include="FakeXrmEasy.Core.v365" Version="[2.5.0-*, 3.0)" />
121+
<PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.6.0-*, 3.0)" />
122+
<PackageReference Include="FakeXrmEasy.Core.v365" Version="[2.6.0-*, 3.0)" />
123123
</ItemGroup>
124124
<ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
125-
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.5.0-*, 3.0)" />
126-
<PackageReference Include="FakeXrmEasy.Core.v9" Version="[2.5.0-*, 3.0)" />
125+
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.6.0-*, 3.0)" />
126+
<PackageReference Include="FakeXrmEasy.Core.v9" Version="[2.6.0-*, 3.0)" />
127127
</ItemGroup>
128128
<ItemGroup>
129129
<Reference Include="System.Activities" />

‎tests/FakeXrmEasy.CodeActivities.Tests/CodeActivitiesForTesting/AddActivity.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ protected override void Execute(CodeActivityContext executionContext)
1717
IOrganizationService service =
1818
serviceFactory.CreateOrganizationService(context.UserId);
1919

20-
var tracing = (ITracingService)executionContext.GetExtension<ITracingService>();
21-
tracing.Trace("{ title: \"Complex message\", description: \"That could brake Formatter if not treated carefully\" }");
22-
2320
// Retrieve the summands and perform addition
2421
this.result.Set(executionContext,
2522
this.firstSummand.Get(executionContext) +

‎tests/FakeXrmEasy.CodeActivities.Tests/FakeXrmEasy.CodeActivities.Tests.csproj

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<IsPackable>true</IsPackable>
1212

1313
<PackageId>FakeXrmEasy.CodeActivitiesTests</PackageId>
14-
<VersionPrefix>2.5.0</VersionPrefix>
14+
<VersionPrefix>2.6.0</VersionPrefix>
1515
<Authors>Jordi Montaña</Authors>
1616
<Company>Dynamics Value S.L.</Company>
1717
<Title>Internal Unit test suite for FakeXrmEasy.CodeActivities package</Title>
@@ -110,34 +110,34 @@
110110
</ItemGroup>
111111

112112
<ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY'">
113-
<PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.5.0-*, 3.0)" />
114-
<PackageReference Include="FakeXrmEasy.Core.v2011" Version="[2.5.0-*, 3.0)" />
115-
<PackageReference Include="FakeXrmEasy.CodeActivities.v2011" Version="[2.5.0-*, 3.0)" />
113+
<PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.6.0-*, 3.0)" />
114+
<PackageReference Include="FakeXrmEasy.Core.v2011" Version="[2.6.0-*, 3.0)" />
115+
<PackageReference Include="FakeXrmEasy.CodeActivities.v2011" Version="[2.6.0-*, 3.0)" />
116116
</ItemGroup>
117117
<ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2013'">
118-
<PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.5.0-*, 3.0)" />
119-
<PackageReference Include="FakeXrmEasy.Core.v2013" Version="[2.5.0-*, 3.0)" />
120-
<PackageReference Include="FakeXrmEasy.CodeActivities.v2013" Version="[2.5.0-*, 3.0)" />
118+
<PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.6.0-*, 3.0)" />
119+
<PackageReference Include="FakeXrmEasy.Core.v2013" Version="[2.6.0-*, 3.0)" />
120+
<PackageReference Include="FakeXrmEasy.CodeActivities.v2013" Version="[2.6.0-*, 3.0)" />
121121
</ItemGroup>
122122
<ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2015'">
123-
<PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.5.0-*, 3.0)" />
124-
<PackageReference Include="FakeXrmEasy.Core.v2015" Version="[2.5.0-*, 3.0)" />
125-
<PackageReference Include="FakeXrmEasy.CodeActivities.v2015" Version="[2.5.0-*, 3.0)" />
123+
<PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.6.0-*, 3.0)" />
124+
<PackageReference Include="FakeXrmEasy.Core.v2015" Version="[2.6.0-*, 3.0)" />
125+
<PackageReference Include="FakeXrmEasy.CodeActivities.v2015" Version="[2.6.0-*, 3.0)" />
126126
</ItemGroup>
127127
<ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_2016'">
128-
<PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.5.0-*, 3.0)" />
129-
<PackageReference Include="FakeXrmEasy.Core.v2016" Version="[2.5.0-*, 3.0)" />
130-
<PackageReference Include="FakeXrmEasy.CodeActivities.v2016" Version="[2.5.0-*, 3.0)" />
128+
<PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.6.0-*, 3.0)" />
129+
<PackageReference Include="FakeXrmEasy.Core.v2016" Version="[2.6.0-*, 3.0)" />
130+
<PackageReference Include="FakeXrmEasy.CodeActivities.v2016" Version="[2.6.0-*, 3.0)" />
131131
</ItemGroup>
132132
<ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_365'">
133-
<PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.5.0-*, 3.0)" />
134-
<PackageReference Include="FakeXrmEasy.Core.v365" Version="[2.5.0-*, 3.0)" />
135-
<PackageReference Include="FakeXrmEasy.CodeActivities.v365" Version="[2.5.0-*, 3.0)" />
133+
<PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.6.0-*, 3.0)" />
134+
<PackageReference Include="FakeXrmEasy.Core.v365" Version="[2.6.0-*, 3.0)" />
135+
<PackageReference Include="FakeXrmEasy.CodeActivities.v365" Version="[2.6.0-*, 3.0)" />
136136
</ItemGroup>
137137
<ItemGroup Condition="'$(PackTests)' == 'true' And '$(Configuration)'=='FAKE_XRM_EASY_9'">
138-
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.5.0-*, 3.0)" />
139-
<PackageReference Include="FakeXrmEasy.Core.v9" Version="[2.5.0-*, 3.0)" />
140-
<PackageReference Include="FakeXrmEasy.CodeActivities.v9" Version="[2.5.0-*, 3.0)" />
138+
<PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.6.0-*, 3.0)" />
139+
<PackageReference Include="FakeXrmEasy.Core.v9" Version="[2.6.0-*, 3.0)" />
140+
<PackageReference Include="FakeXrmEasy.CodeActivities.v9" Version="[2.6.0-*, 3.0)" />
141141
</ItemGroup>
142142

143143
<ItemGroup>

‎tests/FakeXrmEasy.CodeActivities.Tests/XrmRealContextTests.cs

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)