Skip to content

Commit 8094cfe

Browse files
Power-MaverickPower-Maverick
authored
Merge pull request #204 from Power-Maverick/main
Release v2.2.2
2 parents 6fdfe25 + ef33c46 commit 8094cfe

14 files changed

+2085
-1221
lines changed

‎.github/dependabot.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "npm" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "monthly"
12+
target-branch: "dependencies"
13+
# Specify labels for npm pull requests
14+
labels:
15+
- "dependencies"

‎CHANGELOG.md‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
99

10-
## [v2.2.1](https://github.com/Power-Maverick/DataverseDevTools-VSCode/compare/v2.1.9...v2.2.1)
10+
## [v2.2.2](https://github.com/Power-Maverick/DataverseDevTools-VSCode/compare/v2.2.1...v2.2.2)
1111

1212
### Merged
1313

14+
- Resolving Bug 200 [`#203`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/203)
15+
- Merge Dependencies [`#202`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/202)
16+
- Bump glob from 7.2.3 to 11.0.0 [`#184`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/184)
17+
- Bump typescript from 5.3.3 to 5.7.2 [`#196`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/196)
18+
- Bump @typescript-eslint/eslint-plugin from 6.16.0 to 8.17.0 [`#199`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/199)
19+
- Bump eslint from 8.56.0 to 9.16.0 [`#195`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/195)
20+
- Bump @azure/msal-node from 1.18.4 to 2.16.2 [`#198`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/198)
21+
22+
### Commits
23+
24+
- Fix XML attribute version (bug #200) and refactored code for upgraded package version [`a2cced4`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/a2cced4a42a5e7a629ad7f9221a08daf5cfb1f5c)
25+
- Create dependabot.yml [`dbd783b`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/dbd783bf9240f2939802ff18b4be916cd770c266)
26+
- Upgrade the version for release [`1cd439c`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/1cd439c4241ff2a713def26cdca545b9b35d409c)
27+
28+
## [v2.2.1](https://github.com/Power-Maverick/DataverseDevTools-VSCode/compare/v2.1.9...v2.2.1) - 2024-11-10
29+
30+
### Merged
31+
32+
- Release v2.2.1 [`#176`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/176)
1433
- Bug Fixes Nov 2024 [`#175`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/175)
34+
- Update file paths and imports. Upgraded to webpack [`#151`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/151)
35+
- Update package.json version to 2.1.13 and main file to extension.js [`#150`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/150)
36+
- Update package.json with version 2.1.12 and author [`#149`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/149)
37+
- Releasing v2.1.11 [`#148`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/148)
1538

1639
### Commits
1740

‎package-lock.json‎

Lines changed: 1937 additions & 1127 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "dataverse-devtools",
33
"displayName": "Dataverse DevTools",
4-
"version": "2.2.1",
4+
"version": "2.2.2",
55
"description": "The all-in-one tool to develop code for Dataverse/Dynamics 365. Helps you connect to a Dataverse environment, generate TypeScript definitions for entities, create different type of Dataverse-specific projects and much more.",
66
"publisher": "danish-naglekar",
77
"author": {
@@ -556,25 +556,25 @@
556556
"@types/node-fetch": "^2.5.11",
557557
"@types/uuid": "^8.3.1",
558558
"@types/vscode": "^1.80.0",
559-
"@typescript-eslint/eslint-plugin": "^6.15.0",
560-
"@typescript-eslint/parser": "^6.15.0",
559+
"@typescript-eslint/eslint-plugin": "^8.18.0",
560+
"@typescript-eslint/parser": "^8.0.0",
561561
"@vscode/test-cli": "^0.0.4",
562562
"@vscode/test-electron": "^2.3.8",
563563
"all-contributors-cli": "^6.20.0",
564564
"auto-changelog": "^2.3.0",
565565
"copy-webpack-plugin": "^11.0.0",
566-
"eslint": "^8.56.0",
567-
"glob": "^7.1.7",
566+
"eslint": "^8.0.0",
567+
"glob": "^11.0.0",
568568
"mocha": "^10.0.0",
569569
"ts-loader": "^9.5.1",
570-
"typescript": "^5.3.3",
570+
"typescript": "^5.7.2",
571571
"webpack": "^5.89.0",
572572
"webpack-cli": "^5.1.4"
573573
},
574574
"dependencies": {
575575
"@azure/identity": "^3.0.0",
576576
"@azure/identity-vscode": "^1.0.0",
577-
"@azure/msal-node": "^1.3.0",
577+
"@azure/msal-node": "^2.16.2",
578578
"@types/fs-extra": "^9.0.12",
579579
"@types/lodash": "^4.14.171",
580580
"@vscode/extension-telemetry": "^0.9.2",

‎src/cliCommands/cliCommandsDataProvider.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ export class CliCommandTreeItem extends CliCommandItemBase {
5555
}
5656

5757
iconPath = {
58-
light: path.join(__filename, "..", "resources", "light", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg"),
59-
dark: path.join(__filename, "..", "resources", "dark", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg"),
58+
light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg")),
59+
dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg")),
6060
};
6161

6262
contextValue = this.level === 2 ? "cli-command" : "cli-group";

‎src/cliCommands/cliCommandsItemBase.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export class CliCommandItemBase extends vscode.TreeItem {
1010
}
1111

1212
iconPath = {
13-
light: path.join(__filename, "..", "resources", "light", "generic.svg"),
14-
dark: path.join(__filename, "..", "resources", "dark", "generic.svg"),
13+
light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", "generic.svg")),
14+
dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", "generic.svg")),
1515
};
1616

1717
//contextValue = this.level === 2 ? "connection" : "connection-child";

‎src/login/login.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ export async function loginWithPrompt(clientId: string, adfs: boolean, dataverse
8989
if (vscode.env.uiKind === vscode.UIKind.Web) {
9090
//return loginWithoutLocalServer(clientId, environment, adfs, tenantId);
9191
}
92-
if (adfs && terminateServer) {
93-
await terminateServer();
94-
}
92+
// if (adfs && terminateServer) {
93+
// await terminateServer();
94+
// }
9595

9696
if (adfs) {
9797
//terminateServer = createTerminateServer(server);

‎src/tools/toolsDataProvider.ts‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,23 @@ export class ToolsTreeItem extends ToolsItemBase {
2929
}
3030

3131
iconPath = {
32-
light: path.join(
33-
__filename,
34-
"..",
35-
"resources",
36-
"toolIcons",
37-
this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
32+
light: vscode.Uri.file(
33+
path.join(
34+
__filename,
35+
"..",
36+
"resources",
37+
"toolIcons",
38+
this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
39+
),
3840
),
39-
dark: path.join(
40-
__filename,
41-
"..",
42-
"resources",
43-
"toolIcons",
44-
this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
41+
dark: vscode.Uri.file(
42+
path.join(
43+
__filename,
44+
"..",
45+
"resources",
46+
"toolIcons",
47+
this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
48+
),
4549
),
4650
};
4751
}

‎src/tools/toolsItemBase.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export class ToolsItemBase extends vscode.TreeItem {
1010
}
1111

1212
iconPath = {
13-
light: path.join(__filename, "..", "resources", "light", "generic.svg"),
14-
dark: path.join(__filename, "..", "resources", "dark", "generic.svg"),
13+
light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", "generic.svg")),
14+
dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", "generic.svg")),
1515
};
1616

1717
//contextValue = this.level === 2 ? "connection" : "connection-child";

‎src/trees/dataverseConnectionDataProvider.ts‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -116,35 +116,39 @@ export class DataverseConnectionTreeItem extends TreeItemBase {
116116
}
117117

118118
iconPath = {
119-
light: path.join(
120-
__filename,
121-
"..",
122-
"resources",
123-
"light",
124-
this.level === 1
125-
? "connection-type.svg"
126-
: this.level === 2 && this.current
127-
? "dataverse.svg"
128-
: this.level === 2 && !this.current
129-
? "dataverse-off.svg"
130-
: this.level === 3
131-
? "connection-details.svg"
132-
: "generic.svg",
119+
light: vscode.Uri.file(
120+
path.join(
121+
__filename,
122+
"..",
123+
"resources",
124+
"light",
125+
this.level === 1
126+
? "connection-type.svg"
127+
: this.level === 2 && this.current
128+
? "dataverse.svg"
129+
: this.level === 2 && !this.current
130+
? "dataverse-off.svg"
131+
: this.level === 3
132+
? "connection-details.svg"
133+
: "generic.svg",
134+
),
133135
),
134-
dark: path.join(
135-
__filename,
136-
"..",
137-
"resources",
138-
"dark",
139-
this.level === 1
140-
? "connection-type.svg"
141-
: this.level === 2 && this.current
142-
? "dataverse.svg"
143-
: this.level === 2 && !this.current
144-
? "dataverse-off.svg"
145-
: this.level === 3
146-
? "connection-details.svg"
147-
: "generic.svg",
136+
dark: vscode.Uri.file(
137+
path.join(
138+
__filename,
139+
"..",
140+
"resources",
141+
"dark",
142+
this.level === 1
143+
? "connection-type.svg"
144+
: this.level === 2 && this.current
145+
? "dataverse.svg"
146+
: this.level === 2 && !this.current
147+
? "dataverse-off.svg"
148+
: this.level === 3
149+
? "connection-details.svg"
150+
: "generic.svg",
151+
),
148152
),
149153
};
150154

0 commit comments

Comments
 (0)