fixing merge conflict

Author: aahill

README.md

@@ -1,3 +1,18 @@
+---
+page_type: sample
+languages:
+- csharp
+- html
+- java
+- javascript
+- swift
+- python
+products:
+- azure
+description: "This repo provides code samples for cognitive services APIs."
+urlFragment: cognitive-services-REST-api-samples
+---
+
 # Samples for REST APIs in Cognitive Services
 
 This repo provides code samples for cognitive services APIs. There are sections for Language, Search, and Vision APIs using various progamming languages. Note that these are just simple wrappers to the APIs. For SDKs and SDK samples there are separate repos. You can check out all cognitive services APIs here: https://azure.microsoft.com/en-us/services/cognitive-services/. You can check out detailed documentation of these APIs here: https://docs.microsoft.com/en-us/azure/#pivot=products&panel=cognitive.

dotnet/ComputerVision/AnalyzeImage/Program.cs

@@ -10,9 +10,10 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.AnalyzeImage
 
     class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
-
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
+        
         static void Main(string[] args)
         {
             AnalyzeImageSample.RunAsync(endpoint, subscriptionKey).Wait(6000);
@@ -26,8 +27,8 @@ public class AnalyzeImageSample
         public static async Task RunAsync(string endpoint, string key)
         {
             Console.WriteLine("Images being analyzed:");
-
-            string imageFilePath = @"Images\faces.jpg"; // See this repo's readme.md for info on how to get these images. Alternatively, you can just set the path to any image on your machine.
+            // See this repo's readme.md for info on how to get these images. Or, set the path to any image on your machine.
+            string imageFilePath = @"Images\faces.jpg"; 
             string remoteImageUrl = "https://github.com/Azure-Samples/cognitive-services-sample-data-files/raw/master/ComputerVision/Images/landmark.jpg";
 
             await AnalyzeFromUrlAsync(remoteImageUrl, endpoint, key);

dotnet/ComputerVision/BatchReadFile/Program.cs

@@ -11,8 +11,9 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.BatchReadFile
 
     public class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
 
         static void Main(string[] args)
         {
@@ -28,8 +29,8 @@ public class BatchReadFileSample
         public static async Task RunAsync(string endpoint, string key)
         {
             Console.WriteLine("Extracting text from the images:");
-
-            string imageFilePath = @"Images\handwritten_text.jpg"; // See this repo's readme.md for info on how to get these images. Alternatively, you can just set the path to any appropriate image on your machine.
+            // See this repo's readme.md for info on how to get these images. Or, set the path to any appropriate image on your machine.
+            string imageFilePath = @"Images\handwritten_text.jpg"; 
             string remoteImageUrl = "https://github.com/Azure-Samples/cognitive-services-sample-data-files/raw/master/ComputerVision/Images/printed_text.jpg";
 
             await BatchReadFileFromStreamAsync(imageFilePath, endpoint, key);  

dotnet/ComputerVision/DescribeImage/Program.cs

@@ -10,13 +10,14 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.DescribeImage
 
     class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
-
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
+        
         static void Main(string[] args)
         {
             DescribeImageSample.RunAsync(endpoint, subscriptionKey).Wait(5000);
-
+            
             Console.WriteLine("\nPress ENTER to exit.");
             Console.ReadLine();
         }
@@ -27,8 +28,8 @@ public class DescribeImageSample
         public static async Task RunAsync(string endpoint, string key)
         {
             Console.WriteLine("Describe an image:");
-
-            string imageFilePath = @"Images\objects.jpg"; // See this repo's readme.md for info on how to get these images. Alternatively, you can just set the path to any appropriate image on your machine.
+            // See this repo's readme.md for info on how to get these images. Or, set the path to any appropriate image on your machine.
+            string imageFilePath = @"Images\objects.jpg"; 
             string remoteImageUrl = "https://github.com/Azure-Samples/cognitive-services-sample-data-files/raw/master/ComputerVision/Images/celebrities.jpg";
 
             await DescribeImageFromStreamAsync(imageFilePath, endpoint, key);

dotnet/ComputerVision/DetectObjects/Program.cs

@@ -10,8 +10,9 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.DetectObjects
 
     class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
 
         static void Main(string[] args)
         {

dotnet/ComputerVision/GetAreaOfInterest/Program.cs

@@ -10,9 +10,10 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.GetAreaOfInte
 
     class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
-
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
+        
         static void Main(string[] args)
         {
             GetAreaOfInterestSample.RunAsync(endpoint, subscriptionKey).Wait(5000);
@@ -27,8 +28,8 @@ public class GetAreaOfInterestSample
         public static async Task RunAsync(string endpoint, string key)
         {
             Console.WriteLine("Get area of interests in images:");
-
-            string imageFilePath = @"Images\objects.jpg"; // See this repo's readme.md for info on how to get these images. Alternatively, you can just set the path to any appropriate image on your machine.
+            // See this repo's readme.md for info on how to get these images. Or, set the path to any appropriate image on your machine.
+            string imageFilePath = @"Images\objects.jpg"; 
             string remoteImageUrl = "https://github.com/Azure-Samples/cognitive-services-sample-data-files/raw/master/ComputerVision/Images/celebrities.jpg";
 
             await GetAreaOfInterestFromStreamAsync(imageFilePath, endpoint, key);

dotnet/ComputerVision/GetThumbnail/Program.cs

@@ -10,9 +10,10 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.GetThumbnail
 
     class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
-
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
+        
         static void Main(string[] args)
         {
             GetThumbnailSample.RunAsync(endpoint, subscriptionKey).Wait(5000);

dotnet/ComputerVision/OCR/Program.cs

@@ -10,9 +10,10 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.OCR
 
     class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
-
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
+        
         static void Main(string[] args)
         {
             OCRSample.RunAsync(endpoint, subscriptionKey).Wait(5000);
@@ -27,10 +28,10 @@ public class OCRSample
         public static async Task RunAsync(string endpoint, string key)
         {
             Console.WriteLine("Performing OCR on the images:");
-
-            string imageFilePath = @"Images\printed_text.jpg";  // See this repo's readme.md for info on how to get these images. Alternatively, you can just set the path to any appropriate image on your machine.
+            // See this repo's readme.md for info on how to get these images. Or, set the path to any appropriate image on your machine.
+            string imageFilePath = @"Images\printed_text.jpg";  
             string remoteImageUrl = "https://github.com/Azure-Samples/cognitive-services-sample-data-files/raw/master/ComputerVision/Images/printed_text.jpg";
-            //OCR works poorly for non-printed text. Look at the ExtractText sample for using the read operation that can work for both handwritten and printed text
+            // OCR works poorly for non-printed text. Look at the ExtractText sample for using the read operation that can work for both handwritten and printed text
             await OCRFromStreamAsync(imageFilePath, endpoint, key);
             await OCRFromUrlAsync(remoteImageUrl, endpoint, key);
         }

dotnet/ComputerVision/RecognizeDomainSpecificContent/Program.cs

@@ -10,9 +10,11 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.RecognizeDoma
 
     class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
-
+        
+        // Add your Azure Computer Vision subscription key and endpoint to your environment variables
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
+        
         static void Main(string[] args)
         {
             RecognizeDomainSpecificContentSample.RunAsync(endpoint, subscriptionKey).Wait(5000);
@@ -27,8 +29,8 @@ public class RecognizeDomainSpecificContentSample
         public static async Task RunAsync(string endpoint, string key)
         {
             Console.WriteLine("Recognize domain specific content (celebrities/landmarks) in images:");
-
-            string imageFilePath = @"Images\landmark.jpg"; // See this repo's readme.md for info on how to get these images. Alternatively, you can just set the path to any appropriate image on your machine.
+            // See this repo's readme.md for info on how to get these images. Or, set the path to any appropriate image on your machine.
+            string imageFilePath = @"Images\landmark.jpg"; 
             string remoteImageUrl = "https://github.com/Azure-Samples/cognitive-services-sample-data-files/raw/master/ComputerVision/Images/celebrities.jpg";
 
             await RecognizeDomainSpecificContentFromUrlAsync(remoteImageUrl, endpoint, key, "celebrities");

dotnet/ComputerVision/RecognizeText/Program.cs

@@ -11,9 +11,9 @@ namespace Microsoft.Azure.CognitiveServices.Samples.ComputerVision.RecognizeText
 
     public class Program
     {
-        public const string subscriptionKey = "<your training key here>"; //Insert your Cognitive Services subscription key here
-        public const string endpoint = "https://westus.api.cognitive.microsoft.com"; // You must use the same Azure region that you generated your subscription keys for.  Free trial subscription keys are generated in the westus region. 
-
+        public const string subscriptionKey = Environment.GetEnvironmentVariable("COMPUTER_VISION_SUBSCRIPTION_KEY");
+        public const string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
+        
         static void Main(string[] args)
         {
             RecognizeTextSample.RunAsync(endpoint, subscriptionKey).Wait(5000);
@@ -28,8 +28,8 @@ public class RecognizeTextSample
         public static async Task RunAsync(string endpoint, string key)
         {
             Console.WriteLine("Recognizing text from the images:");
-
-            string imageFilePath = @"Images\handwritten_text.jpg"; // See this repo's readme.md for info on how to get these images. Alternatively, you can just set the path to any appropriate image on your machine.
+            // See this repo's readme.md for info on how to get these images. Or, set the path to any appropriate image on your machine.
+            string imageFilePath = @"Images\handwritten_text.jpg"; 
             string remoteImageUrl = "https://github.com/Azure-Samples/cognitive-services-sample-data-files/raw/master/ComputerVision/Images/printed_text.jpg";
 
             await RecognizeTextFromStreamAsync(imageFilePath, endpoint, key, "Handwritten");  //the last parameter is whether the text that has to be extracted is printed or handwritten