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

Merge samples for 1.41.1 updates #2623

Merged
merged 11 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/ingestion_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,15 @@ jobs:

- name: Validate ARM Template
run: |
if ! cmp -s ./samples/ingestion/ingestion-client/infra/main.json ./samples/ingestion/ingestion-client/infra/generated_main.json; then
if ! cmp ./samples/ingestion/ingestion-client/infra/main.json ./samples/ingestion/ingestion-client/infra/generated_main.json; then
echo "Generated ARM template does not match the existing main.json. Please update main.json accordingly." >&2
echo "====================main.json"===================="
cat ./samples/ingestion/ingestion-client/infra/main.json
echo "=================================================="
echo
echo "===============generated_main.json"==============="
cat ./samples/ingestion/ingestion-client/infra/generated_main.json
echo "=================================================="
exit 1
fi

Expand Down
7 changes: 1 addition & 6 deletions quickstart/cpp/linux/from-microphone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic

* A subscription key for the Speech service. See [Try the speech service for free](https://docs.microsoft.com/azure/cognitive-services/speech-service/get-started).
* A Linux PC with a working microphone.
* On Ubuntu or Debian, install these packages to build and run this sample:

```sh
sudo apt-get update
sudo apt-get install build-essential libssl-dev libasound2 wget
```
* See the [Linux platform requirements](https://learn.microsoft.com/azure/ai-services/speech-service/quickstarts/setup-platform?tabs=linux&pivots=programming-language-cpp#platform-requirements) for installing the required dependencies.

## Build the sample

Expand Down
2 changes: 1 addition & 1 deletion quickstart/cpp/linux/from-microphone/helloworld.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void recognizeSpeech() {
cout << "Say something...\n";

// Starts speech recognition, and returns after a single utterance is recognized. The end of a
// single utterance is determined by listening for silence at the end or until a maximum of 15
// single utterance is determined by listening for silence at the end or until a maximum of about 30
// seconds of audio is processed. The task returns the recognition text as result.
// Note: Since RecognizeOnceAsync() returns only a single utterance, it is suitable only for single
// shot recognition like command or query.
Expand Down
7 changes: 1 addition & 6 deletions quickstart/cpp/linux/text-to-speech/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic

* A subscription key for the Speech service. See [Try the speech service for free](https://docs.microsoft.com/azure/cognitive-services/speech-service/get-started).
* A Linux PC with a working speaker or headset.
* On Ubuntu or Debian, install these packages to build and run this sample:

```sh
sudo apt-get update
sudo apt-get install build-essential libssl-dev libasound2 wget
```
* See the [Linux platform requirements](https://learn.microsoft.com/azure/ai-services/speech-service/quickstarts/setup-platform?tabs=linux&pivots=programming-language-cpp#platform-requirements) for installing the required dependencies.

## Build the sample

Expand Down
2 changes: 1 addition & 1 deletion quickstart/cpp/windows/from-file/helloworld/helloworld.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void recognizeSpeechFromWavFile()
auto recognizer = SpeechRecognizer::FromConfig(config, audioInput);

// Starts speech recognition, and returns after a single utterance is recognized. The end of a
// single utterance is determined by listening for silence at the end or until a maximum of 15
// single utterance is determined by listening for silence at the end or until a maximum of about 30
// seconds of audio is processed. The task returns the recognition text as result.
// Note: Since RecognizeOnceAsync() returns only a single utterance, it is suitable only for single
// shot recognition like command or query.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<!-- N.B. the .targets extensions must be spelled out here -->
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CognitiveServices.Speech" version="1.40.0" targetFramework="native" />
<package id="Microsoft.CognitiveServices.Speech" version="1.41.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ void recognizeSpeech()
cout << "Say something...\n";

// Starts speech recognition, and returns after a single utterance is recognized. The end of a
// single utterance is determined by listening for silence at the end or until a maximum of 15
// single utterance is determined by listening for silence at the end or until a maximum of about 30
// seconds of audio is processed. The task returns the recognition text as result.
// Note: Since RecognizeOnceAsync() returns only a single utterance, it is suitable only for single
// shot recognition like command or query.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<!-- N.B. the .targets extensions must be spelled out here -->
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CognitiveServices.Speech" version="1.40.0" targetFramework="native" />
<package id="Microsoft.CognitiveServices.Speech" version="1.41.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void recognizeIntent()
cout << "Say something...\n";

// Starts intent recognition, and returns after a single utterance is recognized. The end of a
// single utterance is determined by listening for silence at the end or until a maximum of 15
// single utterance is determined by listening for silence at the end or until a maximum of about 30
// seconds of audio is processed. The task returns the recognition text as result.
// Note: Since RecognizeOnceAsync() returns only a single utterance, it is suitable only for single
// shot recognition like command or query.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<!-- N.B. the .targets extensions must be spelled out here -->
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CognitiveServices.Speech" version="1.40.0" targetFramework="native" />
<package id="Microsoft.CognitiveServices.Speech" version="1.41.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CognitiveServices.Speech" version="1.40.0" targetFramework="native" />
<package id="Microsoft.CognitiveServices.Speech" version="1.41.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<!-- N.B. the .targets extensions must be spelled out here -->
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CognitiveServices.Speech" version="1.40.0" targetFramework="native" />
<package id="Microsoft.CognitiveServices.Speech" version="1.41.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<!-- N.B. the .targets extensions must be spelled out here -->
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CognitiveServices.Speech" version="1.40.0" targetFramework="native" />
<package id="Microsoft.CognitiveServices.Speech" version="1.41.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void TranslationWithMicrophone()
cout << "Say something...\n";

// Starts translation, and returns after a single utterance is recognized. The end of a
// single utterance is determined by listening for silence at the end or until a maximum of 15
// single utterance is determined by listening for silence at the end or until a maximum of about 30
// seconds of audio is processed. The task returns the recognized text as well as the translation.
// Note: Since RecognizeOnceAsync() returns only a single utterance, it is suitable only for single
// shot recognition like command or query.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
<Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.40.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.41.1\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CognitiveServices.Speech" version="1.40.0" targetFramework="native" />
<package id="Microsoft.CognitiveServices.Speech" version="1.41.1" targetFramework="native" />
</packages>
Loading
Loading