Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Build.Shared.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<PropertyGroup>
<PackageVersion_AppInsights>2.9.1</PackageVersion_AppInsights>
<PackageVersion_Adal>3.19.8</PackageVersion_Adal>
<PackageVersion_CdsSdk>4.5.2071</PackageVersion_CdsSdk>
<PackageVersion_CDSServerNuget>4.5.3122</PackageVersion_CDSServerNuget>
<PackageVersion_CdsSdk>4.5.4487</PackageVersion_CdsSdk>
<PackageVersion_CDSServerNuget>4.5.4487</PackageVersion_CDSServerNuget>
<PackageVersion_Newtonsoft>10.0.3</PackageVersion_Newtonsoft>
<PackageVersion_RestClientRuntime>2.3.20</PackageVersion_RestClientRuntime>
<PackageVersion_XrmSdk>9.0.2.25</PackageVersion_XrmSdk>
Expand Down
14 changes: 13 additions & 1 deletion src/GeneralTools/CDSClient/Client/CdsConnectionService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,8 @@ internal CdsConnectionService(OrganizationWebProxyClient externalOrgWebProxyClie

if (_externalWebClientProxy != null)
{
AttachWebProxyHander(_externalWebClientProxy);

// Set timeouts.
_externalWebClientProxy.InnerChannel.OperationTimeout = _MaxConnectionTimeout;
_externalWebClientProxy.Endpoint.Binding.SendTimeout = _MaxConnectionTimeout;
Expand Down Expand Up @@ -2579,7 +2581,7 @@ private async Task<IOrganizationService> ConnectAndInitCdsOrgService(Organizatio
}
_ActualCdsOrgUri = targetServiceUrl;
svcWebClientProxy = new OrganizationWebProxyClient(targetServiceUrl, true);
svcWebClientProxy.ChannelFactory.Opening += WebProxyChannelFactory_Opening;
AttachWebProxyHander(svcWebClientProxy);
svcWebClientProxy.HeaderToken = authToken;

if (svcWebClientProxy != null)
Expand All @@ -2597,6 +2599,16 @@ private async Task<IOrganizationService> ConnectAndInitCdsOrgService(Organizatio
return svcWebClientProxy;
}

/// <summary>
/// This method us used to wire up the telemetry behaviors to the webProxy connection
/// </summary>
/// <param name="proxy">Connection proxy to attach telemetry too</param>
internal void AttachWebProxyHander (OrganizationWebProxyClient proxy )
{
proxy.ChannelFactory.Opening += WebProxyChannelFactory_Opening;
}


/// <summary>
/// Grab the Channel factory Open event and add the CrmHook Service behaviors.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public CdsDiscoveryServers()
_OSDPServers.Add(new CdsDiscoveryServer() { DiscoveryServer = new Uri("https://disco.crm6.dynamics.com/XRMServices/2011/Discovery.svc"), DisplayName = "Oceania", ShortName = "Oceania" , GeoCode="OCE" });
_OSDPServers.Add(new CdsDiscoveryServer() { DiscoveryServer = new Uri("https://disco.crm14.dynamics.com/XRMServices/2011/Discovery.svc"), DisplayName = "South Africa", ShortName = "ZAF" , GeoCode= "ZAF" });
_OSDPServers.Add(new CdsDiscoveryServer() { DiscoveryServer = new Uri("https://disco.crm2.dynamics.com/XRMServices/2011/Discovery.svc"), DisplayName = "South America", ShortName = "SouthAmerica" , GeoCode="LATAM" });
_OSDPServers.Add(new CdsDiscoveryServer() { DiscoveryServer = new Uri("https://disco.crm17.dynamics.com/XRMServices/2011/Discovery.svc"), DisplayName = "Switzerland", ShortName = "Switzerland", GeoCode = "CHE" });
_OSDPServers.Add(new CdsDiscoveryServer() { DiscoveryServer = new Uri("https://disco.crm15.dynamics.com/XRMServices/2011/Discovery.svc"), DisplayName = "United Arab Emirates", ShortName = "UAE" , GeoCode="UAE" });
_OSDPServers.Add(new CdsDiscoveryServer() { DiscoveryServer = new Uri("https://disco.crm11.dynamics.com/XRMServices/2011/Discovery.svc"), DisplayName = "United Kingdom", ShortName = "GBR" , GeoCode = "GBR" });
_OSDPServers.Add(new CdsDiscoveryServer() { DiscoveryServer = new Uri("https://disco.crm.appsplatform.us/XRMServices/2011/Discovery.svc"), DisplayName = "US Gov DoD", ShortName = "DoD", GeoCode= "DOD", RequiresRegionalDiscovery = true, RegionalGlobalDiscoveryServer = new Uri("https://globaldisco.crm.appsplatform.us")});
Expand Down
3 changes: 3 additions & 0 deletions src/nuspecs/Microsoft.Dynamics.Sdk.Messages.ReleaseNotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Notice:
++CURRENTRELEASEID++
No updates here.

0.2.23-Alpha:
No updates here.

0.2.17-Alpha:
No Updates here.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ Notice:
++CURRENTRELEASEID++
No updates here.

0.2.23-Alpha:
No updates here.

0.2.17-Alpha:
Added IntelliSense Doc Support
Added support for bypassing custom Plug-in Execution during SDK Operation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ Notice:
Note: that only OAuth, Certificate, ClientSecret Authentication types are supported at this time.

++CURRENTRELEASEID++
Fixed an issue with .Clone not correctly supporting adding telemetry handlers to cloned connections

0.2.23-Alpha:
Adding Switzerland Geo to Regions List.
Added support for Alternate key use on entity references as part of Create Update Delete Operations running over the webAPI.
Added concurrency support to Create Update Delete Operations running over the webAPI.

Expand Down