Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

whitespace following the Comment symbol #21636

Closed
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<!--This file and its contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>Advisor_2017-04-19;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System.Threading;
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<PackageReference Include="Microsoft.Azure.WebJobs.Sources" />
<PackageReference Include="Microsoft.Azure.WebJobs" />
<PackageReference Include="Microsoft.Extensions.Azure" />
<PackageReference Include="Azure.Messaging.ServiceBus" />
<!--Revert after Service Bus release-->
<!--<PackageReference Include="Azure.Messaging.ServiceBus" />-->
</ItemGroup>

<ItemGroup>
Expand All @@ -28,4 +29,9 @@
<Compile Include="..\..\..\extensions\Microsoft.Azure.WebJobs.Extensions.Clients\src\Shared\WebJobsConfigurationExtensions.cs" LinkBase="Shared" />

</ItemGroup>

<ItemGroup>
<!--Revert after Service Bus release-->
<ProjectReference Include="..\..\Azure.Messaging.ServiceBus\src\Azure.Messaging.ServiceBus.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public class ServiceBusMessageActions
private readonly ProcessMessageEventArgs _eventArgs;
private readonly ProcessSessionMessageEventArgs _sessionEventArgs;

internal HashSet<ServiceBusReceivedMessage> SettledMessages { get; } = new();

internal ServiceBusMessageActions(ProcessSessionMessageEventArgs sessionEventArgs)
{
_sessionEventArgs = sessionEventArgs;
Expand Down Expand Up @@ -50,6 +52,8 @@ public virtual async Task AbandonMessageAsync(
{
await _sessionEventArgs.AbandonMessageAsync(message, propertiesToModify, cancellationToken).ConfigureAwait(false);
}

SettledMessages.Add(message);
}

///<inheritdoc cref="ServiceBusReceiver.CompleteMessageAsync(ServiceBusReceivedMessage, CancellationToken)"/>
Expand All @@ -69,6 +73,8 @@ public virtual async Task CompleteMessageAsync(
{
await _sessionEventArgs.CompleteMessageAsync(message, cancellationToken).ConfigureAwait(false);
}

SettledMessages.Add(message);
}

///<inheritdoc cref="ServiceBusReceiver.DeadLetterMessageAsync(ServiceBusReceivedMessage, string, string, CancellationToken)"/>
Expand Down Expand Up @@ -105,6 +111,8 @@ await _sessionEventArgs.DeadLetterMessageAsync(
cancellationToken)
.ConfigureAwait(false);
}

SettledMessages.Add(message);
}

///<inheritdoc cref="ServiceBusReceiver.DeadLetterMessageAsync(ServiceBusReceivedMessage, IDictionary{string, object}, CancellationToken)"/>
Expand Down Expand Up @@ -137,6 +145,8 @@ await _sessionEventArgs.DeadLetterMessageAsync(
cancellationToken)
.ConfigureAwait(false);
}

SettledMessages.Add(message);
}

///<inheritdoc cref="ServiceBusReceiver.DeferMessageAsync(ServiceBusReceivedMessage, IDictionary{string, object}, CancellationToken)"/>
Expand Down Expand Up @@ -169,6 +179,8 @@ await _sessionEventArgs.DeferMessageAsync(
cancellationToken)
.ConfigureAwait(false);
}

SettledMessages.Add(message);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private bool GetAutoCompleteMessagesOptionToUse(ServiceBusTriggerAttribute attri
{
if (attribute.IsAutoCompleteMessagesOptionSet)
{
_logger.LogInformation($"The 'AutoCompleteMessages' option has been overrriden to '{attribute.AutoCompleteMessages}' value for '{functionName}' function.");
_logger.LogInformation($"The 'AutoCompleteMessages' option has been overriden to '{attribute.AutoCompleteMessages}' value for '{functionName}' function.");

return attribute.AutoCompleteMessages;
}
Expand Down
Loading