Merge branch 'release/5.11.4'

hso-nn · Feb 15, 2022 · fafa95d · fafa95d
2 parents 95831aa + 9fb967b
commit fafa95d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/bin/main.js b/bin/main.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hso/d365-cli",
-  "version": "5.11.3",
+  "version": "5.11.4",
   "author": "HSO Innovation <[email protected]> (https://www.hso.com)",
   "description": "Dynamics 365 Command Line Interface for TypeScript projects for Dataverse",
   "repository": {

diff --git a/src/commands/generators/ControlFormContext.ts b/src/commands/generators/ControlFormContext.ts
@@ -27,7 +27,6 @@ export class ControlFormContext {
     public static async generateFormContext(bearer: string, entityName: string, entityLogicalName: string,
         log: (message: string) => Promise<void>, systemForm: SystemFormModel): Promise<void> {
         const formContext = new ControlFormContext(bearer, entityName, entityLogicalName, log);
-        console.log('generateFormContext');
         await formContext.writeFormContextFile(systemForm);
     }
 
@@ -156,7 +155,9 @@ export class ControlFormContext {
                 return 'Xrm.Controls.NumberControl';
             }
         }
-        if (type === 5) {
+        if (type === 4) {
+            return 'Xrm.Controls.OptionSetControl';
+        } else if (type === 5) {
             return 'Xrm.Controls.GridControl';
         } else if (type === 6) {
             return 'Xrm.Controls.FramedControl';

diff --git a/src/commands/generators/FormTypings.ts b/src/commands/generators/FormTypings.ts
@@ -124,7 +124,9 @@ export class FormTypings {
                 return 'Xrm.Controls.NumberControl';
             }
         }
-        if (type === 5) {
+        if (type === 4) {
+            return 'Xrm.Controls.OptionSetControl';
+        } else if (type === 5) {
             return 'Xrm.Controls.GridControl';
         } else if (type === 6) {
             return 'Xrm.Controls.FramedControl';