Merge pull request #393 from microsoft/release/update/230824112722

Updates to pick up new SDK bits and fix a bug in exception decode.
microsoft · Aug 24, 2023 · 447f9dc · 447f9dc
2 parents 90998e3 + 30b9957
commit 447f9dc
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 35 deletions.
diff --git a/src/Build.Common.StandardAndLegacy.props b/src/Build.Common.StandardAndLegacy.props
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DotNetClassicTargetFrameworks>net462;net472;net48;</DotNetClassicTargetFrameworks>
     <Features>IOperation</Features>
   </PropertyGroup>
 

diff --git a/src/Build.Shared.props b/src/Build.Shared.props
@@ -5,32 +5,6 @@
 
   <!-- msbuild properties shared for dotnetCore and .NET classic projects: -->
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <PackageVersion_Adal>3.19.8</PackageVersion_Adal>
-    <PackageVersion_MSAL>4.35.1</PackageVersion_MSAL>
-    <PackageVersion_CdsSdk>4.9.3165-v9.0-weekly-2304.2</PackageVersion_CdsSdk>
-    <PackageVersion_CrmProxy>4.9.3165-v9.0-weekly-2304.2</PackageVersion_CrmProxy>
-    <PackageVersion_CDSServerNuget>4.6.6061-weekly-2108.5</PackageVersion_CDSServerNuget>
-    <PackageVersion_Newtonsoft>13.0.1</PackageVersion_Newtonsoft>
-    <PackageVersion_RestClientRuntime>2.3.24</PackageVersion_RestClientRuntime>
-    <PackageVersion_XrmSdk>9.0.2.48</PackageVersion_XrmSdk>
-    <PackageVersion_Dep_OutlookXrmSdk>9.0.2.34</PackageVersion_Dep_OutlookXrmSdk>
-    <PackageVersion_BatchedTelemetry>3.0.8</PackageVersion_BatchedTelemetry>
-    <PackageVersion_DataverseClient>0.4.20</PackageVersion_DataverseClient>
-    <PackageVersion_CoverletCollector>3.1.0</PackageVersion_CoverletCollector>
-    <PackageVersion_Microsoft_Extensions>3.1.8</PackageVersion_Microsoft_Extensions>
-    <PackageVersion_SystemRuntime>6.0.0</PackageVersion_SystemRuntime>
-    <PackageVersion_SystemTextJsonVersion>7.0.3</PackageVersion_SystemTextJsonVersion>
-    <PackageVersion_SystemTextEncodingsWebVersion>7.0.0</PackageVersion_SystemTextEncodingsWebVersion>
-
-    <!-- Test: -->
-    <PackageVersion_MicrosoftNETTestSdk>17.5.0</PackageVersion_MicrosoftNETTestSdk>
-    <PackageVersion_MSTest>2.2.10</PackageVersion_MSTest>
-    <PackageVersion_Moq>4.16.0</PackageVersion_Moq>
-    <PackageVersion_XUnit>2.4.2</PackageVersion_XUnit>
-    <PackageVersion_XUnitRunnerVS>2.4.5</PackageVersion_XUnitRunnerVS>
-    <PackageVersion_FluentAssertions>5.10.3</PackageVersion_FluentAssertions>
-
     <!-- Assembly attributes are set by cake build. We need to disable autogeneration by msbuild -->
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

diff --git 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
@@ -1270,7 +1270,7 @@ internal static T SeekExceptionOnStack<T>(Exception e) where T : Exception
                         if (exHold.InnerException != null)
                         {
                             moreInnerRecords = true;
-                            exHold = e.InnerException;
+                            exHold = exHold.InnerException;
                         }
                         else
                             moreInnerRecords = false; 

diff --git a/...alTools/DataverseClient/UnitTests/CdsClient_Core_Tests/NonParallelCollectionDefinition.cs b/...alTools/DataverseClient/UnitTests/CdsClient_Core_Tests/NonParallelCollectionDefinition.cs
@@ -0,0 +1,14 @@
+using Xunit;
+
+namespace Client_Core_Tests
+{
+    /// <summary>
+    /// 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.
+    /// </summary>
+    [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
@@ -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<ClientTests> Ilogger = null;
+        ILogger<ServiceClientTests> 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<ClientTests>();
+            Ilogger = loggerFactory.CreateLogger<ServiceClientTests>();
             testSupport.logger = Ilogger;
         }
 
@@ -122,7 +123,7 @@ public void LogWriteTest()
                         options.IncludeScopes = true;
                         options.TimestampFormat = "hh:mm:ss ";
                     }));
-            ILogger<ClientTests> Ilogger = loggerFactory.CreateLogger<ClientTests>();
+            ILogger<ServiceClientTests> Ilogger = loggerFactory.CreateLogger<ServiceClientTests>();
 
             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<ClientTests> locallogger = loggerFactory.CreateLogger<ClientTests>();
+            ILogger<ServiceClientTests> locallogger = loggerFactory.CreateLogger<ServiceClientTests>();
             locallogger.BeginScope("Beginning CloneLogger");
             // Clone it. - Validate use
             using (var client2 = client.Clone(locallogger))

diff --git a/...lTools/DataverseClient/UnitTests/CdsClient_Core_Tests/SkippableConnectionTestAttribute.cs b/...lTools/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
@@ -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.