Merge pull request #66 from limotley/update-tanuget

tyclintw · web-flow · commit e6401f644f0d · 2020-10-19T11:28:52.000-07:00
Upgraded Text Analytics nuget package
diff --git a/demos/PersonalizerBusinessDemo/PersonalizerBusinessDemo/PersonalizerBusinessDemo.csproj b/demos/PersonalizerBusinessDemo/PersonalizerBusinessDemo/PersonalizerBusinessDemo.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Azure.CognitiveServices.Language.TextAnalytics" Version="2.8.0-preview" />
+    <PackageReference Include="Microsoft.Azure.CognitiveServices.Language.TextAnalytics" Version="3.0.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.Personalizer" Version="0.8.0-preview" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="UAParser" Version="3.1.36" />
diff --git a/demos/PersonalizerBusinessDemo/PersonalizerBusinessDemo/Repositories/CognitiveTextAnalyzer.cs b/demos/PersonalizerBusinessDemo/PersonalizerBusinessDemo/Repositories/CognitiveTextAnalyzer.cs
@@ -42,7 +42,7 @@ public async Task<IList<string>> GetKeyPhrasesAsync(string inputText)
         private async Task<IList<IList<string>>> GetKeyPhrasesBatchAsync(IList<string> batchInputText)
         {
             KeyPhraseBatchResult result = await textAnalyticsClient.KeyPhrasesAsync(
-                new MultiLanguageBatchInput(
+                null, new MultiLanguageBatchInput(
                     batchInputText.Select((text, index) => new MultiLanguageInput("en", $"{index + 1}", text)).ToList()
                     )
                 );
@@ -52,7 +52,7 @@ private async Task<IList<IList<string>>> GetKeyPhrasesBatchAsync(IList<string> b
         private async Task<IList<double?>> GetSentimentBatchAsync(IList<string> batchInputText)
         {
             SentimentBatchResult result = await textAnalyticsClient.SentimentAsync(
-                 new MultiLanguageBatchInput(
+                 null, new MultiLanguageBatchInput(
                     batchInputText.Select((text, index) => new MultiLanguageInput("en", $"{index + 1}", text)).ToList()
                     )
                 );
diff --git a/demos/PersonalizerBusinessDemo/PersonalizerBusinessDemo/appsettings.json b/demos/PersonalizerBusinessDemo/PersonalizerBusinessDemo/appsettings.json
@@ -5,6 +5,7 @@
     }
   },
   "AllowedHosts": "*",
-  "PersonalizationEndpoint": "https://westus2.api.cognitive.microsoft.com/",
-  "TextAnalyticsEndpoint": "https://westus2.api.cognitive.microsoft.com/text/analytics/v2.0"
+  "PersonalizationEndpoint": "",
+  "TextAnalyticsEndpoint": ""
 }
+
diff --git a/demos/PersonalizerDemo/PersonalizerDemo/CognitiveTextAnalyzer.cs b/demos/PersonalizerDemo/PersonalizerDemo/CognitiveTextAnalyzer.cs
@@ -42,7 +42,7 @@ public async Task<IList<string>> GetKeyPhrasesAsync(string inputText)
         private async Task<IList<IList<string>>> GetKeyPhrasesBatchAsync(IList<string> batchInputText)
         {
             KeyPhraseBatchResult result = await textAnalyticsClient.KeyPhrasesAsync(
-                new MultiLanguageBatchInput(
+                null, new MultiLanguageBatchInput(
                     batchInputText.Select((text, index) => new MultiLanguageInput("en", $"{index + 1}", text)).ToList()
                     )
                 );
@@ -52,7 +52,7 @@ private async Task<IList<IList<string>>> GetKeyPhrasesBatchAsync(IList<string> b
         private async Task<IList<double?>> GetSentimentBatchAsync(IList<string> batchInputText)
         {
             SentimentBatchResult result = await textAnalyticsClient.SentimentAsync(
-                 new MultiLanguageBatchInput(
+                 null, new MultiLanguageBatchInput(
                     batchInputText.Select((text, index) => new MultiLanguageInput("en", $"{index + 1}", text)).ToList()
                     )
                 );
diff --git a/demos/PersonalizerDemo/PersonalizerDemo/PersonalizerDemo.csproj b/demos/PersonalizerDemo/PersonalizerDemo/PersonalizerDemo.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Azure.CognitiveServices.Language.TextAnalytics" Version="2.8.0-preview" />
+    <PackageReference Include="Microsoft.Azure.CognitiveServices.Language.TextAnalytics" Version="3.0.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.Personalizer" Version="0.8.0-preview" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="UAParser" Version="3.1.36" />
diff --git a/demos/PersonalizerDemo/PersonalizerDemo/Startup.cs b/demos/PersonalizerDemo/PersonalizerDemo/Startup.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
diff --git a/demos/PersonalizerDemo/PersonalizerDemo/appsettings.json b/demos/PersonalizerDemo/PersonalizerDemo/appsettings.json
@@ -5,6 +5,6 @@
     }
   },
   "AllowedHosts": "*",
-  "PersonalizationEndpoint": "https://westus2.api.cognitive.microsoft.com/",
-  "TextAnalyticsEndpoint": "https://westus2.api.cognitive.microsoft.com/text/analytics/v2.0"
+  "PersonalizationEndpoint": "",
+  "TextAnalyticsEndpoint": ""
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public async Task<IList<string>> GetKeyPhrasesAsync(string inputText)`
`42`	`42`	`private async Task<IList<IList<string>>> GetKeyPhrasesBatchAsync(IList<string> batchInputText)`
`43`	`43`	`{`
`44`	`44`	`KeyPhraseBatchResult result = await textAnalyticsClient.KeyPhrasesAsync(`
`45`		`- new MultiLanguageBatchInput(`
	`45`	`+ null, new MultiLanguageBatchInput(`
`46`	`46`	`batchInputText.Select((text, index) => new MultiLanguageInput("en", $"{index + 1}", text)).ToList()`
`47`	`47`	`)`
`48`	`48`	`);`
`@@ -52,7 +52,7 @@ private async Task<IList<IList<string>>> GetKeyPhrasesBatchAsync(IList<string> b`
`52`	`52`	`private async Task<IList<double?>> GetSentimentBatchAsync(IList<string> batchInputText)`
`53`	`53`	`{`
`54`	`54`	`SentimentBatchResult result = await textAnalyticsClient.SentimentAsync(`
`55`		`- new MultiLanguageBatchInput(`
	`55`	`+ null, new MultiLanguageBatchInput(`
`56`	`56`	`batchInputText.Select((text, index) => new MultiLanguageInput("en", $"{index + 1}", text)).ToList()`
`57`	`57`	`)`
`58`	`58`	`);`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`}`
`6`	`6`	`},`
`7`	`7`	`"AllowedHosts": "*",`
`8`		`- "PersonalizationEndpoint": "https://westus2.api.cognitive.microsoft.com/",`
`9`		`- "TextAnalyticsEndpoint": "https://westus2.api.cognitive.microsoft.com/text/analytics/v2.0"`
	`8`	`+ "PersonalizationEndpoint": "",`
	`9`	`+ "TextAnalyticsEndpoint": ""`
`10`	`10`	`}`
	`11`	`+`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`}`
`6`	`6`	`},`
`7`	`7`	`"AllowedHosts": "*",`
`8`		`- "PersonalizationEndpoint": "https://westus2.api.cognitive.microsoft.com/",`
`9`		`- "TextAnalyticsEndpoint": "https://westus2.api.cognitive.microsoft.com/text/analytics/v2.0"`
	`8`	`+ "PersonalizationEndpoint": "",`
	`9`	`+ "TextAnalyticsEndpoint": ""`
`10`	`10`	`}`