Merge pull request Azure#420 from Azure/daschult/casing

Add case-insensitive checks for MethodGroupTS model sorting
sarangan12 · Jan 4, 2019 · 772477d · 772477d
2 parents c61e70c + fea29f4
commit 772477d
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft.azure/autorest.typescript",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "The typescript extension for classic generators in AutoRest.",
   "scripts": {
     "autorest": "autorest",
@@ -94,4 +94,4 @@
   "dependencies": {
     "dotnet-2.0.0": "^1.4.4"
   }
-}
+}
diff --git a/src/vanilla/Model/MethodGroupTS.cs b/src/vanilla/Model/MethodGroupTS.cs
@@ -212,7 +212,7 @@ public string GenerateMappers()
                 {
                     exportedValues.Add("discriminators");
                 }
-                exportedValues.AddRange(OperationModelNames.OrderBy(mapperName => mapperName));
+                exportedValues.AddRange(OperationModelNames.OrderBy(mapperName => mapperName.ToLowerInvariant()));
 
                 builder.Line(string.Join(",\n", exportedValues));
             });

diff --git a/test/azure/generated/AzureCompositeModelClient/models/primitiveMappers.ts b/test/azure/generated/AzureCompositeModelClient/models/primitiveMappers.ts
@@ -10,9 +10,9 @@ export {
   discriminators,
   BooleanWrapper,
   ByteWrapper,
-  DateWrapper,
-  DatetimeWrapper,
   Datetimerfc1123Wrapper,
+  DatetimeWrapper,
+  DateWrapper,
   DoubleWrapper,
   DurationWrapper,
   ErrorModel,

diff --git a/test/azure/generated/AzureSpecials/models/headerMappers.ts b/test/azure/generated/AzureSpecials/models/headerMappers.ts
@@ -8,7 +8,7 @@
 
 export {
   ErrorModel,
-  HeaderCustomNamedRequestIdHeadHeaders,
   HeaderCustomNamedRequestIdHeaders,
+  HeaderCustomNamedRequestIdHeadHeaders,
   HeaderCustomNamedRequestIdParamGroupingHeaders
 } from "../models/mappers";
diff --git a/test/azure/generated/Lro/models/lROsMappers.ts b/test/azure/generated/Lro/models/lROsMappers.ts
@@ -13,22 +13,22 @@ export {
   LROsDelete202Retry200Headers,
   LROsDeleteAsyncNoHeaderInRetryHeaders,
   LROsDeleteAsyncNoRetrySucceededHeaders,
+  LROsDeleteAsyncRetrycanceledHeaders,
   LROsDeleteAsyncRetryFailedHeaders,
   LROsDeleteAsyncRetrySucceededHeaders,
-  LROsDeleteAsyncRetrycanceledHeaders,
   LROsDeleteNoHeaderInRetryHeaders,
   LROsDeleteProvisioning202Accepted200SucceededHeaders,
-  LROsDeleteProvisioning202DeletingFailed200Headers,
   LROsDeleteProvisioning202Deletingcanceled200Headers,
+  LROsDeleteProvisioning202DeletingFailed200Headers,
   LROsPost202NoRetry204Headers,
   LROsPost202Retry200Headers,
   LROsPostAsyncNoRetrySucceededHeaders,
+  LROsPostAsyncRetrycanceledHeaders,
   LROsPostAsyncRetryFailedHeaders,
   LROsPostAsyncRetrySucceededHeaders,
-  LROsPostAsyncRetrycanceledHeaders,
   LROsPutAsyncNoHeaderInRetryHeaders,
-  LROsPutAsyncNoRetrySucceededHeaders,
   LROsPutAsyncNoRetrycanceledHeaders,
+  LROsPutAsyncNoRetrySucceededHeaders,
   LROsPutAsyncRetryFailedHeaders,
   LROsPutAsyncRetrySucceededHeaders,
   LROsPutNoHeaderInRetryHeaders,

diff --git a/test/azuremetadata/generated/Lro/lib/models/lROsMappers.ts b/test/azuremetadata/generated/Lro/lib/models/lROsMappers.ts
@@ -13,22 +13,22 @@ export {
   LROsDelete202Retry200Headers,
   LROsDeleteAsyncNoHeaderInRetryHeaders,
   LROsDeleteAsyncNoRetrySucceededHeaders,
+  LROsDeleteAsyncRetrycanceledHeaders,
   LROsDeleteAsyncRetryFailedHeaders,
   LROsDeleteAsyncRetrySucceededHeaders,
-  LROsDeleteAsyncRetrycanceledHeaders,
   LROsDeleteNoHeaderInRetryHeaders,
   LROsDeleteProvisioning202Accepted200SucceededHeaders,
-  LROsDeleteProvisioning202DeletingFailed200Headers,
   LROsDeleteProvisioning202Deletingcanceled200Headers,
+  LROsDeleteProvisioning202DeletingFailed200Headers,
   LROsPost202NoRetry204Headers,
   LROsPost202Retry200Headers,
   LROsPostAsyncNoRetrySucceededHeaders,
+  LROsPostAsyncRetrycanceledHeaders,
   LROsPostAsyncRetryFailedHeaders,
   LROsPostAsyncRetrySucceededHeaders,
-  LROsPostAsyncRetrycanceledHeaders,
   LROsPutAsyncNoHeaderInRetryHeaders,
-  LROsPutAsyncNoRetrySucceededHeaders,
   LROsPutAsyncNoRetrycanceledHeaders,
+  LROsPutAsyncNoRetrySucceededHeaders,
   LROsPutAsyncRetryFailedHeaders,
   LROsPutAsyncRetrySucceededHeaders,
   LROsPutNoHeaderInRetryHeaders,

diff --git a/test/metadata/generated/BodyComplex/lib/models/primitiveMappers.ts b/test/metadata/generated/BodyComplex/lib/models/primitiveMappers.ts
@@ -10,9 +10,9 @@ export {
   discriminators,
   BooleanWrapper,
   ByteWrapper,
-  DateWrapper,
-  DatetimeWrapper,
   Datetimerfc1123Wrapper,
+  DatetimeWrapper,
+  DateWrapper,
   DoubleWrapper,
   DurationWrapper,
   ErrorModel,

diff --git a/test/skip-subtypes/generated/BodyComplex/lib/models/primitiveMappers.ts b/test/skip-subtypes/generated/BodyComplex/lib/models/primitiveMappers.ts
@@ -10,9 +10,9 @@ export {
   discriminators,
   BooleanWrapper,
   ByteWrapper,
-  DateWrapper,
-  DatetimeWrapper,
   Datetimerfc1123Wrapper,
+  DatetimeWrapper,
+  DateWrapper,
   DoubleWrapper,
   DurationWrapper,
   ErrorModel,

diff --git a/test/vanilla/generated/BodyComplex/models/primitiveMappers.ts b/test/vanilla/generated/BodyComplex/models/primitiveMappers.ts
@@ -10,9 +10,9 @@ export {
   discriminators,
   BooleanWrapper,
   ByteWrapper,
-  DateWrapper,
-  DatetimeWrapper,
   Datetimerfc1123Wrapper,
+  DatetimeWrapper,
+  DateWrapper,
   DoubleWrapper,
   DurationWrapper,
   ErrorModel,