Merge pull request #408 from microsoft/release/update/231107060522
Resync to Shipping code base.
This commit is contained in:
MattB
GitHub
Коммит
521ee7ddaa
|
|
@ -1,20 +1,8 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- msbuild properties shared for dotnetCore and .NET classic projects: -->
|
||||
<PropertyGroup>
|
||||
<!-- Assembly attributes are set by cake build. We need to disable autogeneration by msbuild -->
|
||||
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
|
||||
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
|
||||
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
|
||||
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
|
||||
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
|
||||
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
|
||||
<DisableAssemblyAttributesSetViaCakeSetVersion>true</DisableAssemblyAttributesSetViaCakeSetVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -52,11 +40,6 @@
|
|||
<OutputPath>$(OutDir)</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(SignAssembly)' == 'true'">
|
||||
<AssemblyOriginatorKeyFile>$(RepoRoot)\build\crmkey\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
|
||||
<DelaySign>true</DelaySign>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ using Microsoft.PowerPlatform.Dataverse.Client.Utils;
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using System.Security;
|
||||
|
|
@ -299,7 +300,9 @@ namespace Microsoft.PowerPlatform.Dataverse.Client.Auth
|
|||
}
|
||||
else
|
||||
{
|
||||
#pragma warning disable CS0618 // Type or member is obsolete
|
||||
_authenticationResult = await publicAppClient.AcquireTokenByUsernamePassword(scopes, clientCredentials.UserName.UserName, ServiceClient.MakeSecureString(clientCredentials.UserName.Password)).ExecuteAsync().ConfigureAwait(false);
|
||||
#pragma warning restore CS0618 // Type or member is obsolete
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -40,12 +40,10 @@
|
|||
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
|
||||
<PackageReference Include="System.Security.Permissions" Version="5.0.0" />
|
||||
<PackageReference Include="System.ServiceModel.Http" Version="4.10.2" />
|
||||
<PackageReference Include="System.Text.Json" Version="6.0.7" />
|
||||
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.18.9" />
|
||||
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_SystemTextJson)" />
|
||||
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.56.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(PackageVersion_Microsoft_Extensions)" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="5.0.3" /> <!-- explict add to deal with CVE-2021-24112 -->
|
||||
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" /> <!-- explict add to deal with CVE-2022-34716 -->
|
||||
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.3" /> <!-- explict add to deal with CVE-2023-29331 -->
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48'">
|
||||
|
|
|
|||
|
|
@ -853,7 +853,7 @@ namespace Client_Core_Tests
|
|||
Assert.Null(ex);
|
||||
}
|
||||
// Check user before we validate connection
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().BeEquivalentTo(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.ClientSecret);
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().Be(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.ClientSecret);
|
||||
client._connectionSvc.AuthContext.Scopes.Should().BeEquivalentTo(new string[] { $"{Conn_Url}/.default" });
|
||||
client._connectionSvc.AuthContext.Account.Should().BeNull();
|
||||
client._connectionSvc.AuthContext.AccessToken.Should().NotBeNull();
|
||||
|
|
@ -956,7 +956,7 @@ namespace Client_Core_Tests
|
|||
Assert.True(client.IsReady, "Failed to Create Connection via Connection string");
|
||||
|
||||
// Check user before we validate connection
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().BeEquivalentTo(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().Be(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthContext.Scopes.Should().BeEquivalentTo(new string[] { $"{Conn_Url}//user_impersonation" });
|
||||
client._connectionSvc.AuthContext.Account.Should().NotBeNull();
|
||||
client._connectionSvc.AuthContext.IdToken.Should().NotBeEmpty();
|
||||
|
|
@ -999,7 +999,7 @@ namespace Client_Core_Tests
|
|||
Assert.True(client.IsReady, "Failed to Create Connection via Constructor - Discovery");
|
||||
|
||||
// Check user before we validate connection
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().BeEquivalentTo(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().Be(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthContext.Account.Should().NotBeNull();
|
||||
client._connectionSvc.AuthContext.IdToken.Should().NotBeEmpty();
|
||||
client._connectionSvc.AuthContext.Account.Username.Should().BeEquivalentTo(Conn_UserName);
|
||||
|
|
@ -1029,7 +1029,7 @@ namespace Client_Core_Tests
|
|||
Assert.True(client.IsReady, "Failed to Create Connection via Constructor - Direct Connect");
|
||||
|
||||
// Check user before we validate connection
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().BeEquivalentTo(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().Be(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthContext.Scopes.Should().BeEquivalentTo(new string[] { $"{Conn_Url}//user_impersonation" });
|
||||
client._connectionSvc.AuthContext.Account.Should().NotBeNull();
|
||||
client._connectionSvc.AuthContext.IdToken.Should().NotBeEmpty();
|
||||
|
|
@ -1083,7 +1083,7 @@ namespace Client_Core_Tests
|
|||
ValidateConnection(client);
|
||||
|
||||
// Check user before we validate connection
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().BeEquivalentTo(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthenticationTypeInUse.Should().Be(Microsoft.PowerPlatform.Dataverse.Client.AuthenticationType.OAuth);
|
||||
client._connectionSvc.AuthContext.Scopes.Should().BeEquivalentTo(new string[] { $"{Conn_Url}/user_impersonation" });
|
||||
client._connectionSvc.AuthContext.Account.Should().NotBeNull();
|
||||
client._connectionSvc.AuthContext.IdToken.Should().NotBeEmpty();
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -7,6 +7,17 @@ Notice:
|
|||
Note: Only AD on FullFramework, OAuth, Certificate, ClientSecret Authentication types are supported at this time.
|
||||
|
||||
++CURRENTRELEASEID++
|
||||
Updated Core SDK
|
||||
Added new properties to Organization detail to report Schema Type and Deployment Type.
|
||||
Dependency changes:
|
||||
System.Text.Json moved to 7.0.3
|
||||
Microsoft.Identity.Client moved to 4.56.0
|
||||
Microsoft.Identity.Client.Extensions.Msal moved to 4.56.0
|
||||
Removed System.Security.Cryptography.Xml was transitive include to support CVE which is no longer necessary due to depending package updates
|
||||
Removed System.Security.Cryptography.Pkcs was transitive include to support CVE which is no longer necessary due to depending package updates
|
||||
|
||||
|
||||
1.1.14:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -19,33 +19,33 @@
|
|||
<dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.35.1" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="2.18.9" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
|
||||
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="6.0.7" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
|
||||
</group>
|
||||
<group targetFramework=".NETFramework4.7.2">
|
||||
<dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.35.1" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="2.18.9" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
|
||||
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="6.0.7" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
|
||||
</group>
|
||||
<group targetFramework=".NETFramework4.8">
|
||||
<dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.35.1" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="2.18.9" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
|
||||
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="6.0.7" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
|
||||
</group>
|
||||
<group targetFramework="NET6.0">
|
||||
<dependency id="System.Collections" version="4.3.0" exclude="Build,Analyzers" />
|
||||
|
|
@ -60,13 +60,13 @@
|
|||
<dependency id="System.Runtime.Serialization.Xml" version="4.3.0" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Security.Permissions" version="5.0.0" exclude="Build,Analyzers" />
|
||||
<dependency id="System.ServiceModel.Http" version="4.10.2" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="6.0.7" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.35.1" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="2.18.9" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.VisualBasic" version="10.3.0" exclude="Build,Analyzers" />
|
||||
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
||||
|
|
@ -74,8 +74,6 @@
|
|||
<dependency id="System.Runtime.Caching" version="4.7.0" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Security.Cryptography.Algorithms" version="4.3.1" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Security.Cryptography.ProtectedData" version="4.7.0" exclude="Build,Analyzers" />
|
||||
<dependency id="System.Security.Cryptography.Xml" version="6.0.1" exclude="Build,Analyzers" /> <!-- Added for CVE-2022-34716 and CVE-2021-24112 -->
|
||||
<dependency id="System.Security.Cryptography.Pkcs" version="6.0.3" exclude="Build,Analyzers" /> <!-- Added for CVE-2023-29331 -->
|
||||
<dependency id="System.Drawing.Common" version="5.0.3" exclude="Build,Analyzers"/> <!-- explict add to deal with CVE-2021-24112 -->
|
||||
</group>
|
||||
</dependencies>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче