pull 1.25 new samples and updates to public GitHub repository. (Azure…

…-Samples#1812)

* pull 1.25 new samples and updates to public GitHub repository.

* also update the sdk version used by all the samples.

* add step to install maui-android, so new maui smaples will build in ci.

* adding the maui-android workflow did not fix the restore fialure.  Exclude the maui project from CiCd build like in carbon.

* adding the maui-android workflow did not fix the restore fialure.  Exclude the maui project from CiCd build like in carbon.

* adding the maui-android workflow did not fix the restore fialure.  Exclude the maui project from CiCd build like in carbon.

* adding the maui-android workflow did not fix the restore fialure.  Exclude the maui project from CiCd build like in carbon.

* adding the maui-android workflow did not fix the restore fialure.  Exclude the maui project from CiCd build like in carbon.

.gitattributes

@@ -31,6 +31,7 @@ proguard-rules.pro text
 *.kt text
 *.lst text
 *.m text
+*.manifest text
 *.mat text
 *.md text
 *.meta text
@@ -48,6 +49,7 @@ proguard-rules.pro text
 *.runsettings text
 *.sln text
 *.storyboard text
+*.svg text
 *.swift text
 *.ts text
 *.txt text
@@ -75,6 +77,7 @@ proguard-rules.pro text
 *.pfx binary
 *.png binary
 *.table binary
+*.ttf binary
 *.wav binary
 *.zip binary
 *.webp binary

README.md

@@ -47,7 +47,7 @@ The [SDK documentation](https://aka.ms/csspeech) has extensive sections about ge
 ## Build and run the samples
 
 > **Note: the samples make use of the Microsoft Cognitive Services Speech SDK.
-> By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+> By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
 
 Please see the description of each individual sample for instructions on how to build and run it.
 

ci/build.yml

@@ -76,6 +76,8 @@ jobs:
   steps:
   - bash: 'perl ci/patch-samples.pl "$(SpeechSdkVersion)" . && git diff'
     displayName: Patch samples
+  # - bash: 'dotnet workload install maui-android'
+  #   displayName: install maui-android workload.
   - task: NuGetToolInstaller@0
     displayName: Use NuGet $(SPEECHSDK_NUGET_VERSION)
     inputs:
@@ -85,12 +87,12 @@ jobs:
       command: restore
       vstsFeed: $(V_VSTS_FEED)
       includeNuGetOrg: $(V_INCLUDE_NUGET_ORG)
-      restoreSolution: '**\*.sln;!**\BatchIngestionClient.sln;!**\embedded-speech\*.sln;!**\BatchSynthesisSample.sln;!**\batchclient.sln' # Restoring everything but samples specific to .NET 6.0
+      restoreSolution: '**\*.sln;!**\BatchIngestionClient.sln;!**\embedded-speech\*.sln;!**\BatchSynthesisSample.sln;!**\batchclient.sln;!**\maui\speech-to-text\*.sln' # Restoring everything but samples specific to .NET 6.0
   # Note: for now building any platform. In the future, should build all available.
   - task: VSBuild@1
     inputs:
       maximumCpuCount: true
-      solution: '**\*.sln;-:**\BatchIngestionClient.sln;-:**\embedded-speech\*.sln;-:**\BatchSynthesisSample.sln;-:**\batchclient.sln' # Build everything but samples specific to .NET 6.0
+      solution: '**\*.sln;-:**\BatchIngestionClient.sln;-:**\embedded-speech\*.sln;-:**\BatchSynthesisSample.sln;-:**\batchclient.sln;-:**\maui\speech-to-text\*.sln' # Build everything but samples specific to .NET 6.0
     displayName: 'Build samples (*.sln)'
     # Must set this to false, otherwise a build break will be treated as warning and the task will pass.
     # This however also means that we will stop building when we hit a build break. We will not continue building other VS projects.

quickstart/cpp/linux/from-microphone/README.md

@@ -33,7 +33,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic
 
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Download and extract the Speech SDK
-  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
   * Run the following commands after replacing the string `/your/path` with a directory (absolute path) of your choice:
 
     ```sh

quickstart/cpp/linux/text-to-speech/README.md

@@ -33,7 +33,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic
 
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Download and extract the Speech SDK
-  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
   * Run the following commands after replacing the string `/your/path` with a directory (absolute path) of your choice:
 
     ```sh

quickstart/cpp/macos/from-microphone/README.md

@@ -12,7 +12,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic
 
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Download and extract the Speech SDK
-  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
   * Run the following commands after replacing the string `/your/path` with a directory (absolute path) of your choice:
 
     ```sh

quickstart/cpp/macos/text-to-speech/README.md

@@ -11,7 +11,7 @@ This sample demonstrates how to synthesize speech with C++ using the Speech SDK
 
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Download and extract the Speech SDK
-  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+  * **By downloading the Microsoft Cognitive Services Speech SDK, you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
   * Run the following commands after replacing the string `/your/path` with a directory (absolute path) of your choice:
 
     ```sh

quickstart/cpp/windows/from-file/README.md

@@ -12,7 +12,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic
 
 ## Build the sample
 
-* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**.
 * Navigate to the folder containing this sample, and select the solution file contained within it.

quickstart/cpp/windows/from-file/helloworld/helloworld.vcxproj

@@ -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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
+    <Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
   </Target>
 </Project>

quickstart/cpp/windows/from-file/helloworld/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CognitiveServices.Speech" version="1.24.0" targetFramework="native" />
+  <package id="Microsoft.CognitiveServices.Speech" version="1.25.0" targetFramework="native" />
 </packages>

quickstart/cpp/windows/from-microphone/README.md

@@ -13,7 +13,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic
 
 ## Build the sample
 
-* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**.
 * Navigate to the folder containing this sample, and select the solution file contained within it.

quickstart/cpp/windows/from-microphone/helloworld/helloworld.vcxproj

@@ -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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
+    <Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
   </Target>
 </Project>

quickstart/cpp/windows/from-microphone/helloworld/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CognitiveServices.Speech" version="1.24.0" targetFramework="native" />
+  <package id="Microsoft.CognitiveServices.Speech" version="1.25.0" targetFramework="native" />
 </packages>

quickstart/cpp/windows/intent-recognition/README.md

@@ -12,7 +12,7 @@ This sample demonstrates how to recognize intent with C++ using the Speech SDK f
 
 ## Build the sample
 
-* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**.
 * Navigate to the folder containing this sample, and select the solution file contained within it.

quickstart/cpp/windows/intent-recognition/helloworld/helloworld.vcxproj

@@ -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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
+    <Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
   </Target>
 </Project>

quickstart/cpp/windows/intent-recognition/helloworld/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CognitiveServices.Speech" version="1.24.0" targetFramework="native" />
+  <package id="Microsoft.CognitiveServices.Speech" version="1.25.0" targetFramework="native" />
 </packages>

quickstart/cpp/windows/multi-device-conversation/README.md

@@ -13,7 +13,7 @@ See the [accompanying article](https://docs.microsoft.com/azure/cognitive-servic
 
 ## Build the sample
 
-* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
 * Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**.
 * Navigate to the folder containing this sample, and select the solution file contained within it.
 * Edit the `helloworld.cpp` source:

quickstart/cpp/windows/multi-device-conversation/helloworld/helloworld.vcxproj

@@ -158,12 +158,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
+    <Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
   </Target>
 </Project>

quickstart/cpp/windows/multi-device-conversation/helloworld/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CognitiveServices.Speech" version="1.24.0" targetFramework="native" />
+  <package id="Microsoft.CognitiveServices.Speech" version="1.25.0" targetFramework="native" />
 </packages>

quickstart/cpp/windows/speaker-recognition/README.md

@@ -13,7 +13,7 @@ In this quickstart, you'll learn how to do speaker recognition, including creati
 
 ## Build the sample
 
-* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license201809).**
+* **By building this sample you will download the Microsoft Cognitive Services Speech SDK. By downloading you acknowledge its license, see [Speech SDK license agreement](https://aka.ms/csspeech/license).**
 * [Download the sample code to your development PC.](/README.md#get-the-samples)
 * Start Microsoft Visual Studio 2019 and select **File** \> **Open** \> **Project/Solution**.
 * Navigate to the folder containing this sample, and select the solution file contained within it.

quickstart/cpp/windows/speaker-recognition/helloworld/helloworld.vcxproj

@@ -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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" />
+    <Import Project="..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets" Condition="Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\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.24.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.24.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CognitiveServices.Speech.1.25.0\build\native\Microsoft.CognitiveServices.Speech.targets'))" />
   </Target>
 </Project>

quickstart/cpp/windows/speaker-recognition/helloworld/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CognitiveServices.Speech" version="1.24.0" targetFramework="native" />
+  <package id="Microsoft.CognitiveServices.Speech" version="1.25.0" targetFramework="native" />
 </packages>