Updated pa commands to reflect official pac cli v1.0.6

YannickRe · YannickRe · commit 8cc184b726fa · 2019-09-29T21:28:31.000+02:00
diff --git a/src/o365/pa/commands/pcf/pcf-init.ts b/src/o365/pa/commands/pcf/pcf-init.ts
@@ -27,7 +27,7 @@ interface Options extends GlobalOptions {
 
 /*
  * Logic extracted from bolt.module.pcf.dll
- * Version: 0.4.3
+ * Version: 1.0.6
  * Class: bolt.module.pcf.PcfInitVerb
  */
 class PaPcfInitCommand extends Command {
diff --git a/src/o365/pa/commands/pcf/pcf-init/assets/package.json b/src/o365/pa/commands/pcf/pcf-init/assets/package.json
@@ -13,7 +13,7 @@
     "@types/powerapps-component-framework": "^1.2.0"
   },
   "devDependencies": {
-    "pcf-scripts": "^0",
-    "pcf-start": "^0"
+    "pcf-scripts": "^1",
+    "pcf-start": "^1"
   }
 }
diff --git a/src/o365/pa/commands/pcf/pcf-init/assets/template_pcfprojecttype.pcfproj b/src/o365/pa/commands/pcf/pcf-init/assets/template_pcfprojecttype.pcfproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerApps.MSBuild.Pcf" Version="0.*"/>
+    <PackageReference Include="Microsoft.PowerApps.MSBuild.Pcf" Version="1.*"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/o365/pa/commands/solution/solution-init.ts b/src/o365/pa/commands/solution/solution-init.ts
@@ -26,7 +26,7 @@ interface Options extends GlobalOptions {
 
 /*
  * Logic extracted from bolt.module.solution.dll
- * Version: 0.4.3
+ * Version: 1.0.6
  * Class: bolt.module.solution.SolutionInitVerb
  */
 class PaSolutionInitCommand extends Command {
@@ -55,19 +55,21 @@ class PaSolutionInitCommand extends Command {
       const workingDirectoryName: string = path.basename(workingDirectory);
       const cdsAssetsDirectory: string = path.join(workingDirectory, 'Other');
       const cdsAssetsDirectorySolutionsFile: string = path.join(workingDirectory, 'Other', 'Solution.xml');
-      const customizationOptionValuePrefix: string = this.generateOptionValuePrefixForPublisher(args.options.publisherPrefix);
+      const publisherName: string = args.options.publisherName;
+      const publisherPrefix: string = args.options.publisherPrefix.toLocaleLowerCase();
+      const customizationOptionValuePrefix: string = this.generateOptionValuePrefixForPublisher(publisherPrefix);
       const variables: SolutionInitVariables = {
-        "$publisherName$": args.options.publisherName,
-        "$customizationPrefix$": args.options.publisherPrefix,
+        "$publisherName$": publisherName,
+        "$customizationPrefix$": publisherPrefix,
         "$customizationOptionValuePrefix$": customizationOptionValuePrefix,
         "$cdsProjectGuid$": uuidv4(),
         "solutionprojecttype": workingDirectoryName,
         "$solutionName$": workingDirectoryName
       };
 
       if (this.verbose) {
-        cmd.log(`publisherName: ${args.options.publisherName}`);
-        cmd.log(`publisherPrefix: ${args.options.publisherPrefix}`);
+        cmd.log(`publisherName: ${publisherName}`);
+        cmd.log(`publisherPrefix: ${publisherPrefix}`);
         cmd.log(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
         cmd.log(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
         cmd.log(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
@@ -91,7 +93,7 @@ class PaSolutionInitCommand extends Command {
       }
       else {
         TemplateInstantiator.instantiate(cmd, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
-        cmd.log(vorpal.chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${args.options.publisherName}', and customization prefix '${args.options.publisherPrefix}'.`));
+        cmd.log(vorpal.chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${publisherName}', and customization prefix '${publisherPrefix}'.`));
         cmd.log(`Please verify the publisher information and solution name found in the '${vorpal.chalk.grey('Solution.xml')}' file.`);
       }
 
diff --git a/src/o365/pa/commands/solution/solution-init/assets/Other/Customizations.xml b/src/o365/pa/commands/solution/solution-init/assets/Other/Customizations.xml
@@ -10,6 +10,7 @@
   <OrganizationSettings />
   <optionsets />
   <CustomControls />
+  <SolutionPluginAssemblies />
   <EntityDataProviders />
   <Languages>
     <Language>1033</Language>
diff --git a/src/o365/pa/commands/solution/solution-init/assets/template_solutionprojecttype.cdsproj b/src/o365/pa/commands/solution/solution-init/assets/template_solutionprojecttype.cdsproj
@@ -22,7 +22,7 @@
   -->
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerApps.MSBuild.Solution" Version="0.*"/>
+    <PackageReference Include="Microsoft.PowerApps.MSBuild.Solution" Version="1.*"/>
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/o365/pa/template-instantiator.ts b/src/o365/pa/template-instantiator.ts
@@ -5,7 +5,7 @@ import { SolutionInitVariables } from "./commands/solution/solution-init/solutio
 
 /*
  * Logic extracted from bolt.cli.dll
- * Version: 0.4.3
+ * Version: 1.0.6
  * Class: bolt.cli.TemplateInstantiator
  */
 export default class TemplateInstantiator {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"@types/powerapps-component-framework": "^1.2.0"`
`14`	`14`	`},`
`15`	`15`	`"devDependencies": {`
`16`		`- "pcf-scripts": "^0",`
`17`		`- "pcf-start": "^0"`
	`16`	`+ "pcf-scripts": "^1",`
	`17`	`+ "pcf-start": "^1"`
`18`	`18`	`}`
`19`	`19`	`}`