diff --git a/gulpfile.js b/gulpfile.js
index 8c7f462f..3a9b020f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -218,13 +218,13 @@ async function snapshot() {
process.chdir(orgDir);
}
}
-const cliVersion = '1.15.3';
+const cliVersion = '1.15.7-daily-22060700';
const recompile = gulp.series(
clean,
- async () => nugetInstall('CAP_ISVExp_Tools_Stable', 'Microsoft.PowerApps.CLI',cliVersion, path.resolve(distdir, 'pac')),
- async () => nugetInstall('CAP_ISVExp_Tools_Stable', 'Microsoft.PowerApps.CLI.Core.osx-x64', cliVersion, path.resolve(distdir, 'pac')),
- async () => nugetInstall('CAP_ISVExp_Tools_Stable', 'Microsoft.PowerApps.CLI.Core.linux-x64', cliVersion, path.resolve(distdir, 'pac')),
+ async () => nugetInstall('CAP_ISVExp_Tools_Daily', 'Microsoft.PowerApps.CLI',cliVersion, path.resolve(distdir, 'pac')),
+ async () => nugetInstall('CAP_ISVExp_Tools_Daily', 'Microsoft.PowerApps.CLI.Core.osx-x64', cliVersion, path.resolve(distdir, 'pac')),
+ async () => nugetInstall('CAP_ISVExp_Tools_Daily', 'Microsoft.PowerApps.CLI.Core.linux-x64', cliVersion, path.resolve(distdir, 'pac')),
translationsExport,
translationsImport,
translationsGenerate,
diff --git a/loc/translations-export/vscode-powerplatform.xlf b/loc/translations-export/vscode-powerplatform.xlf
index c6f4ab1f..b922274a 100644
--- a/loc/translations-export/vscode-powerplatform.xlf
+++ b/loc/translations-export/vscode-powerplatform.xlf
@@ -36,9 +36,9 @@
No auth profiles found on this computer.
-[Add Dataverse Auth Profile](command:pacCLI.authPanel.newDataverseAuthProfile)
+[Add Auth Profile](command:pacCLI.authPanel.newAuthProfile)
This is a Markdown formatted string, and the formatting must persist across translations.
-The second line should be '[TRANSLATION HERE](command:pacCLI.authPanel.newDataverseAuthProfile)', keeping brackets and the text in the parentheses unmodified
+The second line should be '[TRANSLATION HERE](command:pacCLI.authPanel.newAuthProfile)', keeping brackets and the text in the parentheses unmodified
No auth profiles found on this computer.
@@ -55,7 +55,7 @@ The third line should be '[TRANSLATION HERE](command:pacCLI.pacAuthHelp)', keepi
Refresh
- New Dataverse Auth Profile
+ New Auth Profile
Select Auth Profile
@@ -126,12 +126,6 @@ The third line should be '[TRANSLATION HERE](command:pacCLI.pacAuthHelp)', keepi
Cancel
-
- Create new Dataverse Auth Profile
-
-
- Enter Environment URL
-
Confirm
diff --git a/package.json b/package.json
index 944b9043..9d9e7ddb 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
"icon": "$(refresh)"
},
{
- "command": "pacCLI.authPanel.newDataverseAuthProfile",
+ "command": "pacCLI.authPanel.newAuthProfile",
"category": "Power Platform CLI",
"title": "%pacCLI.authPanel.newDataverseAuthProfile.title%",
"icon": "$(add)"
@@ -244,7 +244,7 @@
"when": "never"
},
{
- "command": "pacCLI.authPanel.newDataverseAuthProfile",
+ "command": "pacCLI.authPanel.newAuthProfile",
"when": "pacCLI.authPanel.interactiveLoginSupported"
},
{
@@ -302,7 +302,7 @@
],
"view/title": [
{
- "command": "pacCLI.authPanel.newDataverseAuthProfile",
+ "command": "pacCLI.authPanel.newAuthProfile",
"when": "view == pacCLI.authPanel && pacCLI.authPanel.interactiveLoginSupported",
"group": "navigation@0"
},
diff --git a/package.nls.json b/package.nls.json
index d5edd87a..664fc884 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -13,10 +13,10 @@
"pacCLI.authPanel.title": "Auth Profiles",
"pacCLI.authPanel.welcome.whenInteractiveSupported": {
- "message": "No auth profiles found on this computer.\n[Add Dataverse Auth Profile](command:pacCLI.authPanel.newDataverseAuthProfile)",
+ "message": "No auth profiles found on this computer.\n[Add Auth Profile](command:pacCLI.authPanel.newAuthProfile)",
"comment": [
"This is a Markdown formatted string, and the formatting must persist across translations.",
- "The second line should be '[TRANSLATION HERE](command:pacCLI.authPanel.newDataverseAuthProfile)', keeping brackets and the text in the parentheses unmodified"
+ "The second line should be '[TRANSLATION HERE](command:pacCLI.authPanel.newAuthProfile)', keeping brackets and the text in the parentheses unmodified"
]
},
"pacCLI.authPanel.welcome.whenInteractiveNotSupported": {
@@ -25,12 +25,12 @@
"This is a Markdown formatted string, and the formatting must persist across translations.",
"The second line should not translate the argument `--deviceCode`",
"The third line should be '[TRANSLATION HERE](command:pacCLI.pacAuthHelp)', keeping brackets and the text in the parentheses unmodified"
-
+
]
},
"pacCLI.authPanel.clearAuthProfile.title": "Clear Auth Profiles",
"pacCLI.authPanel.refresh.title": "Refresh",
- "pacCLI.authPanel.newDataverseAuthProfile.title": "New Dataverse Auth Profile",
+ "pacCLI.authPanel.newDataverseAuthProfile.title": "New Auth Profile",
"pacCLI.authPanel.selectAuthProfile.title": "Select Auth Profile",
"pacCLI.authPanel.deleteAuthProfile.title": "Delete Auth Profile",
"pacCLI.authPanel.nameAuthProfile.title": "Name/Rename Auth Profile",
diff --git a/src/client/lib/PacActivityBarUI.ts b/src/client/lib/PacActivityBarUI.ts
index 5836e481..90de244c 100644
--- a/src/client/lib/PacActivityBarUI.ts
+++ b/src/client/lib/PacActivityBarUI.ts
@@ -32,17 +32,10 @@ export function RegisterPanels(pacWrapper: PacWrapper): vscode.Disposable[] {
envAndSolutionPanel.refresh();
}
}),
- vscode.commands.registerCommand("pacCLI.authPanel.newDataverseAuthProfile", async () => {
- const environmentUrl = await vscode.window.showInputBox({
- title: localize("pacCLI.authPanel.newDataverseAuthProfile.title", "Create new Dataverse Auth Profile"),
- prompt: localize("pacCLI.authPanel.newDataverseAuthProfile.prompt", "Enter Environment URL"),
- placeHolder: "https://example.crm.dynamics.com/"
- });
- if (environmentUrl) {
- await pacWrapper.authCreateNewDataverseProfile(environmentUrl);
- authPanel.refresh();
- envAndSolutionPanel.refresh();
- }
+ vscode.commands.registerCommand("pacCLI.authPanel.newAuthProfile", async () => {
+ await pacWrapper.authCreateNewAuthProfile();
+ authPanel.refresh();
+ envAndSolutionPanel.refresh();
}),
vscode.commands.registerCommand("pacCLI.authPanel.selectAuthProfile", async (item: AuthProfileTreeItem) => {
await pacWrapper.authSelectByIndex(item.model.Index);
diff --git a/src/client/lib/PanelComponents.ts b/src/client/lib/PanelComponents.ts
index f9d60aff..d078bc80 100644
--- a/src/client/lib/PanelComponents.ts
+++ b/src/client/lib/PanelComponents.ts
@@ -56,7 +56,7 @@ export class AuthProfileTreeItem extends vscode.TreeItem {
private static createLabel(profile: AuthProfileListing): string {
if (profile.Name) {
return `${profile.Kind}: ${profile.Name}`;
- } else if (profile.Kind === "ADMIN") {
+ } else if (profile.Kind === "ADMIN" || profile.Kind === "UNIVERSAL") {
return `${profile.Kind}: ${profile.User}`;
} else {
return `${profile.Kind}: ${profile.Resource}`;
diff --git a/src/client/pac/PacWrapper.ts b/src/client/pac/PacWrapper.ts
index 7e72bd62..b18fc3e4 100644
--- a/src/client/pac/PacWrapper.ts
+++ b/src/client/pac/PacWrapper.ts
@@ -112,13 +112,9 @@ export class PacWrapper {
return this.executeCommandAndParseResults(new PacArguments("auth", "list"));
}
- public async authCreateNewDataverseProfile(environmentUrl: string): Promise {
+ public async authCreateNewAuthProfile(): Promise {
return this.executeCommandAndParseResults(
- new PacArguments("auth", "create", "--kind", "DATAVERSE", "--url", environmentUrl));
- }
-
- public async authCreateNewAdminProfile(): Promise {
- return this.executeCommandAndParseResults(new PacArguments("auth", "create", "--kind", "ADMIN"));
+ new PacArguments("auth", "create"));
}
public async authSelectByIndex(index: number): Promise{