Skip to content

Commit 1bb8d88

Browse files
authored
Merge branch 'MicrosoftDocs:main' into aca/v-jaswel_add_display_name_to_overview_topics_20240613
2 parents 2a8f0fa + c6e898e commit 1bb8d88

File tree

186 files changed

+651
-401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+651
-401
lines changed

articles/ai-services/openai/references/on-your-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI On Your Data Python & REST API.
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: conceptual
8-
ms.date: 03/12/2024
8+
ms.date: 06/13/2024
99
author: mrbullwinkle
1010
ms.author: mbullwin
1111
recommendations: false
@@ -49,7 +49,7 @@ The request body inherits the same schema of chat completions API request. This
4949

5050
|Name | Type | Required | Description |
5151
|--- | --- | --- | --- |
52-
| `data_sources` | [DataSource](#data-source)[] | True | The configuration entries for Azure OpenAI On Your Data. There must be exactly one element in the array. If `data_sources` is not provided, the service uses chat completions model directly, and does not use Azure OpenAI On Your Data.|
52+
| `data_sources` | [DataSource](#data-source)[] | True | The configuration entries for Azure OpenAI On Your Data. There must be exactly one element in the array. If `data_sources` is not provided, the service uses chat completions model directly, and does not use Azure OpenAI On Your Data. When you specify the `data_sources` parameter, you won't be able to to use the `logprobs` or `top_logprobs` parameters. |
5353

5454
## Response body
5555

articles/ai-studio/how-to/model-catalog-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ Llama-3-70B-Instruct <br> Llama-3-8B-Instruct | [Microsoft Managed Countries](/p
136136
Llama-2-7b <br> Llama-2-13b <br> Llama-2-70b | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, West US, West US 3 | West US 3
137137
Llama-2-7b-chat <br> Llama-2-13b-chat <br> Llama-2-70b-chat | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, West US, West US 3, | Not available
138138
Mistral Small | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
139-
Mistral-Large | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, France Central, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
139+
Mistral-Large | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) <br> Brazil <br> Hong Kong <br> Israel| East US, East US 2, France Central, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
140140
Cohere-command-r-plus <br> Cohere-command-r <br> Cohere-embed-v3-english <br> Cohere-embed-v3-multilingual | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) <br> Japan | East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
141-
TimeGEN-1 | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
141+
TimeGEN-1 | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) <br> Mexico <br> Israel| East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
142142
jais-30b-chat | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
143143
Phi-3-mini-4k-instruct | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US 2, Canada Central, Sweden Central, West US 3 | Not available
144144
Phi-3-mini-128k-instruct <br> Phi-3-medium-4k-instruct <br> Phi-3-medium-128k-instruct | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US 2, Sweden Central | Not available

articles/azure-arc/kubernetes/extensions-release.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Available extensions for Azure Arc-enabled Kubernetes clusters"
3-
ms.date: 05/21/2024
3+
ms.date: 06/12/2024
44
ms.topic: how-to
55
description: "See which extensions are currently available for Azure Arc-enabled Kubernetes clusters and view release notes."
66
---
@@ -121,7 +121,7 @@ The most recent version of the Flux v2 extension and the two previous versions (
121121
> [!NOTE]
122122
> When a new version of the `microsoft.flux` extension is released, it may take several days for the new version to become available in all regions.
123123
124-
### 1.9.1 (April 2024)
124+
### 1.10.0 (June 2024)
125125

126126
Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1.2)
127127

@@ -134,10 +134,9 @@ Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1
134134

135135
Changes made for this version:
136136

137-
- The log-level parameters for controllers (including `fluxconfig-agent` and `fluxconfig-controller`) are now customizable. For more information, see [Configurable log-level parameters](tutorial-use-gitops-flux2.md#configurable-log-level-parameters).
138-
- Helm chart changes to expose new SSH host key algorithm to connect to Azure DevOps. For more information, see [Azure DevOps SSH-RSA deprecation](tutorial-use-gitops-flux2.md#azure-devops-ssh-rsa-deprecation).
137+
- The `FluxConfig` custom resource now includes support for [OCI repositories](https://fluxcd.io/flux/components/source/ocirepositories/). This enhancement means that Flux configurations can accommodate Git repository, Buckets, Azure Blob storage, or OCI repository as valid source types.
139138

140-
### 1.8.4 (April 2024)
139+
### 1.9.1 (April 2024)
141140

142141
Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1.2)
143142

@@ -150,16 +149,14 @@ Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1
150149

151150
Changes made for this version:
152151

153-
- Updated source-controller to v1.2.5 [to address security vulnerability](https://github.com/advisories/GHSA-v554-xwgw-hc3w)
154-
155-
### 1.8.3 (March 2024)
152+
- The log-level parameters for controllers (including `fluxconfig-agent` and `fluxconfig-controller`) are now customizable. For more information, see [Configurable log-level parameters](tutorial-use-gitops-flux2.md#configurable-log-level-parameters).
153+
- Helm chart changes to expose new SSH host key algorithm to connect to Azure DevOps. For more information, see [Azure DevOps SSH-RSA deprecation](tutorial-use-gitops-flux2.md#azure-devops-ssh-rsa-deprecation).
156154

157-
> [!NOTE]
158-
> We recommend upgrading to version 1.8.4 or later due to a [security vulnerability](https://github.com/advisories/GHSA-v554-xwgw-hc3w) that has been fixed starting with 1.8.4.
155+
### 1.8.4 (April 2024)
159156

160157
Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1.2)
161158

162-
- source-controller: v1.1.2
159+
- source-controller: v1.2.5
163160
- kustomize-controller: v1.1.1
164161
- helm-controller: v0.36.2
165162
- notification-controller: v1.1.0
@@ -168,7 +165,7 @@ Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1
168165

169166
Changes made for this version:
170167

171-
- The log-level parameters for controllers are now customizable. For more information, see [Configurable log-level parameters](tutorial-use-gitops-flux2.md#configurable-log-level-parameters).
168+
- Updated source-controller to v1.2.5 [to address security vulnerability](https://github.com/advisories/GHSA-v554-xwgw-hc3w)
172169

173170
## Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
174171

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Move operation support by resource type
33
description: Lists the Azure resource types that can be moved to a new resource group, subscription, or region.
44
ms.topic: conceptual
5-
ms.date: 03/19/2024
5+
ms.date: 06/13/2024
66
---
77

88
# Move operation support for resources
@@ -992,7 +992,7 @@ Before starting your move operation, review the [checklist](./move-resource-grou
992992
> | Resource type | Resource group | Subscription | Region move |
993993
> | ------------- | ----------- | ---------- | ----------- |
994994
> | accounts | **Yes** | **Yes** | No. [Learn more](../../azure-monitor/app/create-workspace-resource.md#how-do-i-move-an-application-insights-resource-to-a-new-region). |
995-
> | actiongroups | **Yes** | **Yes** | No |
995+
> | actiongroups | No | No | No |
996996
> | activitylogalerts | No | No | No |
997997
> | alertrules | **Yes** | **Yes** | No |
998998
> | autoscalesettings | **Yes** | **Yes** | No |
-27.2 KB
Loading

articles/cdn/cdn-create-a-storage-account-with-cdn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Sign in to the [Azure portal](https://portal.azure.com) with your Azure account.
2727

2828
## Create a storage account
2929

30-
A storage account gives access to Azure Storage services. The storage account represents the highest level of the namespace for accessing each of the Azure Storage service components: Azure Blob, Queue, and Table storage. For more information, see [Introduction to Microsoft Azure Storage](../storage/common/storage-introduction.md).
30+
A storage account gives access to Azure Storage services. The storage account represents the highest level of the namespace for accessing each of the Azure Storage service components: Azure Blob, Queue, and Table storage. Take note that Azure Files can be only accessed through SMB protocol and cannot be put directly behind an Azure CDN which only supports HTTP(80) and HTTPS(443) protocols. For more information, see [Introduction to Microsoft Azure Storage](../storage/common/storage-introduction.md).
3131

3232
To create a storage account, you must be either the service administrator or a coadministrator for the associated subscription.
3333

articles/communication-services/quickstarts/call-automation/includes/quickstart-make-an-outbound-call-using-callautomation-csharp.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ devtunnel create --allow-anonymous
3636
devtunnel port create -p 8080
3737
devtunnel host
3838
```
39+
Alternatively, follow instructions to set up your Azure DevTunnel in [Visual Studio](/aspnet/core/test/dev-tunnels)
3940

4041
## Update your application configuration
4142

@@ -233,7 +234,7 @@ To run the application with VS Code, open a Terminal window and run the followin
233234
```bash
234235
dotnet run
235236
```
236-
237+
Open `http://localhost:8080/swagger/index.html` or your dev tunnel URL in browser. The tunnel URL looks like: `<YOUR DEV TUNNEL ENDPOINT>/swagger/index.html`
237238
# [Visual Studio](#tab/visual-studio)
238239

239-
Press Ctrl+F5 to run without the debugger.
240+
Press Ctrl+F5 to run the web application without the debugger. The web browser automatically opens to a tunnel URL. The tunnel URL looks like: `<YOUR DEV TUNNEL ENDPOINT>/swagger/index.html`

articles/communication-services/quickstarts/voice-video-calling/includes/teams-interop/teams-interop-android.md

Lines changed: 61 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Find the finalized code for this quickstart on [GitHub](https://github.com/Azure
1717

1818
- A working [Communication Services calling Android app](../../getting-started-with-calling.md).
1919
- A [Teams deployment](/deployoffice/teams-install).
20+
- The Minimum Version supported for Teams meeting ID and passcode join API: 2.9.0
2021
- An [access token](../../../identity/access-tokens.md).
2122

2223

@@ -32,19 +33,46 @@ Replace code in activity_main.xml with following snippet. The text box will be u
3233
android:layout_width="match_parent"
3334
android:layout_height="match_parent"
3435
tools:context=".MainActivity">
35-
36-
<EditText
37-
android:id="@+id/teams_meeting_link"
38-
android:layout_width="match_parent"
39-
android:layout_height="wrap_content"
40-
android:ems="10"
41-
android:hint="Teams meeting link"
42-
android:inputType="textUri"
43-
android:layout_marginTop="100dp"
44-
android:layout_marginHorizontal="20dp"
45-
app:layout_constraintEnd_toEndOf="parent"
46-
app:layout_constraintStart_toStartOf="parent"
47-
app:layout_constraintTop_toTopOf="parent" />
36+
37+
<LinearLayout
38+
android:id="@+id/meetingInfoLinearLayout"
39+
android:layout_width="match_parent"
40+
android:layout_height="match_parent"
41+
android:orientation="vertical"
42+
android:layout_marginTop="100dp">
43+
44+
<EditText
45+
android:id="@+id/teams_meeting_link"
46+
android:layout_width="match_parent"
47+
android:layout_height="wrap_content"
48+
android:ems="10"
49+
android:hint="Teams meeting link"
50+
android:inputType="textUri" />
51+
52+
<TextView
53+
android:layout_width="match_parent"
54+
android:layout_height="wrap_content"
55+
android:text="or"
56+
android:textAlignment="center"
57+
android:layout_marginTop="10dp"/>
58+
59+
<EditText
60+
android:id="@+id/teams_meeting_id"
61+
android:layout_width="match_parent"
62+
android:layout_height="wrap_content"
63+
android:ems="10"
64+
android:hint="Teams meeting id"
65+
android:inputType="textUri" />
66+
67+
<EditText
68+
android:id="@+id/teams_meeting_passcode"
69+
android:layout_width="match_parent"
70+
android:layout_height="wrap_content"
71+
android:ems="10"
72+
android:hint="Teams meeting passcode"
73+
android:inputType="textUri" />
74+
75+
</LinearLayout>
4876

4977
<LinearLayout
5078
android:layout_width="match_parent"
@@ -120,6 +148,8 @@ import com.azure.android.communication.calling.HangUpOptions;
120148
import com.azure.android.communication.calling.JoinCallOptions;
121149
import com.azure.android.communication.common.CommunicationTokenCredential;
122150
import com.azure.android.communication.calling.TeamsMeetingLinkLocator;
151+
// import for meeting id and passcode join
152+
// import com.azure.android.communication.calling.TeamsMeetingIdLocator;
123153

124154
public class MainActivity extends AppCompatActivity {
125155
private static final String[] allPermissions = new String[] { Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE };
@@ -159,17 +189,28 @@ public class MainActivity extends AppCompatActivity {
159189
}
160190

161191
EditText calleeIdView = findViewById(R.id.teams_meeting_link);
192+
EditText calleeMeetingId = findViewById(R.id.teams_meeting_id);
193+
EditText calleeMeetingPasscode = findViewById(R.id.teams_meeting_passcode);
162194
String meetingLink = calleeIdView.getText().toString();
195+
String meetingId = calleeMeetingId.getText().toString();
196+
String passcode = calleeMeetingPasscode.getText().toString();
197+
163198
if (meetingLink.isEmpty()) {
164199
Toast.makeText(this, "Please enter Teams meeting link", Toast.LENGTH_SHORT).show();
165200
return;
166201
}
167202

168203
JoinCallOptions options = new JoinCallOptions();
169-
TeamsMeetingLinkLocator teamsMeetingLinkLocator = new TeamsMeetingLinkLocator(meetingLink);
204+
205+
// join with meeting link
206+
TeamsMeetingLinkLocator teamsMeetingLocator = new TeamsMeetingLinkLocator(meetingLink);
207+
208+
// (or) to join with meetingId and passcode use the below code snippet.
209+
//TeamsMeetingIdLocator teamsMeetingIdLocator = new TeamsMeetingIdLocator(meetingId, passcode);
210+
170211
call = agent.join(
171212
getApplicationContext(),
172-
teamsMeetingLinkLocator,
213+
teamsMeetingLocator,
173214
options);
174215
call.addOnStateChangedListener(p -> setCallStatus(call.getState().toString()));
175216
call.addOnIsRecordingActiveChangedListener(p -> setRecordingStatus(call.isRecordingActive()));
@@ -255,6 +296,11 @@ public class MainActivity extends AppCompatActivity {
255296
The Teams meeting link can be retrieved using Graph APIs. This is detailed in [Graph documentation](/graph/api/onlinemeeting-createorget?tabs=http&view=graph-rest-beta&preserve-view=true).
256297
The Communication Services Calling SDK accepts a full Teams meeting link. This link is returned as part of the `onlineMeeting` resource, accessible under the [`joinWebUrl` property](/graph/api/resources/onlinemeeting?view=graph-rest-beta&preserve-view=true). You can also get the required meeting information from the **Join Meeting** URL in the Teams meeting invite itself.
257298

299+
## Get the Teams meeting ID and passcode
300+
* Graph API: Use Graph API to retrieve information about onlineMeeting resource and check the object in property joinMeetingIdSettings.
301+
* Teams: In your Teams application, go to Calendar app and open details of a meeting. Online meetings have meeting ID and passcode in the definition of the meeting.
302+
* Outlook: You can find the meeting ID & passcode in calendar events or in email meeting invites.
303+
258304
## Launch the app and join Teams meeting
259305

260306
The app can now be launched using the "Run App" button on the toolbar (Shift+F10). You should see the following:

articles/communication-services/quickstarts/voice-video-calling/includes/teams-interop/teams-interop-ios.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ import AVFoundation
4444

4545
struct ContentView: View {
4646
@State var meetingLink: String = ""
47+
@State var meetingId: String = ""
48+
@State var meetingPasscode: String = ""
4749
@State var callStatus: String = ""
4850
@State var message: String = ""
4951
@State var recordingStatus: String = ""
@@ -57,6 +59,8 @@ struct ContentView: View {
5759
Form {
5860
Section {
5961
TextField("Teams meeting link", text: $meetingLink)
62+
TextField("Teams meeting id", text: $meetingId)
63+
TextField("Teams meeting passcode", text: $meetingPasscode)
6064
Button(action: joinTeamsMeeting) {
6165
Text("Join Teams Meeting")
6266
}.disabled(callAgent == nil)
@@ -100,8 +104,14 @@ struct ContentView: View {
100104
AVAudioSession.sharedInstance().requestRecordPermission { (granted) in
101105
if granted {
102106
let joinCallOptions = JoinCallOptions()
103-
let teamsMeetingLinkLocator = TeamsMeetingLinkLocator(meetingLink: self.meetingLink)
104-
self.callAgent?.join(with: teamsMeetingLinkLocator, joinCallOptions: joinCallOptions) {(call, error) in
107+
108+
// join with meeting link
109+
let teamsMeetingLocator = TeamsMeetingLinkLocator(meetingLink: self.meetingLink)
110+
111+
// (or) to join with meetingId and passcode use the below code snippet.
112+
// let teamsMeetingLocator = TeamsMeetingIdLocator(with: self.meetingId, passcode: self.meetingPasscode)
113+
114+
self.callAgent?.join(with: teamsMeetingLocator, joinCallOptions: joinCallOptions) {(call, error) in
105115
if (error == nil) {
106116
self.call = call
107117
self.callObserver = CallObserver(self)

0 commit comments

Comments
 (0)