Skip to content

Commit 447f9dc

Browse files
authored
Merge pull request #393 from microsoft/release/update/230824112722
Updates to pick up new SDK bits and fix a bug in exception decode.
2 parents 90998e3 + 30b9957 commit 447f9dc

File tree

8 files changed

+29
-35
lines changed

8 files changed

+29
-35
lines changed

src/Build.Common.StandardAndLegacy.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
13-
<DotNetClassicTargetFrameworks>net462;net472;net48;</DotNetClassicTargetFrameworks>
1413
<Features>IOperation</Features>
1514
</PropertyGroup>
1615

src/Build.Shared.props

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,6 @@
55

66
<!-- msbuild properties shared for dotnetCore and .NET classic projects: -->
77
<PropertyGroup>
8-
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
9-
<PackageVersion_Adal>3.19.8</PackageVersion_Adal>
10-
<PackageVersion_MSAL>4.35.1</PackageVersion_MSAL>
11-
<PackageVersion_CdsSdk>4.9.3165-v9.0-weekly-2304.2</PackageVersion_CdsSdk>
12-
<PackageVersion_CrmProxy>4.9.3165-v9.0-weekly-2304.2</PackageVersion_CrmProxy>
13-
<PackageVersion_CDSServerNuget>4.6.6061-weekly-2108.5</PackageVersion_CDSServerNuget>
14-
<PackageVersion_Newtonsoft>13.0.1</PackageVersion_Newtonsoft>
15-
<PackageVersion_RestClientRuntime>2.3.24</PackageVersion_RestClientRuntime>
16-
<PackageVersion_XrmSdk>9.0.2.48</PackageVersion_XrmSdk>
17-
<PackageVersion_Dep_OutlookXrmSdk>9.0.2.34</PackageVersion_Dep_OutlookXrmSdk>
18-
<PackageVersion_BatchedTelemetry>3.0.8</PackageVersion_BatchedTelemetry>
19-
<PackageVersion_DataverseClient>0.4.20</PackageVersion_DataverseClient>
20-
<PackageVersion_CoverletCollector>3.1.0</PackageVersion_CoverletCollector>
21-
<PackageVersion_Microsoft_Extensions>3.1.8</PackageVersion_Microsoft_Extensions>
22-
<PackageVersion_SystemRuntime>6.0.0</PackageVersion_SystemRuntime>
23-
<PackageVersion_SystemTextJsonVersion>7.0.3</PackageVersion_SystemTextJsonVersion>
24-
<PackageVersion_SystemTextEncodingsWebVersion>7.0.0</PackageVersion_SystemTextEncodingsWebVersion>
25-
26-
<!-- Test: -->
27-
<PackageVersion_MicrosoftNETTestSdk>17.5.0</PackageVersion_MicrosoftNETTestSdk>
28-
<PackageVersion_MSTest>2.2.10</PackageVersion_MSTest>
29-
<PackageVersion_Moq>4.16.0</PackageVersion_Moq>
30-
<PackageVersion_XUnit>2.4.2</PackageVersion_XUnit>
31-
<PackageVersion_XUnitRunnerVS>2.4.5</PackageVersion_XUnitRunnerVS>
32-
<PackageVersion_FluentAssertions>5.10.3</PackageVersion_FluentAssertions>
33-
348
<!-- Assembly attributes are set by cake build. We need to disable autogeneration by msbuild -->
359
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
3610
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

src/GeneralTools/DataverseClient/Client/ConnectionService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,6 +1749,7 @@ private async Task RefreshInstanceDetails(IOrganizationService dvService, Uri ur
17491749
_OrgDetail.State = ostate;
17501750
_OrgDetail.UniqueName = resp.Detail.UniqueName;
17511751
_OrgDetail.UrlName = resp.Detail.UrlName;
1752+
_OrgDetail.DatacenterId = resp.Detail.DatacenterId;
17521753
}
17531754
_organization = _OrgDetail.UniqueName;
17541755

src/GeneralTools/DataverseClient/Client/Utils/Utils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ internal static T SeekExceptionOnStack<T>(Exception e) where T : Exception
12701270
if (exHold.InnerException != null)
12711271
{
12721272
moreInnerRecords = true;
1273-
exHold = e.InnerException;
1273+
exHold = exHold.InnerException;
12741274
}
12751275
else
12761276
moreInnerRecords = false;
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using Xunit;
2+
3+
namespace Client_Core_Tests
4+
{
5+
/// <summary>
6+
/// Associate tests with this collection to ensure they do not run in parallel with other test collections.
7+
/// e.g. if your test modifies Environment.CurrentDirectory, you MUST set your collection to not be run in parallel
8+
/// or you will cause other tests to potentially error out.
9+
/// </summary>
10+
[CollectionDefinition("NonParallelCollection", DisableParallelization = true)]
11+
public class NonParallelCollectionDefinition
12+
{
13+
}
14+
}

src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,17 @@
2929

3030
namespace Client_Core_Tests
3131
{
32-
public partial class ClientTests
32+
[Collection("NonParallelCollection")]
33+
public class ServiceClientTests
3334
{
3435
#region SharedVars
3536

3637
TestSupport testSupport = new TestSupport();
3738
ITestOutputHelper outputListner;
38-
ILogger<ClientTests> Ilogger = null;
39+
ILogger<ServiceClientTests> Ilogger = null;
3940
#endregion
4041

41-
public ClientTests(ITestOutputHelper output)
42+
public ServiceClientTests(ITestOutputHelper output)
4243
{
4344
outputListner = output;
4445
//TraceControlSettings.TraceLevel = System.Diagnostics.SourceLevels.Verbose;
@@ -60,7 +61,7 @@ public ClientTests(ITestOutputHelper output)
6061
})
6162
.AddConfiguration(config.GetSection("Logging"))
6263
.AddProvider(new TraceConsoleLoggingProvider(output)));
63-
Ilogger = loggerFactory.CreateLogger<ClientTests>();
64+
Ilogger = loggerFactory.CreateLogger<ServiceClientTests>();
6465
testSupport.logger = Ilogger;
6566
}
6667

@@ -122,7 +123,7 @@ public void LogWriteTest()
122123
options.IncludeScopes = true;
123124
options.TimestampFormat = "hh:mm:ss ";
124125
}));
125-
ILogger<ClientTests> Ilogger = loggerFactory.CreateLogger<ClientTests>();
126+
ILogger<ServiceClientTests> Ilogger = loggerFactory.CreateLogger<ServiceClientTests>();
126127

127128
DataverseTraceLogger logger = new DataverseTraceLogger(Ilogger);
128129
logger.EnabledInMemoryLogCapture = true;
@@ -1113,7 +1114,7 @@ private void ValidateConnection(ServiceClient client, bool usingExternalAuth = f
11131114
options.TimestampFormat = "hh:mm:ss ";
11141115
}));
11151116

1116-
ILogger<ClientTests> locallogger = loggerFactory.CreateLogger<ClientTests>();
1117+
ILogger<ServiceClientTests> locallogger = loggerFactory.CreateLogger<ServiceClientTests>();
11171118
locallogger.BeginScope("Beginning CloneLogger");
11181119
// Clone it. - Validate use
11191120
using (var client2 = client.Clone(locallogger))

src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/SkippableConnectionTestAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public SkippableConnectionTestAttribute()
2020
}
2121
}
2222

23-
public SkippableConnectionTestAttribute(bool skip , string skipMessage)
23+
public SkippableConnectionTestAttribute(bool skip, string skipMessage)
2424
{
2525
Skip = skipMessage;
2626
}

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

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

99
++CURRENTRELEASEID++
10+
Updated Core SDK Libs
11+
Fixed issue with DataCenter ID not populating in Organization Detail object returned by the client.
12+
Fixed a hang problem when parsing multi layered exceptions
13+
14+
1.1.12:
1015
Refactored CurrentAccessToken property to avoid async call.
1116
Fix for min version of default client, pre-connection so it is recognized by features that require 9.0 or greater.
1217
Fix for notification of unsupported features when not 'breaking' to alert as 'warnings' in log vs information.

0 commit comments

Comments
 (0)