Skip to content

Commit dab25f4

Browse files
MattB-msftMattB-msft
authored
Merge pull request #497 from microsoft/release/update/250206111348
Minor bug fixes and dependency updates
2 parents 66b851b + e843b07 commit dab25f4

8 files changed

Lines changed: 33 additions & 11 deletions

‎src/GeneralTools/DataverseClient/Client/Builder/AbstractClientRequestBuilder.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,15 @@ internal OrganizationRequest BuildRequest(OrganizationRequest request)
135135
}
136136

137137
ParameterCollection parameters = new ParameterCollection();
138-
Guid requestTracker = _requestId ?? Guid.NewGuid();
139-
request.RequestId = requestTracker;
140-
138+
139+
if (_requestId != null)
140+
{
141+
request.RequestId = _requestId.Value;
142+
}
143+
else if (request.RequestId == null || request.RequestId == Guid.Empty)
144+
{
145+
request.RequestId = Guid.NewGuid();
146+
}
141147

142148
if (_correlationId != null)
143149
{

‎src/GeneralTools/DataverseClient/Client/Microsoft.PowerPlatform.Dataverse.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
3737
<PackageReference Include="Newtonsoft.Json" Version="$(PackageVersion_Newtonsoft)" />
3838
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(PackageVersion_SystemConfigurationConfigurationManager)" />
39-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
39+
<PackageReference Include="System.Formats.Asn1" Version="$(PackageVersion_System_Formats_Asn1)" />
4040
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_SystemTextJson)" />
4141
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="$(PackageVersion_MSAL)" />
4242
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(PackageVersion_Microsoft_Extensions)" />

‎src/GeneralTools/DataverseClient/Extensions/DynamicsExtension/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Xrm.Sdk" Version="$(PackageVersion_CdsSdk)" />
1717
<PackageReference Include="Microsoft.Crm.Sdk.Proxy" Version="$(PackageVersion_CrmProxy)" />
18-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
18+
<PackageReference Include="System.Formats.Asn1" Version="$(PackageVersion_System_Formats_Asn1)" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/GeneralTools/DataverseClient/Extensions/Microsoft.PowerPlatform.Dataverse.ServiceClientConverter/Microsoft.PowerPlatform.Dataverse.ServiceClientConverter.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.CrmSdk.XrmTooling.CoreAssembly" Version="9.1.*" />
1818
<PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="1.*" />
19+
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_SystemTextJson)" />
1920
</ItemGroup>
2021
</Project>

‎src/Packages.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- This file is used for controling versions of packages for projects in this repo, it is also used to populate dependnaices in Nuspec files.-->
33
<PropertyGroup Label="Package versions">
44
<PackageVersion_Adal>3.19.8</PackageVersion_Adal>
5-
<PackageVersion_MSAL>4.61.3</PackageVersion_MSAL>
6-
<PackageVersion_CdsSdk>9.2.24073.11611-master</PackageVersion_CdsSdk>
7-
<PackageVersion_CrmProxy>9.2.24073.11611-master</PackageVersion_CrmProxy>
5+
<PackageVersion_MSAL>4.66.1</PackageVersion_MSAL>
6+
<PackageVersion_CdsSdk>9.2.25021.14828-master</PackageVersion_CdsSdk>
7+
<PackageVersion_CrmProxy>9.2.25021.14828-master</PackageVersion_CrmProxy>
88
<PackageVersion_Newtonsoft>13.0.1</PackageVersion_Newtonsoft>
99
<PackageVersion_RestClientRuntime>2.3.24</PackageVersion_RestClientRuntime>
1010
<PackageVersion_XrmSdk>9.0.2.56</PackageVersion_XrmSdk>
@@ -14,14 +14,15 @@
1414
<PackageVersion_CoverletCollector>3.1.0</PackageVersion_CoverletCollector>
1515
<PackageVersion_Microsoft_Extensions>3.1.8</PackageVersion_Microsoft_Extensions>
1616
<PackageVersion_SystemRuntime>6.0.0</PackageVersion_SystemRuntime>
17-
<PackageVersion_SystemTextJson>8.0.4</PackageVersion_SystemTextJson>
17+
<PackageVersion_SystemTextJson>8.0.5</PackageVersion_SystemTextJson>
1818
<PackageVersion_SystemTextEncodingsWeb>7.0.0</PackageVersion_SystemTextEncodingsWeb>
1919
<PackageVersion_SystemMemory>4.5.5</PackageVersion_SystemMemory>
2020
<PackageVersion_SystemConfigurationConfigurationManager>6.0.0</PackageVersion_SystemConfigurationConfigurationManager>
2121
<PackageVersion_SystemSecurityPermissions>6.0.0</PackageVersion_SystemSecurityPermissions>
22-
<PackageVersion_Azure_Identity>1.12.0</PackageVersion_Azure_Identity>
22+
<PackageVersion_Azure_Identity>1.13.1</PackageVersion_Azure_Identity>
2323
<PackageVersion_System_ServiceModel_PreNet6>4.10.3</PackageVersion_System_ServiceModel_PreNet6>
2424
<PackageVersion_System_ServiceModel_PostNet6>6.2.0</PackageVersion_System_ServiceModel_PostNet6>
25+
<PackageVersion_System_Formats_Asn1>8.0.1</PackageVersion_System_Formats_Asn1>
2526

2627
<!-- Test: -->
2728
<PackageVersion_MicrosoftNETTestSdk>17.5.0</PackageVersion_MicrosoftNETTestSdk>

‎src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.AzAuth.ReleaseNotes.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Notice:
33
This package is intended to work with .net full framework 4.6.2, 4.7.2 and 4.8, and .net 6.0
44

55
++CURRENTRELEASEID++
6+
Dependency changes:
7+
Azure.Identity updated to 1.31.1
8+
9+
1.1.10:
610
Initial release
711
Provides an extension to the Dataverse ServiceClient to support authenticating with the Azure.Core DefaultAzureCredential flow.
812

‎src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.ReleaseNotes.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Notice:
33
This package is intended to work with .net full framework 4.6.2, 4.7.2 and 4.8, and .net 6.0
44

55
++CURRENTRELEASEID++
6+
7+
68
removed support for .net 3.1 and .net 5.0.
79

810
1.0.39:

‎src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@ Notice:
77
Note: Only AD on FullFramework, OAuth, Certificate, ClientSecret Authentication types are supported at this time.
88

99
++CURRENTRELEASEID++
10+
RequestId on OrganizationRequest is not overridden by random Guid if present. RequestId from ClientRequestBuilder still takes precedence over OrganizationRequest.RequestId
11+
Dependency changes:
12+
Microsoft.Identity.Client updated to 4.66.1
13+
System.Text.Json updated to 8.0.5
14+
Azure.Identity updated to 1.31.1
15+
16+
17+
1.2.2:
1018
***** POSSIBLE Breaking Changes *****
1119
Minor Release Bump,
1220
Added .net 8.0 Target.
1321
.net 6.0 Target will be removed in a subsequent release.
14-
Removed dependance on Microsoft.Rest.Client. this was primary used for exception handling, and the necessary components have been reworked in to DVSC Exception management classes.
22+
Removed dependence on Microsoft.Rest.Client. this was primary used for exception handling, and the necessary components have been reworked in to DVSC Exception management classes.
1523

1624
Fix memory consumption when too many exception are throw by DV client. Git: https://github.com/microsoft/PowerPlatform-DataverseServiceClient/issues/474
1725
Dependency Changes:

0 commit comments

Comments
 (0)