Merge pull request #236 from fearthecowboy/minor-fixes

update perks and try again
2020-03-25 12:18:28 -07:00 · 2020-03-25 12:18:28 -07:00 · 1e0994c5b6
--- a/modelerfour/package.json
+++ b/modelerfour/package.json
@ -1,6 +1,6 @@
 {
  "name": "@autorest/modelerfour",
-  "version": "4.11.0",
+  "version": "4.12.0",
  "description": "AutoRest Modeler Version Four (component)",
  "directories": {
    "doc": "docs"
@ -54,7 +54,7 @@
    "@azure-tools/codegen": "~2.4.0",
    "@azure-tools/codegen-csharp": "~3.0.0",
    "@azure-tools/autorest-extension-base": "~3.1.0",
-    "@azure-tools/codemodel": "~3.5.0",
+    "@azure-tools/codemodel": "~3.6.0",
    "@azure-tools/tasks": "~3.0.0",
    "@azure-tools/openapi": "~3.0.0",
    "@azure-tools/datastore": "~4.1.0",
@ -69,7 +69,7 @@
      "@azure-tools/codegen": "~2.4.0",
      "@azure-tools/codegen-csharp": "~3.0.0",
      "@azure-tools/autorest-extension-base": "~3.1.0",
-      "@azure-tools/codemodel": "~3.5.0",
+      "@azure-tools/codemodel": "~3.6.0",
      "@azure-tools/tasks": "~3.0.0",
      "@azure-tools/openapi": "~3.0.0",
      "@azure-tools/datastore": "~4.1.0",
--- a/modelerfour/test/scenarios/a-playground/flattened.yaml
+++ b/modelerfour/test/scenarios/a-playground/flattened.yaml
@ -402,7 +402,8 @@ schemas: !<!Schemas>
        name: smart_salmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_2
+  any:
+  - *ref_2
  byteArrays:
  - !<!ByteArraySchema> &ref_22
    type: byte-array
--- a/modelerfour/test/scenarios/a-playground/grouped.yaml
+++ b/modelerfour/test/scenarios/a-playground/grouped.yaml
@ -402,7 +402,8 @@ schemas: !<!Schemas>
        name: smart_salmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_2
+  any:
+  - *ref_2
  byteArrays:
  - !<!ByteArraySchema> &ref_22
    type: byte-array
--- a/modelerfour/test/scenarios/a-playground/modeler.yaml
+++ b/modelerfour/test/scenarios/a-playground/modeler.yaml
@ -402,7 +402,8 @@ schemas: !<!Schemas>
        name: smart_salmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_68
+  any:
+  - *ref_68
  byteArrays:
  - !<!ByteArraySchema> &ref_60
    type: byte-array
--- a/modelerfour/test/scenarios/a-playground/namer.yaml
+++ b/modelerfour/test/scenarios/a-playground/namer.yaml
@ -402,7 +402,8 @@ schemas: !<!Schemas>
        name: SmartSalmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_2
+  any:
+  - *ref_2
  byteArrays:
  - !<!ByteArraySchema> &ref_22
    type: byte-array
--- a/modelerfour/test/scenarios/additionalProperties/flattened.yaml
+++ b/modelerfour/test/scenarios/additionalProperties/flattened.yaml
@ -174,7 +174,8 @@ schemas: !<!Schemas>
        name: PetAPInPropertiesWithAPString-additionalProperties
        description: Dictionary of <number>
    protocol: !<!Protocols> {}
-  any: *ref_0
+  any:
+  - *ref_0
  objects:
  - !<!ObjectSchema> &ref_3
    type: object
--- a/modelerfour/test/scenarios/additionalProperties/grouped.yaml
+++ b/modelerfour/test/scenarios/additionalProperties/grouped.yaml
@ -174,7 +174,8 @@ schemas: !<!Schemas>
        name: PetAPInPropertiesWithAPString-additionalProperties
        description: Dictionary of <number>
    protocol: !<!Protocols> {}
-  any: *ref_0
+  any:
+  - *ref_0
  objects:
  - !<!ObjectSchema> &ref_3
    type: object
--- a/modelerfour/test/scenarios/additionalProperties/modeler.yaml
+++ b/modelerfour/test/scenarios/additionalProperties/modeler.yaml
@ -174,7 +174,8 @@ schemas: !<!Schemas>
        name: PetAPInPropertiesWithAPString-additionalProperties
        description: Dictionary of <number>
    protocol: !<!Protocols> {}
-  any: *ref_0
+  any:
+  - *ref_0
  objects:
  - !<!ObjectSchema> &ref_6
    type: object
--- a/modelerfour/test/scenarios/additionalProperties/namer.yaml
+++ b/modelerfour/test/scenarios/additionalProperties/namer.yaml
@ -174,7 +174,8 @@ schemas: !<!Schemas>
        name: PetAPInPropertiesWithAPStringAdditionalProperties
        description: Dictionary of <number>
    protocol: !<!Protocols> {}
-  any: *ref_0
+  any:
+  - *ref_0
  objects:
  - !<!ObjectSchema> &ref_3
    type: object
--- a/modelerfour/test/scenarios/advisor/flattened.yaml
+++ b/modelerfour/test/scenarios/advisor/flattened.yaml
@ -551,7 +551,8 @@ schemas: !<!Schemas>
        name: RecommendationProperties-extendedProperties
        description: Extended properties
    protocol: !<!Protocols> {}
-  any: *ref_1
+  any:
+  - *ref_1
  dateTimes:
  - !<!DateTimeSchema> &ref_38
    type: date-time
--- a/modelerfour/test/scenarios/advisor/grouped.yaml
+++ b/modelerfour/test/scenarios/advisor/grouped.yaml
@ -551,7 +551,8 @@ schemas: !<!Schemas>
        name: RecommendationProperties-extendedProperties
        description: Extended properties
    protocol: !<!Protocols> {}
-  any: *ref_1
+  any:
+  - *ref_1
  dateTimes:
  - !<!DateTimeSchema> &ref_38
    type: date-time
--- a/modelerfour/test/scenarios/advisor/modeler.yaml
+++ b/modelerfour/test/scenarios/advisor/modeler.yaml
@ -551,7 +551,8 @@ schemas: !<!Schemas>
        name: RecommendationProperties-extendedProperties
        description: Extended properties
    protocol: !<!Protocols> {}
-  any: *ref_26
+  any:
+  - *ref_26
  dateTimes:
  - !<!DateTimeSchema> &ref_67
    type: date-time
--- a/modelerfour/test/scenarios/advisor/namer.yaml
+++ b/modelerfour/test/scenarios/advisor/namer.yaml
@ -551,7 +551,8 @@ schemas: !<!Schemas>
        name: RecommendationPropertiesExtendedProperties
        description: Extended properties
    protocol: !<!Protocols> {}
-  any: *ref_1
+  any:
+  - *ref_1
  dateTimes:
  - !<!DateTimeSchema> &ref_38
    type: date-time
--- a/modelerfour/test/scenarios/body-complex/flattened.yaml
+++ b/modelerfour/test/scenarios/body-complex/flattened.yaml
@ -407,7 +407,8 @@ schemas: !<!Schemas>
        name: smart_salmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_2
+  any:
+  - *ref_2
  byteArrays:
  - !<!ByteArraySchema> &ref_22
    type: byte-array
--- a/modelerfour/test/scenarios/body-complex/grouped.yaml
+++ b/modelerfour/test/scenarios/body-complex/grouped.yaml
@ -407,7 +407,8 @@ schemas: !<!Schemas>
        name: smart_salmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_2
+  any:
+  - *ref_2
  byteArrays:
  - !<!ByteArraySchema> &ref_22
    type: byte-array
--- a/modelerfour/test/scenarios/body-complex/modeler.yaml
+++ b/modelerfour/test/scenarios/body-complex/modeler.yaml
@ -407,7 +407,8 @@ schemas: !<!Schemas>
        name: smart_salmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_68
+  any:
+  - *ref_68
  byteArrays:
  - !<!ByteArraySchema> &ref_60
    type: byte-array
--- a/modelerfour/test/scenarios/body-complex/namer.yaml
+++ b/modelerfour/test/scenarios/body-complex/namer.yaml
@ -407,7 +407,8 @@ schemas: !<!Schemas>
        name: SmartSalmon
        description: Dictionary of <any>
    protocol: !<!Protocols> {}
-  any: *ref_2
+  any:
+  - *ref_2
  byteArrays:
  - !<!ByteArraySchema> &ref_22
    type: byte-array
--- a/modelerfour/test/scenarios/body-dictionary/flattened.yaml
+++ b/modelerfour/test/scenarios/body-dictionary/flattened.yaml
@ -388,7 +388,8 @@ schemas: !<!Schemas>
        name: paths·1hdt3xa·dictionary-dictionary-null·get·responses·200·content·application-json·schema
        description: An dictionaries of dictionaries with value null
    protocol: !<!Protocols> {}
-  any: *ref_10
+  any:
+  - *ref_10
  byteArrays:
  - *ref_11
  - *ref_12
--- a/modelerfour/test/scenarios/body-dictionary/grouped.yaml
+++ b/modelerfour/test/scenarios/body-dictionary/grouped.yaml
@ -388,7 +388,8 @@ schemas: !<!Schemas>
        name: paths·1hdt3xa·dictionary-dictionary-null·get·responses·200·content·application-json·schema
        description: An dictionaries of dictionaries with value null
    protocol: !<!Protocols> {}
-  any: *ref_10
+  any:
+  - *ref_10
  byteArrays:
  - *ref_11
  - *ref_12
--- a/modelerfour/test/scenarios/body-dictionary/modeler.yaml
+++ b/modelerfour/test/scenarios/body-dictionary/modeler.yaml
@ -388,7 +388,8 @@ schemas: !<!Schemas>
        name: paths·1hdt3xa·dictionary-dictionary-null·get·responses·200·content·application-json·schema
        description: An dictionaries of dictionaries with value null
    protocol: !<!Protocols> {}
-  any: *ref_21
+  any:
+  - *ref_21
  byteArrays:
  - *ref_16
  - *ref_17
--- a/modelerfour/test/scenarios/body-dictionary/namer.yaml
+++ b/modelerfour/test/scenarios/body-dictionary/namer.yaml
@ -388,7 +388,8 @@ schemas: !<!Schemas>
        name: DictionaryOfany
        description: An dictionaries of dictionaries with value null
    protocol: !<!Protocols> {}
-  any: *ref_10
+  any:
+  - *ref_10
  byteArrays:
  - *ref_11
  - *ref_12
--- a/modelerfour/test/scenarios/cognitive-search/flattened.yaml
+++ b/modelerfour/test/scenarios/cognitive-search/flattened.yaml
@ -864,7 +864,8 @@ schemas: !<!Schemas>
        name: IndexAction
        description: Represents an index action that operates on a document.
    protocol: !<!Protocols> {}
-  any: *ref_3
+  any:
+  - *ref_3
  uuids:
  - !<!UuidSchema> &ref_90
    type: uuid
--- a/modelerfour/test/scenarios/cognitive-search/grouped.yaml
+++ b/modelerfour/test/scenarios/cognitive-search/grouped.yaml
@ -864,7 +864,8 @@ schemas: !<!Schemas>
        name: IndexAction
        description: Represents an index action that operates on a document.
    protocol: !<!Protocols> {}
-  any: *ref_3
+  any:
+  - *ref_3
  groups:
  - !<!GroupSchema> &ref_87
    type: group
--- a/modelerfour/test/scenarios/cognitive-search/modeler.yaml
+++ b/modelerfour/test/scenarios/cognitive-search/modeler.yaml
@ -864,7 +864,8 @@ schemas: !<!Schemas>
        name: IndexAction
        description: Represents an index action that operates on a document.
    protocol: !<!Protocols> {}
-  any: *ref_14
+  any:
+  - *ref_14
  uuids:
  - !<!UuidSchema> &ref_86
    type: uuid
--- a/modelerfour/test/scenarios/cognitive-search/namer.yaml
+++ b/modelerfour/test/scenarios/cognitive-search/namer.yaml
@ -864,7 +864,8 @@ schemas: !<!Schemas>
        name: IndexAction
        description: Represents an index action that operates on a document.
    protocol: !<!Protocols> {}
-  any: *ref_3
+  any:
+  - *ref_3
  groups:
  - !<!GroupSchema> &ref_6
    type: group
--- a/rush.json
+++ b/rush.json
@ -49,7 +49,7 @@
   * Specify a SemVer range to ensure developers use a NodeJS version that is appropriate
   * for your repo.
   */
-  "nodeSupportedVersionRange": ">=8.9.4 <11.0.0",
+  "nodeSupportedVersionRange": ">=8.9.4 <14.0.0",
  "ensureConsistentVersions": true,
  "projectFolderMinDepth": 1,
  "projectFolderMaxDepth": 2,