Change SkuName and Kind to strings. (#5086)

Azure · Dec 17, 2018 · b09512e · b09512e
1 parent 2018bbd
commit b09512e
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 215 deletions.
diff --git a/...es/management/CognitiveServices.Tests/Helpers/CognitiveServicesManagementTestUtilities.cs b/...es/management/CognitiveServices.Tests/Helpers/CognitiveServicesManagementTestUtilities.cs
@@ -25,8 +25,8 @@ public static class CognitiveServicesManagementTestUtilities
 
         // These are used to create default accounts
         public static string DefaultLocation = IsTestTenant ? null : "westus";
-        public const string DefaultSkuName = SkuName.S1;
-        public const string DefaultKind = Kind.TextAnalytics;
+        public const string DefaultSkuName = "S1";
+        public const string DefaultKind = "TextAnalytics";
         public static Dictionary<string, string> DefaultTags = new Dictionary<string, string>
             {
                 {"key1","value1"},
@@ -111,7 +111,7 @@ public static string CreateCognitiveServicesAccount(CognitiveServicesManagementC
             return accountName;
         }
 
-        public static CognitiveServicesAccount CreateAndValidateAccountWithOnlyRequiredParameters(CognitiveServicesManagementClient cognitiveServicesMgmtClient, string rgName, string skuName, string accountType = Kind.TextAnalytics, string location = null)
+        public static CognitiveServicesAccount CreateAndValidateAccountWithOnlyRequiredParameters(CognitiveServicesManagementClient cognitiveServicesMgmtClient, string rgName, string skuName, string accountType = "TextAnalytics", string location = null)
         {
             // Create account with only required params
             var accountName = TestUtilities.GenerateName("csa");

diff --git a/...gnitiveServices/management/CognitiveServices.Tests/Tests/CognitiveServicesAccountTests.cs b/...gnitiveServices/management/CognitiveServices.Tests/Tests/CognitiveServicesAccountTests.cs
diff --git a/...vices/management/Management.CognitiveServices/Generated/CheckSkuAvailabilityOperations.cs b/...vices/management/Management.CognitiveServices/Generated/CheckSkuAvailabilityOperations.cs
@@ -60,12 +60,7 @@ internal CheckSkuAvailabilityOperations(CognitiveServicesManagementClient client
         /// The SKU of the resource.
         /// </param>
         /// <param name='kind'>
-        /// The Kind of the resource. Possible values include: 'Bing.Autosuggest.v7',
-        /// 'Bing.CustomSearch', 'Bing.Search.v7', 'Bing.Speech', 'Bing.SpellCheck.v7',
-        /// 'ComputerVision', 'ContentModerator', 'CustomSpeech',
-        /// 'CustomVision.Prediction', 'CustomVision.Training', 'Emotion', 'Face',
-        /// 'LUIS', 'QnAMaker', 'SpeakerRecognition', 'SpeechTranslation',
-        /// 'TextAnalytics', 'TextTranslation', 'WebLM'
+        /// The Kind of the resource.
         /// </param>
         /// <param name='type'>
         /// The Type of the resource.

diff --git a/...gement/Management.CognitiveServices/Generated/CheckSkuAvailabilityOperationsExtensions.cs b/...gement/Management.CognitiveServices/Generated/CheckSkuAvailabilityOperationsExtensions.cs
@@ -36,12 +36,7 @@ public static partial class CheckSkuAvailabilityOperationsExtensions
             /// The SKU of the resource.
             /// </param>
             /// <param name='kind'>
-            /// The Kind of the resource. Possible values include: 'Bing.Autosuggest.v7',
-            /// 'Bing.CustomSearch', 'Bing.Search.v7', 'Bing.Speech', 'Bing.SpellCheck.v7',
-            /// 'ComputerVision', 'ContentModerator', 'CustomSpeech',
-            /// 'CustomVision.Prediction', 'CustomVision.Training', 'Emotion', 'Face',
-            /// 'LUIS', 'QnAMaker', 'SpeakerRecognition', 'SpeechTranslation',
-            /// 'TextAnalytics', 'TextTranslation', 'WebLM'
+            /// The Kind of the resource.
             /// </param>
             /// <param name='type'>
             /// The Type of the resource.
@@ -64,12 +59,7 @@ public static CheckSkuAvailabilityResultList List(this ICheckSkuAvailabilityOper
             /// The SKU of the resource.
             /// </param>
             /// <param name='kind'>
-            /// The Kind of the resource. Possible values include: 'Bing.Autosuggest.v7',
-            /// 'Bing.CustomSearch', 'Bing.Search.v7', 'Bing.Speech', 'Bing.SpellCheck.v7',
-            /// 'ComputerVision', 'ContentModerator', 'CustomSpeech',
-            /// 'CustomVision.Prediction', 'CustomVision.Training', 'Emotion', 'Face',
-            /// 'LUIS', 'QnAMaker', 'SpeakerRecognition', 'SpeechTranslation',
-            /// 'TextAnalytics', 'TextTranslation', 'WebLM'
+            /// The Kind of the resource.
             /// </param>
             /// <param name='type'>
             /// The Type of the resource.

diff --git a/...ices/management/Management.CognitiveServices/Generated/ICheckSkuAvailabilityOperations.cs b/...ices/management/Management.CognitiveServices/Generated/ICheckSkuAvailabilityOperations.cs
@@ -33,13 +33,7 @@ public partial interface ICheckSkuAvailabilityOperations
         /// The SKU of the resource.
         /// </param>
         /// <param name='kind'>
-        /// The Kind of the resource. Possible values include:
-        /// 'Bing.Autosuggest.v7', 'Bing.CustomSearch', 'Bing.Search.v7',
-        /// 'Bing.Speech', 'Bing.SpellCheck.v7', 'ComputerVision',
-        /// 'ContentModerator', 'CustomSpeech', 'CustomVision.Prediction',
-        /// 'CustomVision.Training', 'Emotion', 'Face', 'LUIS', 'QnAMaker',
-        /// 'SpeakerRecognition', 'SpeechTranslation', 'TextAnalytics',
-        /// 'TextTranslation', 'WebLM'
+        /// The Kind of the resource.
         /// </param>
         /// <param name='type'>
         /// The Type of the resource.

diff --git a/...management/Management.CognitiveServices/Generated/Models/CheckSkuAvailabilityParameter.cs b/...management/Management.CognitiveServices/Generated/Models/CheckSkuAvailabilityParameter.cs
@@ -35,14 +35,7 @@ public CheckSkuAvailabilityParameter()
         /// class.
         /// </summary>
         /// <param name="skus">The SKU of the resource.</param>
-        /// <param name="kind">The Kind of the resource. Possible values
-        /// include: 'Bing.Autosuggest.v7', 'Bing.CustomSearch',
-        /// 'Bing.Search.v7', 'Bing.Speech', 'Bing.SpellCheck.v7',
-        /// 'ComputerVision', 'ContentModerator', 'CustomSpeech',
-        /// 'CustomVision.Prediction', 'CustomVision.Training', 'Emotion',
-        /// 'Face', 'LUIS', 'QnAMaker', 'SpeakerRecognition',
-        /// 'SpeechTranslation', 'TextAnalytics', 'TextTranslation',
-        /// 'WebLM'</param>
+        /// <param name="kind">The Kind of the resource.</param>
         /// <param name="type">The Type of the resource.</param>
         public CheckSkuAvailabilityParameter(IList<string> skus, string kind, string type)
         {
@@ -64,13 +57,7 @@ public CheckSkuAvailabilityParameter(IList<string> skus, string kind, string typ
         public IList<string> Skus { get; set; }
 
         /// <summary>
-        /// Gets or sets the Kind of the resource. Possible values include:
-        /// 'Bing.Autosuggest.v7', 'Bing.CustomSearch', 'Bing.Search.v7',
-        /// 'Bing.Speech', 'Bing.SpellCheck.v7', 'ComputerVision',
-        /// 'ContentModerator', 'CustomSpeech', 'CustomVision.Prediction',
-        /// 'CustomVision.Training', 'Emotion', 'Face', 'LUIS', 'QnAMaker',
-        /// 'SpeakerRecognition', 'SpeechTranslation', 'TextAnalytics',
-        /// 'TextTranslation', 'WebLM'
+        /// Gets or sets the Kind of the resource.
         /// </summary>
         [JsonProperty(PropertyName = "kind")]
         public string Kind { get; set; }

diff --git a/...es/management/Management.CognitiveServices/Generated/Models/CheckSkuAvailabilityResult.cs b/...es/management/Management.CognitiveServices/Generated/Models/CheckSkuAvailabilityResult.cs
@@ -29,18 +29,10 @@ public CheckSkuAvailabilityResult()
         /// <summary>
         /// Initializes a new instance of the CheckSkuAvailabilityResult class.
         /// </summary>
-        /// <param name="kind">The Kind of the resource. Possible values
-        /// include: 'Bing.Autosuggest.v7', 'Bing.CustomSearch',
-        /// 'Bing.Search.v7', 'Bing.Speech', 'Bing.SpellCheck.v7',
-        /// 'ComputerVision', 'ContentModerator', 'CustomSpeech',
-        /// 'CustomVision.Prediction', 'CustomVision.Training', 'Emotion',
-        /// 'Face', 'LUIS', 'QnAMaker', 'SpeakerRecognition',
-        /// 'SpeechTranslation', 'TextAnalytics', 'TextTranslation',
-        /// 'WebLM'</param>
+        /// <param name="kind">The Kind of the resource.</param>
         /// <param name="type">The Type of the resource.</param>
-        /// <param name="skuName">The SKU of Cognitive Services account.
-        /// Possible values include: 'F0', 'P0', 'P1', 'P2', 'S0', 'S1', 'S2',
-        /// 'S3', 'S4', 'S5', 'S6'</param>
+        /// <param name="skuName">The SKU of Cognitive Services
+        /// account.</param>
         /// <param name="skuAvailable">Indicates the given SKU is available or
         /// not.</param>
         /// <param name="reason">Reason why the SKU is not available.</param>
@@ -62,13 +54,7 @@ public CheckSkuAvailabilityResult()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the Kind of the resource. Possible values include:
-        /// 'Bing.Autosuggest.v7', 'Bing.CustomSearch', 'Bing.Search.v7',
-        /// 'Bing.Speech', 'Bing.SpellCheck.v7', 'ComputerVision',
-        /// 'ContentModerator', 'CustomSpeech', 'CustomVision.Prediction',
-        /// 'CustomVision.Training', 'Emotion', 'Face', 'LUIS', 'QnAMaker',
-        /// 'SpeakerRecognition', 'SpeechTranslation', 'TextAnalytics',
-        /// 'TextTranslation', 'WebLM'
+        /// Gets or sets the Kind of the resource.
         /// </summary>
         [JsonProperty(PropertyName = "kind")]
         public string Kind { get; set; }
@@ -80,9 +66,7 @@ public CheckSkuAvailabilityResult()
         public string Type { get; set; }
 
         /// <summary>
-        /// Gets or sets the SKU of Cognitive Services account. Possible values
-        /// include: 'F0', 'P0', 'P1', 'P2', 'S0', 'S1', 'S2', 'S3', 'S4',
-        /// 'S5', 'S6'
+        /// Gets or sets the SKU of Cognitive Services account.
         /// </summary>
         [JsonProperty(PropertyName = "skuName")]
         public string SkuName { get; set; }

diff --git a/...Management.CognitiveServices/Generated/Models/CognitiveServicesAccountCreateParameters.cs b/...Management.CognitiveServices/Generated/Models/CognitiveServicesAccountCreateParameters.cs
@@ -36,14 +36,8 @@ public CognitiveServicesAccountCreateParameters()
         /// </summary>
         /// <param name="sku">Required. Gets or sets the SKU of the
         /// resource.</param>
-        /// <param name="kind">Required. Gets or sets the Kind of the resource.
-        /// Possible values include: 'Bing.Autosuggest.v7',
-        /// 'Bing.CustomSearch', 'Bing.Search.v7', 'Bing.Speech',
-        /// 'Bing.SpellCheck.v7', 'ComputerVision', 'ContentModerator',
-        /// 'CustomSpeech', 'CustomVision.Prediction', 'CustomVision.Training',
-        /// 'Emotion', 'Face', 'LUIS', 'QnAMaker', 'SpeakerRecognition',
-        /// 'SpeechTranslation', 'TextAnalytics', 'TextTranslation',
-        /// 'WebLM'</param>
+        /// <param name="kind">Required. Gets or sets the Kind of the
+        /// resource.</param>
         /// <param name="location">Required. Gets or sets the location of the
         /// resource. This will be one of the supported and registered Azure
         /// Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo
@@ -81,12 +75,6 @@ public CognitiveServicesAccountCreateParameters()
 
         /// <summary>
         /// Gets or sets required. Gets or sets the Kind of the resource.
-        /// Possible values include: 'Bing.Autosuggest.v7',
-        /// 'Bing.CustomSearch', 'Bing.Search.v7', 'Bing.Speech',
-        /// 'Bing.SpellCheck.v7', 'ComputerVision', 'ContentModerator',
-        /// 'CustomSpeech', 'CustomVision.Prediction', 'CustomVision.Training',
-        /// 'Emotion', 'Face', 'LUIS', 'QnAMaker', 'SpeakerRecognition',
-        /// 'SpeechTranslation', 'TextAnalytics', 'TextTranslation', 'WebLM'
         /// </summary>
         [JsonProperty(PropertyName = "kind")]
         public string Kind { get; set; }

diff --git a/src/SDKs/CognitiveServices/management/Management.CognitiveServices/Generated/Models/Kind.cs b/src/SDKs/CognitiveServices/management/Management.CognitiveServices/Generated/Models/Kind.cs
diff --git a/src/SDKs/CognitiveServices/management/Management.CognitiveServices/Generated/Models/Sku.cs b/src/SDKs/CognitiveServices/management/Management.CognitiveServices/Generated/Models/Sku.cs
@@ -31,8 +31,7 @@ public Sku()
         /// Initializes a new instance of the Sku class.
         /// </summary>
         /// <param name="name">Gets or sets the sku name. Required for account
-        /// creation, optional for update. Possible values include: 'F0', 'P0',
-        /// 'P1', 'P2', 'S0', 'S1', 'S2', 'S3', 'S4', 'S5', 'S6'</param>
+        /// creation, optional for update.</param>
         /// <param name="tier">Gets the sku tier. This is based on the SKU
         /// name. Possible values include: 'Free', 'Standard',
         /// 'Premium'</param>
@@ -50,8 +49,7 @@ public Sku()
 
         /// <summary>
         /// Gets or sets the sku name. Required for account creation, optional
-        /// for update. Possible values include: 'F0', 'P0', 'P1', 'P2', 'S0',
-        /// 'S1', 'S2', 'S3', 'S4', 'S5', 'S6'
+        /// for update.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }

diff --git a/...DKs/CognitiveServices/management/Management.CognitiveServices/Generated/Models/SkuName.cs b/...DKs/CognitiveServices/management/Management.CognitiveServices/Generated/Models/SkuName.cs
diff --git a/...ement/Management.CognitiveServices/Generated/SdkInfo_CognitiveServicesManagementClient.cs b/...ement/Management.CognitiveServices/Generated/SdkInfo_CognitiveServicesManagementClient.cs
@@ -26,5 +26,16 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_CognitiveServic
               }.AsEnumerable();
           }
       }
+      // BEGIN: Code Generation Metadata Section
+      public static readonly String AutoRestVersion = "latest";
+      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283";
+      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cognitiveservices/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\\Github\\azure-sdk-for-net\\src\\SDKs";
+      public static readonly String GithubForkName = "Azure";
+      public static readonly String GithubBranchName = "master";
+      public static readonly String GithubCommidId = "a5fd13fd813e416fc4500310537491482ad401b3";
+      public static readonly String CodeGenerationErrors = "";
+      public static readonly String GithubRepoName = "azure-rest-api-specs";
+      // END: Code Generation Metadata Section
   }
 }
+
diff --git a/...nagement/Management.CognitiveServices/Microsoft.Azure.Management.CognitiveServices.csproj b/...nagement/Management.CognitiveServices/Microsoft.Azure.Management.CognitiveServices.csproj
@@ -6,10 +6,14 @@
 	<PropertyGroup>
 		<PackageId>Microsoft.Azure.Management.CognitiveServices</PackageId>
 		<Description>Microsoft Azure Management Cognitive Services Library</Description>
-		<Version>4.1.1</Version>
+		<Version>5.0.0</Version>
 		<AssemblyName>Microsoft.Azure.Management.CognitiveServices</AssemblyName>
 		<PackageTags>Cognitive Services management;Cognitive Services;</PackageTags>
-		<PackageReleaseNotes>Taking dependency on 10.0.3 version of Newtonsoft nuget package.</PackageReleaseNotes>
+		<PackageReleaseNotes>
+<![CDATA[    
+1) SkuName and Kind are now strings.
+]]>
+	    </PackageReleaseNotes>
 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>

diff --git a/...SDKs/CognitiveServices/management/Management.CognitiveServices/Properties/AssemblyInfo.cs b/...SDKs/CognitiveServices/management/Management.CognitiveServices/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyTitle("Microsoft Azure Cognitive Services Management Library")]
 [assembly: AssemblyDescription("Provides Microsoft Azure Cognitive Services management functions for managing Microsoft Azure Cognitive Services accounts.")]
 
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.1.1.0")]
+[assembly: AssemblyVersion("5.0.0.0")]
+[assembly: AssemblyFileVersion("5.0.0.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]

diff --git a/src/SDKs/_metadata/cognitiveservices_resource-manager.txt b/src/SDKs/_metadata/cognitiveservices_resource-manager.txt
@@ -3,18 +3,12 @@ AutoRest installed successfully.
 Commencing code generation
 Generating CSharp code
 Executing AutoRest command
-cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cognitiveservices/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\azure-sdk-for-net\src\SDKs
-2018-09-07 22:25:36 UTC
-1) azure-rest-api-specs repository information
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cognitiveservices/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\Github\azure-sdk-for-net\src\SDKs
+2018-12-14 01:25:15 UTC
+Azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      7c857063e4b451c7209aa300f01e72665097eaac
-
-2) AutoRest information
+Commit:      a5fd13fd813e416fc4500310537491482ad401b3
+AutoRest information
 Requested version: latest
 Bootstrapper version:    autorest@2.0.4283
-
-
-Latest installed version:    
-
-