Skip to content

Commit 44b75a6

Browse files
committed
Remove AD authentication because the package reference conflicts with other projects.
1 parent 74ceb51 commit 44b75a6

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

dotnet/src/dotnetcore/Providers/Messaging/GXAzureEventGrid/AzureEventGrid.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Text.Json;
55
using System.Threading.Tasks;
66
using Azure;
7-
using Azure.Identity;
87
using Azure.Messaging;
98
using Azure.Messaging.EventGrid;
109
using GeneXus.Messaging.Common;
@@ -32,15 +31,18 @@ private void Initialize(GXService providerService)
3231
_endpoint = serviceSettings.GetEncryptedPropertyValue(PropertyConstants.URI_ENDPOINT);
3332
_accessKey = serviceSettings.GetEncryptedPropertyValue(PropertyConstants.ACCESS_KEY);
3433

34+
//Package Azure.Identity cannot be referenced because it conflicts with Microsoft.Identity.Client pack version
35+
//used transitively by gxmail and dynamoDB projects.
36+
37+
/*if (string.IsNullOrEmpty(_accessKey))
38+
39+
//Try using Active Directory authentication
40+
_client = new EventGridPublisherClient(
41+
new Uri(_endpoint),
42+
new DefaultAzureCredential());*/
43+
44+
3545
if (!string.IsNullOrEmpty(_endpoint)) {
36-
if (string.IsNullOrEmpty(_accessKey))
37-
38-
//Try using Active Directory authentication
39-
_client = new EventGridPublisherClient(
40-
new Uri(_endpoint),
41-
new DefaultAzureCredential());
42-
43-
else
4446

4547
_client = new EventGridPublisherClient(
4648
new Uri(_endpoint),

dotnet/src/dotnetcore/Providers/Messaging/GXAzureEventGrid/EventGridRouterProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public EventRouterProviderBase Connect(string endpoint, string accesskey, out GX
2222
success = successConnect;
2323
return evtRouterProvider;
2424
}
25-
public EventRouterProviderBase Connect(string endpoint, out GXBaseCollection<SdtMessages_Message> errorMessages, out bool success)
25+
/*public EventRouterProviderBase Connect(string endpoint, out GXBaseCollection<SdtMessages_Message> errorMessages, out bool success)
2626
{
2727
EventRouterProvider eventRouterProvider = new EventRouterProvider();
2828
GXProperties properties = new GXProperties
@@ -34,6 +34,6 @@ public EventRouterProviderBase Connect(string endpoint, out GXBaseCollection<Sdt
3434
errorMessages = errorMessagesConnect;
3535
success = successConnect;
3636
return evtRouterProvider;
37-
}
37+
}*/
3838
}
3939
}

dotnet/src/dotnetcore/Providers/Messaging/GXAzureEventGrid/GXAzureEventGrid.csproj

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

99
<ItemGroup>
10-
<PackageReference Include="Azure.Identity" Version="1.9.0" />
1110
<PackageReference Include="Azure.Messaging.EventGrid" Version="4.17.0" />
1211
</ItemGroup>
1312

0 commit comments

Comments
 (0)