Skip to content

Commit bfa5e84

Browse files
authored
Merge pull request #278829 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 753bd69 + 2eff918 commit bfa5e84

File tree

7 files changed

+28
-31
lines changed

7 files changed

+28
-31
lines changed

articles/aks/learn/quick-kubernetes-deploy-terraform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Azure Kubernetes Service (AKS) is a managed Kubernetes service that lets you qui
4949

5050
First, log into your Azure account and authenticate using one of the methods described in the following section.
5151

52-
[!INCLUDE [authenticate-to-azure.md](~/azure-dev-docs-pr/articles/terraform/includes/authenticate-to-azure.md)]
52+
Terraform only supports authenticating to Azure with the Azure CLI. Authenticating using Azure PowerShell isn't supported. Therefore, while you can use the Azure PowerShell module when doing your Terraform work, you first need to [authenticate to Azure](/azure/developer/terraform/authenticate-to-azure).
5353

5454
## Implement the Terraform code
5555

articles/azure-arc/servers/troubleshoot-extended-security-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Ensure that both the licensing package and servicing stack update (SSU) are down
6666
If installing the Extended Security Update enabled by Azure Arc fails with errors such as "ESU: Trying to Check IMDS Again LastError=HRESULT_FROM_WIN32(12029)" or "ESU: Trying to Check IMDS Again LastError=HRESULT_FROM_WIN32(12002)", you may need to update the intermediate certificate authorities trusted by your computer using one of the following methods.
6767

6868
> [!IMPORTANT]
69-
> If you're running the [latest version of the Azure Connected machine agent](agent-release-notes.md), it's not necessary to install the intermediate CA certificates or allow access to the PKI URL.
69+
> If you're running the [latest version of the Azure Connected machine agent](agent-release-notes.md), it's not necessary to install the intermediate CA certificates or allow access to the PKI URL. However, if a license was already assigned before the agent was upgraded, it can take up to 15 days for the older license to be replaced. During this time, the intermediate cert will still be required. After upgrading the agent, you can delete the license file `%ProgramData%\AzureConnectedMachineAgent\certs\license.json` to force it to be refreshed.
7070
7171
#### Option 1: Allow access to the PKI URL
7272

articles/backup/quick-kubernetes-backup-terraform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Things to ensure before you configure AKS backup:
6767

6868
Log in to your Azure account and authenticate using one of the following methods:
6969

70-
[!INCLUDE [authenticate-to-azure.md](~/azure-dev-docs-pr/articles/terraform/includes/authenticate-to-azure.md)]
70+
Terraform only supports authenticating to Azure with the Azure CLI. Authenticating using Azure PowerShell isn't supported. Therefore, while you can use the Azure PowerShell module when doing your Terraform work, you first need to [authenticate to Azure](/azure/developer/terraform/authenticate-to-azure).
7171

7272
## Implement the Terraform code
7373

articles/firewall/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Azure Firewall can be configured during deployment to span multiple Availability
4949

5050
You can also associate Azure Firewall to a specific zone just for proximity reasons, using the service standard 99.95% SLA.
5151

52-
There's no extra cost for a firewall deployed in more than one Availability Zone. However, there are added costs for inbound and outbound data transfers associated with Availability Zones. For more information, see [Bandwidth pricing details](https://azure.microsoft.com/pricing/details/bandwidth/).
52+
There's no extra cost for a firewall deployed in more than one Availability Zone. Also, Microsoft has announced that Azure won't charge for the data transfer across availability zones, regardless of whether you use private or public IPs on your [Azure resources](https://azure.microsoft.com/updates/update-on-interavailability-zone-data-transfer-pricing/).
5353

5454
As the firewall scales, it creates instances in the zones it's in. So, if the firewall is in Zone 1 only, new instances are created in Zone 1. If the firewall is in all three zones, then it creates instances across the three zones as it scales.
5555

articles/service-bus-messaging/build-message-driven-apps-nservicebus.md

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ The sample assumes you've [created an Azure Service Bus namespace](service-bus-q
3232
The following diagram, generated by [ServiceInsight](https://particular.net/serviceinsight), a visualization and debugging tool from Particular Software, shows the message flow:
3333

3434
:::image type="content" source="./media/nservicebus/sequence-diagram.png" alt-text="Image showing the sequence diagram":::
35-
1. Open `SendReceiveWithNservicebus.sln` in your favorite code editor (For example, Visual Studio 2019).
35+
1. Open `SendReceiveWithNservicebus.sln` in your favorite code editor (For example, Visual Studio 2022).
3636
1. Open `appsettings.json` in both the Receiver and Sender projects and set `AzureServiceBusConnectionString` to the connection string for your Azure Service Bus namespace.
37-
38-
37+
- This can be found in the Azure portal under **Service Bus Namespace** > **Settings** > **Shared access policies** > **RootManageSharedAccessKey** > **Primary Connection String** .
38+
- The `AzureServiceBusTransport` also has a constructor that accepts a namespace and token credential, which in a production environment will be more secure, however for the purposes of this tutorial the shared access key connection string will be used.
3939

4040
## Define the shared message contracts
4141

@@ -86,14 +86,15 @@ var host = Host.CreateDefaultBuilder(args)
8686
// Configure the NServiceBus endpoint
8787
var endpointConfiguration = new EndpointConfiguration("Sender");
8888

89-
var transport = endpointConfiguration.UseTransport<AzureServiceBusTransport>();
9089
var connectionString = context.Configuration.GetConnectionString("AzureServiceBusConnectionString");
91-
transport.ConnectionString(connectionString);
90+
// If token credentials are to be used, the overload constructor for AzureServiceBusTransport would be used here
91+
var routing = endpointConfiguration.UseTransport(new AzureServiceBusTransport(connectionString));
92+
endpointConfiguration.UseSerialization<SystemJsonSerializer>();
9293

93-
transport.Routing().RouteToEndpoint(typeof(Ping), "Receiver");
94+
endpointConfiguration.AuditProcessedMessagesTo("audit");
95+
routing.RouteToEndpoint(typeof(Ping), "Receiver");
9496

9597
endpointConfiguration.EnableInstallers();
96-
endpointConfiguration.AuditProcessedMessagesTo("audit");
9798

9899
return endpointConfiguration;
99100
})
@@ -140,13 +141,11 @@ public class SenderWorker : BackgroundService
140141
var round = 0;
141142
while (!stoppingToken.IsCancellationRequested)
142143
{
143-
await messageSession.Send(new Ping { Round = round++ })
144-
.ConfigureAwait(false);
144+
await messageSession.Send(new Ping { Round = round++ });;
145145

146146
logger.LogInformation($"Message #{round}");
147147

148-
await Task.Delay(1_000, stoppingToken)
149-
.ConfigureAwait(false);
148+
await Task.Delay(1_000, stoppingToken);
150149
}
151150
}
152151
catch (OperationCanceledException)
@@ -204,11 +203,10 @@ Let's ignore the commented code for now; we'll get back to it later when we talk
204203

205204
The class implements `IHandleMessages<Ping>`, which defines one method: `Handle`. This interface tells NServiceBus that when the endpoint receives a message of type `Ping`, it should be processed by the `Handle` method in this handler. The `Handle` method takes the message itself as a parameter, and an `IMessageHandlerContext`, which allows further messaging operations, such as replying, sending commands, or publishing events.
206205

207-
Our `PingHandler` is straightforward: when a `Ping` message is received, log the message details and reply back to the sender with a new `Pong` message.
206+
Our `PingHandler` is straightforward: when a `Ping` message is received, log the message details and reply back to the sender with a new `Pong` message, which is subsequently handled in the Sender's `PongHandler`.
208207

209208
> [!NOTE]
210209
> In the Sender's configuration, you specified that `Ping` messages should be routed to the Receiver. NServiceBus adds metadata to the messages indicating, among other things, the origin of the message. This is why you don't need to specify any routing data for the `Pong` reply message; it's automatically routed back to its origin: the Sender.
211-
>
212210
213211
With the Sender and Receiver both properly configured, you can now run the solution.
214212

@@ -301,21 +299,20 @@ Next, it's time to figure out where to deploy our solution in Azure.
301299
In this sample, the Sender and Receiver endpoints are configured to run as console applications. They can also be hosted in various Azure services including Azure Functions, Azure App Services, Azure Container Instances, Azure Kubernetes Services, and Azure VMs. For example, here's how the Sender endpoint can be configured to run as an Azure Function:
302300

303301
```csharp
304-
[assembly: FunctionsStartup(typeof(Startup))]
305-
[assembly: NServiceBusEndpointName("Sender")]
306-
307-
public class Startup : FunctionsStartup
302+
[assembly: NServiceBusTriggerFunction("Sender")]
303+
public class Program
308304
{
309-
public override void Configure(IFunctionsHostBuilder builder)
305+
public static async Task Main()
310306
{
311-
builder.UseNServiceBus(() =>
312-
{
313-
var configuration = new ServiceBusTriggeredEndpointConfiguration("Sender");
314-
var transport = configuration.AdvancedConfiguration.Transport;
315-
transport.Routing().RouteToEndpoint(typeof(Ping), "Receiver");
307+
var host = new HostBuilder()
308+
.ConfigureFunctionsWorkerDefaults()
309+
.UseNServiceBus(configuration =>
310+
{
311+
configuration.Routing().RouteToEndpoint(typeof(Ping), "Receiver");
312+
})
313+
.Build();
316314

317-
return configuration;
318-
});
315+
await host.RunAsync();
319316
}
320317
}
321318
```

articles/service-fabric/service-fabric-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you want to find a list of all the available Service Fabric runtime versions
2020
### Current versions
2121
| Service Fabric runtime |Can upgrade directly from|Can downgrade to*|Compatible SDK or NuGet package version|Supported .NET runtimes** |OS Version |End of support |
2222
| --- | --- | --- | --- | --- | --- | --- |
23-
| 10.1 CU3<br>10.1.2175.9590 | 9.1 CU6<br>9.1.1851.9590 | 9.0 | Less than or equal to version 7.1 | .NET 7, .NET 6, All, <br> >= .NET Framework 4.6.2 | [See supported OS version](#supported-windows-versions-and-support-end-date) | Current version |
23+
| 10.1 CU3<br>10.1.2175.9590 | 9.1 CU6<br>9.1.1851.9590 | 9.0 | Less than or equal to version 7.1 | .NET 8, .NET 7, .NET 6, All, <br> >= .NET Framework 4.6.2 | [See supported OS version](#supported-windows-versions-and-support-end-date) | Current version |
2424
| 10.1 CU2<br>10.1.1951.9590 | 9.1 CU6<br>9.1.1851.9590 | 9.0 | Less than or equal to version 7.1 | .NET 7, .NET 6, All, <br> >= .NET Framework 4.6.2 | [See supported OS version](#supported-windows-versions-and-support-end-date) | Current version |
2525
| 10.1 RTO<br>10.1.1541.9590 | 9.1 CU6<br>9.1.1851.9590 | 9.0 | Less than or equal to version 7.1 | .NET 7, .NET 6, All, <br> >= .NET Framework 4.6.2 | [See supported OS version](#supported-windows-versions-and-support-end-date) | Current version |
2626
| 10.0 CU4<br>10.0.2382.9590 | 9.0 CU10<br>9.0.1553.9590 | 9.0 | Less than or equal to version 7.0 | .NET 7, .NET 6, All, <br> >= .NET Framework 4.6.2 | [See supported OS version](#supported-windows-versions-and-support-end-date) | September 30, 2024 |

articles/virtual-network/virtual-networks-udr-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ You create custom routes by either creating [user-defined](#user-defined) routes
7070

7171
### User-defined
7272

73-
You can create custom, or user-defined(static), routes in Azure to override Azure's default system routes, or to add more routes to a subnet's route table. In Azure, you create a route table, then associate the route table to zero or more virtual network subnets. Each subnet can have zero or one route table associated to it. To learn about the maximum number of routes you can add to a route table and the maximum number of user-defined route tables you can create per Azure subscription, see [Azure limits](../azure-resource-manager/management/azure-subscription-service-limits.md?toc=%2fazure%2fvirtual-network%2ftoc.json#networking-limits). When you create a route table and associate it to a subnet, the table's routes are combined with the subnet's default routes. If there are conflicting route assignments, user-defined routes override the default routes.
73+
To customize your traffic routes, you shouldn't modify the default routes but you should create custom, or user-defined(static) routes which override Azure's default system routes. In Azure, you create a route table, then associate the route table to zero or more virtual network subnets. Each subnet can have zero or one route table associated to it. To learn about the maximum number of routes you can add to a route table and the maximum number of user-defined route tables you can create per Azure subscription, see [Azure limits](../azure-resource-manager/management/azure-subscription-service-limits.md?toc=%2fazure%2fvirtual-network%2ftoc.json#networking-limits). When you create a route table and associate it to a subnet, the table's routes are combined with the subnet's default routes. If there are conflicting route assignments, user-defined routes override the default routes.
7474

7575
You can specify the following next hop types when creating a user-defined route:
7676

0 commit comments

Comments
 (0)