From 30b995711d6df6bf050dd01e3d3296fac5734a6f Mon Sep 17 00:00:00 2001
From: Release-Agent <>
Date: Thu, 24 Aug 2023 23:27:23 +0000
Subject: [PATCH] ''
---
src/Build.Common.StandardAndLegacy.props | 1 -
src/Build.Shared.props | 26 -------------------
.../Client/ConnectionService.cs | 1 +
.../DataverseClient/Client/Utils/Utils.cs | 2 +-
.../NonParallelCollectionDefinition.cs | 14 ++++++++++
.../ServiceClientTests.cs | 13 +++++-----
.../SkippableConnectionTestAttribute.cs | 2 +-
...Platform.Dataverse.Client.ReleaseNotes.txt | 5 ++++
8 files changed, 29 insertions(+), 35 deletions(-)
create mode 100644 src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/NonParallelCollectionDefinition.cs
diff --git a/src/Build.Common.StandardAndLegacy.props b/src/Build.Common.StandardAndLegacy.props
index 1822113..a38f359 100644
--- a/src/Build.Common.StandardAndLegacy.props
+++ b/src/Build.Common.StandardAndLegacy.props
@@ -10,7 +10,6 @@
- net462;net472;net48;
IOperation
diff --git a/src/Build.Shared.props b/src/Build.Shared.props
index 370e72a..550fb01 100644
--- a/src/Build.Shared.props
+++ b/src/Build.Shared.props
@@ -5,32 +5,6 @@
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 3.19.8
- 4.35.1
- 4.9.3165-v9.0-weekly-2304.2
- 4.9.3165-v9.0-weekly-2304.2
- 4.6.6061-weekly-2108.5
- 13.0.1
- 2.3.24
- 9.0.2.48
- 9.0.2.34
- 3.0.8
- 0.4.20
- 3.1.0
- 3.1.8
- 6.0.0
- 7.0.3
- 7.0.0
-
-
- 17.5.0
- 2.2.10
- 4.16.0
- 2.4.2
- 2.4.5
- 5.10.3
-
false
false
diff --git a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
index 5649741..f66008a 100644
--- a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
+++ b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
@@ -1749,6 +1749,7 @@ private async Task RefreshInstanceDetails(IOrganizationService dvService, Uri ur
_OrgDetail.State = ostate;
_OrgDetail.UniqueName = resp.Detail.UniqueName;
_OrgDetail.UrlName = resp.Detail.UrlName;
+ _OrgDetail.DatacenterId = resp.Detail.DatacenterId;
}
_organization = _OrgDetail.UniqueName;
diff --git a/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs b/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs
index 94b6ac4..9cdff82 100644
--- a/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs
+++ b/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs
@@ -1270,7 +1270,7 @@ internal static T SeekExceptionOnStack(Exception e) where T : Exception
if (exHold.InnerException != null)
{
moreInnerRecords = true;
- exHold = e.InnerException;
+ exHold = exHold.InnerException;
}
else
moreInnerRecords = false;
diff --git a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/NonParallelCollectionDefinition.cs b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/NonParallelCollectionDefinition.cs
new file mode 100644
index 0000000..91a1ad1
--- /dev/null
+++ b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/NonParallelCollectionDefinition.cs
@@ -0,0 +1,14 @@
+using Xunit;
+
+namespace Client_Core_Tests
+{
+ ///
+ /// Associate tests with this collection to ensure they do not run in parallel with other test collections.
+ /// e.g. if your test modifies Environment.CurrentDirectory, you MUST set your collection to not be run in parallel
+ /// or you will cause other tests to potentially error out.
+ ///
+ [CollectionDefinition("NonParallelCollection", DisableParallelization = true)]
+ public class NonParallelCollectionDefinition
+ {
+ }
+}
diff --git a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs
index fee6f01..da7f8d5 100644
--- a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs
+++ b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs
@@ -29,16 +29,17 @@
namespace Client_Core_Tests
{
- public partial class ClientTests
+ [Collection("NonParallelCollection")]
+ public class ServiceClientTests
{
#region SharedVars
TestSupport testSupport = new TestSupport();
ITestOutputHelper outputListner;
- ILogger Ilogger = null;
+ ILogger Ilogger = null;
#endregion
- public ClientTests(ITestOutputHelper output)
+ public ServiceClientTests(ITestOutputHelper output)
{
outputListner = output;
//TraceControlSettings.TraceLevel = System.Diagnostics.SourceLevels.Verbose;
@@ -60,7 +61,7 @@ public ClientTests(ITestOutputHelper output)
})
.AddConfiguration(config.GetSection("Logging"))
.AddProvider(new TraceConsoleLoggingProvider(output)));
- Ilogger = loggerFactory.CreateLogger();
+ Ilogger = loggerFactory.CreateLogger();
testSupport.logger = Ilogger;
}
@@ -122,7 +123,7 @@ public void LogWriteTest()
options.IncludeScopes = true;
options.TimestampFormat = "hh:mm:ss ";
}));
- ILogger Ilogger = loggerFactory.CreateLogger();
+ ILogger Ilogger = loggerFactory.CreateLogger();
DataverseTraceLogger logger = new DataverseTraceLogger(Ilogger);
logger.EnabledInMemoryLogCapture = true;
@@ -1113,7 +1114,7 @@ private void ValidateConnection(ServiceClient client, bool usingExternalAuth = f
options.TimestampFormat = "hh:mm:ss ";
}));
- ILogger locallogger = loggerFactory.CreateLogger();
+ ILogger locallogger = loggerFactory.CreateLogger();
locallogger.BeginScope("Beginning CloneLogger");
// Clone it. - Validate use
using (var client2 = client.Clone(locallogger))
diff --git a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/SkippableConnectionTestAttribute.cs b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/SkippableConnectionTestAttribute.cs
index a23798a..a33d77b 100644
--- a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/SkippableConnectionTestAttribute.cs
+++ b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/SkippableConnectionTestAttribute.cs
@@ -20,7 +20,7 @@ public SkippableConnectionTestAttribute()
}
}
- public SkippableConnectionTestAttribute(bool skip , string skipMessage)
+ public SkippableConnectionTestAttribute(bool skip, string skipMessage)
{
Skip = skipMessage;
}
diff --git a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt
index f27ad8c..7789c9c 100644
--- a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt
+++ b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt
@@ -7,6 +7,11 @@ Notice:
Note: Only AD on FullFramework, OAuth, Certificate, ClientSecret Authentication types are supported at this time.
++CURRENTRELEASEID++
+Updated Core SDK Libs
+Fixed issue with DataCenter ID not populating in Organization Detail object returned by the client.
+Fixed a hang problem when parsing multi layered exceptions
+
+1.1.12:
Refactored CurrentAccessToken property to avoid async call.
Fix for min version of default client, pre-connection so it is recognized by features that require 9.0 or greater.
Fix for notification of unsupported features when not 'breaking' to alert as 'warnings' in log vs information.