Skip to content

Commit 3d0c6d8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into HubMetric
2 parents 5b1e938 + 9f47b8a commit 3d0c6d8

10 files changed

+54
-80
lines changed

articles/azure-functions/functions-dotnet-class-library.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ Azure Functions supports C# and C# script programming languages. If you're looki
3131

3232
### Updating to target .NET 8
3333

34-
> [!NOTE]
35-
> Targeting .NET 8 with the in-process model is not yet enabled for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
36-
3734
Apps using the in-process model can target .NET 8 by following the steps outlined in this section. However, if you choose to exercise this option, you should still begin planning your [migration to the isolated worker model](./migrate-dotnet-to-isolated-model.md) in advance of [support ending for the in-process model on November 10, 2026](https://aka.ms/azure-functions-retirements/in-process-model).
3835

3936
Many apps can change the configuration of the function app in Azure without updates to code or redeployment. To run .NET 8 with the in-process model, three configurations are required:

articles/azure-government/documentation-government-overview-dod.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: azure-government
77
ms.topic: article
88
ms.custom: references_regions
99
recommendations: false
10-
ms.date: 05/09/2023
10+
ms.date: 08/15/2024
1111
---
1212

1313
# Department of Defense (DoD) in Azure Government
@@ -92,7 +92,7 @@ The following services are in scope for DoD IL5 PA in US DoD regions (US DoD Cen
9292
- [Microsoft Stream](/stream/overview)
9393
- [Network Watcher](https://azure.microsoft.com/services/network-watcher/)
9494
- [Power Apps](/powerapps/powerapps-overview)
95-
- [Power Apps portal](https://powerapps.microsoft.com/portals/)
95+
- [Power Pages](https://powerapps.microsoft.com/portals/)
9696
- [Power Automate](/power-automate/getting-started) (formerly Microsoft Flow)
9797
- [Power BI](https://powerbi.microsoft.com/)
9898
- [Power BI Embedded](https://azure.microsoft.com/services/power-bi-embedded/)

articles/education-hub/create-assignment-allocate-credit.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
---
2-
title: Create an assignment and allocate credit in the Azure Education Hub
2+
title: Create a lab and allocate credit in the Azure Education Hub
33
description: Learn how to create an assignment, allocate credit, and invite students to a course in the Azure Education Hub.
44
author: rymend
55
ms.author: rymend
66
ms.topic: overview
7-
ms.date: 06/30/2020
7+
ms.date: 08/14/2024
88
ms.service: azure-education
99
---
1010

11-
# Create an assignment and allocate credit in the Azure Education Hub
11+
# Create a lab and allocate credit in the Azure Education Hub
1212

13-
After you set up a course in the Azure Education Hub, you can create an assignment where you allocate credit and invite selected students to your course.
13+
After you set up a lab in the Azure Education Hub, you can add students and allocate credits to them to deploy resources.
1414

1515
## Prerequisites
1616

1717
- An academic grant with an approved credit amount
18-
- A course created in the Education Hub
1918
- A work or school account and a subscription within the course that will access your Azure credit
2019

2120
### Accounts
@@ -27,17 +26,15 @@ The Education Hub accepts any email address in the standard format. It does *not
2726
2827
When you add a work or school account (for example, *student*@*school*.edu) by using role-based access control (RBAC) in the Educator Sponsor Portal or the [Azure portal](https://portal.azure.com), Azure automatically sends email to the recipient. This email requires the user to accept the new account and Azure role before receiving access to the subscription.
2928

30-
If you're a teaching assistant or a professor for a course, be sure to inform students of this requirement so that their subscription appears in the Azure portal as expected. The email should look similar to this example:
29+
If you're a teaching assistant or a professor for a course, be sure to inform students of this requirement so that their subscription appears in the Azure portal as expected.
3130

32-
:::image type="content" source="media/create-assignment-allocate-credit/azure-active-directory-get-started.png" alt-text="Screenshot of an email invitation to access applications in an organization." border="false":::
31+
## Create a lab and invite students
3332

34-
## Create an assignment and invite students to the course
33+
1. Create a lab and fill in the required information such as lab name and method to invite students.
3534

36-
1. Choose the amount of funds to credit to the student's subscription. If not all students will receive the same amount, you can select **Change** and apply a custom amount to each student or project group.
37-
38-
1. Select **Create assignment**.
39-
1. Optionally, you can remove existing students by selecting **Remove** next to each student's name.
40-
1. When you finish, select the **Close** button. The additional permissions appear on the **Sponsor Credit Management** page.
35+
2. After you create the lab, you can begin inviting students to the lab
36+
3. Optionally, you can remove existing students by selecting **Remove** next to each student's name.
37+
4. When you finish, the students added will receive an invitation to join the lab.
4138

4239
## Related content
4340

articles/education-hub/index.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
ms.topic: landing-page
1111
author: tfosmark
1212
ms.author: rymend
13-
ms.date: 07/14/2020
13+
ms.date: 08/15/2024
1414

1515
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1616

@@ -22,12 +22,14 @@ landingContent:
2222
links:
2323
- text: What is Azure Dev Tools for Teaching?
2424
url: ./azure-dev-tools-teaching/about-program.md
25-
- linkListType: how-to-guide
25+
- linkListType: quickstart
2626
links:
2727
- text: Enroll in Azure Dev Tools for Teaching
2828
url: ./azure-dev-tools-teaching/enroll-renew-subscription.md
2929
- text: Set up access
3030
url: ./azure-dev-tools-teaching/set-up-access.md
31+
- linkListType: how-to-guide
32+
links:
3133
- text: Manage students
3234
url: ./azure-dev-tools-teaching/manage-students.md
3335
- text: Download software
@@ -57,5 +59,11 @@ landingContent:
5759
linkLists:
5860
- linkListType: how-to-guide
5961
links:
62+
- text: Get started with the Azure Education Hub
63+
url: get-started-education-hub.md
64+
- linkListType: how-to-guide
65+
links:
66+
- text: Manage your academic grant
67+
url: hub-overview-page.md
6068
- text: Find IDs
6169
url: find-ids.md

articles/healthcare-apis/deidentification/manage-access-rbac.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ ms.date: 07/16/2024
1111

1212
# Use Azure role-based access control with the de-identification service (preview)
1313

14-
Microsoft Entra ID authorizes access rights to secured resources through Azure role-based access control (RBAC). The de-identification service (preview) defines a set of
15-
built-in roles that encompass common sets of permissions used to access de-identification functionality.
14+
Microsoft Entra ID authorizes access rights to secured resources through Azure role-based access control (RBAC). The de-identification service (preview) defines a set of built-in roles that encompass common sets of permissions used to access de-identification functionality.
1615

1716
Microsoft Entra ID uses the concept of a security principal, which can be a user, a group, an application service principal, or a [managed identity for Azure resources](/entra/identity/managed-identities-azure-resources/overview).
1817

19-
When an Azure role is assigned to a Microsoft Entra ID security principal over a specific scope, Azure grants access to that scope for that security principal. For more information about scopes, see
20-
[Understand scope for Azure RBAC](/azure/role-based-access-control/scope-overview).
18+
When an Azure role is assigned to a Microsoft Entra ID security principal over a specific scope, Azure grants access to that scope for that security principal. For more information about scopes, see [Understand scope for Azure RBAC](/azure/role-based-access-control/scope-overview).
2119

2220
## Prerequisites
2321

@@ -47,8 +45,7 @@ You can use different tools to assign built-in roles.
4745

4846
# [Azure portal](#tab/azure-portal)
4947

50-
To use the de-identification service (preview), with Microsoft Entra ID credentials, a security principal must be assigned one of the built-in roles. To learn how to assign these roles to a security
51-
principal, follow the steps in [Assign Azure roles using the Azure portal](/azure/role-based-access-control/role-assignments-portal).
48+
To use the de-identification service (preview), with Microsoft Entra ID credentials, a security principal must be assigned one of the built-in roles. To learn how to assign these roles to a security principal, follow the steps in [Assign Azure roles using the Azure portal](/azure/role-based-access-control/role-assignments-portal).
5249

5350
# [Azure PowerShell](#tab/azure-powershell)
5451

@@ -89,15 +86,13 @@ For more information, see [Assign Azure roles using Azure PowerShell](/azure/rol
8986

9087
# [Azure CLI](#tab/azure-pcli)
9188

92-
To assign an Azure role to a security principal with Azure CLI, use the [az role assignment create](/cli/azure/role/assignment) command. In order to run the command, you must have a role that includes
93-
**Microsoft.Authorization/roleAssignments/write** permissions assigned to you at the corresponding scope or higher.
89+
To assign an Azure role to a security principal with Azure CLI, use the [az role assignment create](/cli/azure/role/assignment) command. In order to run the command, you must have a role that includes **Microsoft.Authorization/roleAssignments/write** permissions assigned to you at the corresponding scope or higher.
9490

9591
The format of the command can differ based on the type of security principal, but `role` and `scope` are required parameters.
9692

9793
The scope for a de-identification service (preview) is in the form `/subscriptions/<Subscription ID>/resourceGroups/<Resource Group Name>/providers/Microsoft.HealthDataAIServices/deidServices/<Deidentification Service Name>`
9894

99-
The following example assigns the **DeID Data Owner** built-in role to a user, scoped to a specific de-identification service. Make sure to replace the placeholder values
100-
in angle brackets `<>` with your own values:
95+
The following example assigns the **DeID Data Owner** built-in role to a user, scoped to a specific de-identification service. Make sure to replace the placeholder values in angle brackets `<>` with your own values:
10196

10297
```azurecli
10398
az role assignment create \

articles/vpn-gateway/about-gateway-skus.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn about VPN Gateway SKUs.
44
author: cherylmc
55
ms.service: azure-vpn-gateway
66
ms.topic: conceptual
7-
ms.date: 07/23/2024
7+
ms.date: 08/15/2024
88
ms.author: cherylmc
99

1010
---
@@ -46,29 +46,28 @@ When you configure a virtual network gateway SKU, select the SKU that satisfies
4646
| --- | --- |
4747
|**Basic** (**) | **Route-based VPN**: 10 tunnels for S2S/connections; no RADIUS authentication for P2S; no IKEv2 for P2S<br>**Policy-based VPN**: (IKEv1): 1 S2S/connection tunnel; no P2S|
4848
| **All Generation1 and Generation2 SKUs except Basic** | **Route-based VPN**: up to 100 tunnels (*), P2S, BGP, active-active, custom IPsec/IKE policy, ExpressRoute/VPN coexistence |
49-
| | |
5049

5150
(*) You can configure "PolicyBasedTrafficSelectors" to connect a route-based VPN gateway to multiple on-premises policy-based firewall devices. Refer to [Connect VPN gateways to multiple on-premises policy-based VPN devices using PowerShell](vpn-gateway-connect-multiple-policybased-rm-ps.md) for details.
5251

53-
(\*\*) The Basic SKU has certain feature and performance limitations and should not be used for production purposes. Verify that the feature that you need is supported before you use the Basic SKU. The Basic SKU doesn't support IPv6 and can only be configured using PowerShell or Azure CLI. Additionally, the Basic SKU doesn't support RADIUS authentication.
52+
(\*\*) The Basic SKU has certain feature and performance limitations and shouldn't be used for production purposes. Verify that the feature that you need is supported before you use the Basic SKU. The Basic SKU doesn't support IPv6 and can only be configured using PowerShell or Azure CLI. Additionally, the Basic SKU doesn't support RADIUS authentication.
5453

5554
## <a name="workloads"></a>Gateway SKUs - Production vs. Dev-Test workloads
5655

5756
Due to the differences in SLAs and feature sets, we recommend the following SKUs for production vs. dev-test:
5857

59-
| **Workload** | **SKUs** |
60-
| --- | --- |
58+
| **Workload** | **SKUs** |
59+
| --- | --- |
6160
| **Production, critical workloads** | All Generation1 and Generation2 SKUs, except Basic|
6261
| **Dev-test or proof of concept** | Basic (**) |
63-
| | |
6462

65-
(\*\*) The Basic SKU has certain feature and performance limitations and should not be used for production purposes. Verify that the feature that you need is supported before you use the Basic SKU. The Basic SKU doesn't support IPv6 and can only be configured using PowerShell or Azure CLI. Additionally, the Basic SKU doesn't support RADIUS authentication.
63+
64+
(\*\*) The Basic SKU has certain feature and performance limitations and shouldn't be used for production purposes. Verify that the feature that you need is supported before you use the Basic SKU. The Basic SKU doesn't support IPv6 and can only be configured using PowerShell or Azure CLI. Additionally, the Basic SKU doesn't support RADIUS authentication.
6665

6766
If you're using the old SKUs (legacy), the production SKU recommendations are Standard and HighPerformance. For information and instructions for old SKUs, see [Gateway SKUs (legacy)](vpn-gateway-about-skus-legacy.md).
6867

6968
## About legacy SKUs
7069

71-
For information about working with the legacy gateway SKUs (Basic, Standard, and High Performance), including SKU deprecation, see [Managing legacy gateway SKUs](vpn-gateway-about-skus-legacy.md).
70+
For information about working with the legacy gateway SKUs (Standard and High Performance), including SKU deprecation, see [Managing legacy gateway SKUs](vpn-gateway-about-skus-legacy.md).
7271

7372
## Specify a SKU
7473

articles/vpn-gateway/vpn-gateway-about-skus-legacy.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,24 @@ For SKU deprecation, see the [SKU deprecation](#sku-deprecation) and SKU depreca
2121

2222
## <a name="agg"></a>Estimated aggregate throughput by SKU
2323

24-
[!INCLUDE [Aggregated throughput by legacy SKU](../../includes/vpn-gateway-table-gwtype-legacy-aggtput-include.md)]
24+
The following table shows the gateway types and the estimated aggregate throughput by gateway SKU. This table applies to the Resource Manager and classic deployment models.
25+
26+
Pricing differs between gateway SKUs. For more information, see [VPN Gateway Pricing](https://azure.microsoft.com/pricing/details/vpn-gateway).
27+
28+
The UltraPerformance gateway SKU isn't represented in this table. For information about the UltraPerformance SKU, see the [ExpressRoute](../expressroute/expressroute-about-virtual-network-gateways.md) documentation.
29+
30+
| | **VPN Gateway throughput (1)** | **VPN Gateway max IPsec tunnels (2)** | **ExpressRoute Gateway throughput** | **VPN Gateway and ExpressRoute coexist** |
31+
| --- | --- | --- | --- | --- |
32+
| **Standard SKU (3)(4)** |100 Mbps |10 |1000 Mbps |Yes |
33+
| **High Performance SKU (3)** |200 Mbps |30 |2000 Mbps |Yes |
34+
35+
(1) The VPN throughput is a rough estimate based on the measurements between VNets in the same Azure region. It isn't a guaranteed throughput for cross-premises connections across the Internet. It's the maximum possible throughput measurement.
36+
37+
(2) The number of tunnels refer to RouteBased VPNs. A PolicyBased VPN can only support one Site-to-Site VPN tunnel.
38+
39+
(3) PolicyBased VPNs aren't supported for this SKU. They're supported for the Basic SKU.
40+
41+
(4) Active-active S2S VPN Gateway connections aren't supported for this SKU. Active-active is supported on the HighPerformance SKU.
2542

2643
## <a name="config"></a>Supported configurations by SKU and VPN type
2744

includes/functions-dotnet-migrate-v4-versions.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ When you migrate your function app, you have the opportunity to choose the targe
1212

1313
| .NET version | [.NET Official Support Policy] release type | Functions process model<sup>1,2</sup> |
1414
| --- | --- | --- |
15-
| .NET 8 | LTS (end of support November 10, 2026) | [Isolated worker model],<br/>[In-process model]<sup>2,3</sup> |
15+
| .NET 8 | LTS (end of support November 10, 2026) | [Isolated worker model],<br/>[In-process model]<sup>2</sup> |
1616
| .NET 6 | LTS (end of support November 12, 2024) | [Isolated worker model],<br/>[In-process model]<sup>2</sup> |
1717
| .NET Framework 4.8 | [See policy][netfxpolicy] | [Isolated worker model] |
1818

1919
<sup>1</sup> The [isolated worker model] supports Long Term Support (LTS) and Standard Term Support (STS) versions of .NET, as well as .NET Framework. The [in-process model] only supports LTS releases of .NET, ending with .NET 8. For a full feature and functionality comparison between the two models, see [Differences between in-process and isolate worker process .NET Azure Functions](../articles/azure-functions/dotnet-isolated-in-process-differences.md).
2020

2121
<sup>2</sup> Support ends for the in-process model on November 10, 2026. For more information, see [this support announcement](https://aka.ms/azure-functions-retirements/in-process-model). For continued full support, you should [migrate your apps to the isolated worker model](../articles/azure-functions/migrate-dotnet-to-isolated-model.md).
2222

23-
<sup>3</sup> Targeting .NET 8 with the in-process model is not yet enabled for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
24-
2523
<!-- <sup>2</sup> See [Preview .NET versions in the isolated worker model](../articles/azure-functions/dotnet-isolated-process-guide.md#preview-net-versions) for details on support, current restrictions, and instructions for using the preview version. -->
2624

2725
[.NET Official Support Policy]: https://dotnet.microsoft.com/platform/support/policy

includes/functions-supported-languages.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ Your function code runs in the same process as the Functions host process. Suppo
2929

3030
| Supported version | Support level | Expected community EOL date |
3131
| ---- | ---- |--- |
32-
| [.NET 8 (LTS)](https://dotnet.microsoft.com/platform/support/policy/dotnet-core#lifecycle)<sup>1</sup> | GA | November 10, 2026 |
32+
| [.NET 8 (LTS)](https://dotnet.microsoft.com/platform/support/policy/dotnet-core#lifecycle) | GA | November 10, 2026 |
3333
| [.NET 6 (LTS)](https://dotnet.microsoft.com/platform/support/policy/dotnet-core#lifecycle) | GA | November 12, 2024 |
3434

35-
<sup>1</sup> Targeting .NET 8 with the in-process model is not yet enabled for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
36-
3735
For more information, see [Develop C# class library functions using Azure Functions](../articles/azure-functions/functions-dotnet-class-library.md). Also supports [C# script functions](../articles/azure-functions/functions-reference-csharp.md).
3836

3937
### [v1.x](#tab/v1/in-process)

0 commit comments

Comments
 (0)