Skip to content

Commit 3dbd5a7

Browse files
author
Vinothini Dharmaraj
committed
merge and aurest fix
1 parent cf04962 commit 3dbd5a7

File tree

11 files changed

+267
-272
lines changed

11 files changed

+267
-272
lines changed

sdk/communication/Azure.Communication.CallAutomation/src/Generated/AzureCommunicationServicesRestClient.cs

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Generated/CallConnectionRestClient.cs

Lines changed: 70 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Generated/CallMediaRestClient.cs

Lines changed: 168 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/MediaStreamingSubscriptionState.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/RecordingKind.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/RecordingStorageKind.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/TranscriptionResultState.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/TranscriptionSubscriptionState.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/communication/Azure.Communication.CallAutomation/src/Models/ConnectRequestInternal.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@
55

66
namespace Azure.Communication.CallAutomation
77
{
8-
<<<<<<<< HEAD:sdk/communication/Azure.Communication.CallAutomation/src/Models/ConnectRequestInternal.cs
98
[CodeGenModel("ConnectRequest")]
109
internal partial class ConnectRequestInternal
11-
========
12-
[CodeGenModel("StopMediaStreamingRequest")]
13-
internal partial class StopMediaStreamingRequestInternal
14-
>>>>>>>> main:sdk/communication/Azure.Communication.CallAutomation/src/Models/StopMediaStreamingRequestInternal.cs
1510
{
1611
}
1712
}

sdk/communication/Azure.Communication.CallAutomation/tests/CallMedias/CallMediaAutomatedLiveTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ public async Task AnswerCallWithMediaStreamingUnmixedTest()
14881488
}
14891489
}
14901490

1491-
[Ignore(reason: "Skipping this until backend issue is fixed Bug 3761433: [Transcription] Transcription Subscription (callconnection properties object) state is showing as disabled instead of inactive for TranscriptionStopped event")]
1491+
// [Ignore(reason: "Skipping this until backend issue is fixed Bug 3761433: [Transcription] Transcription Subscription (callconnection properties object) state is showing as disabled instead of inactive for TranscriptionStopped event")]
14921492
[RecordedTest]
14931493
public async Task CreateCallAndTranscriptionTest()
14941494
{
@@ -1681,7 +1681,7 @@ public async Task AnswerCallAndTranscriptionTest()
16811681
createCallOptions.TranscriptionOptions = transcriptionOptions;
16821682
createCallOptions.CallIntelligenceOptions = new CallIntelligenceOptions()
16831683
{
1684-
CognitiveServicesEndpoint = new Uri(TestEnvironment.CognitiveServiceEndpoint)
1684+
CognitiveServicesEndpoint = new Uri("https://acs-callautomationtestsupporter-eastus.cognitiveservices.azure.com/")
16851685
};
16861686
}
16871687
}

0 commit comments

Comments
 (0)