Skip to content

Commit 706e51f

Browse files
committed
Merge branch 'main' of github.com:microsoft/vscode-mssql
2 parents a5d1d08 + c2aee05 commit 706e51f

File tree

5 files changed

+51
-79
lines changed

5 files changed

+51
-79
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## Version 1.23.0
4+
* Release date: July, 31, 2024
5+
* Release status: GA
6+
### What's new in 1.23.0
7+
* update STS dependency to address [Transaction Isolation Level](https://github.com/microsoft/azuredatastudio/issues/25525) bug
8+
39
## Version 1.22.1
410
* Release date: January, 10, 2024
511
* Release status: GA

build/templates/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ parameters:
1010

1111
steps:
1212
- task: UseNode@1
13-
displayName: "Use Node 18.x"
13+
displayName: "Use Node 22.x"
1414
inputs:
15-
version: 18.x
15+
version: 22.x
1616

1717
- pwsh: |
1818
Write-Host "Installing Yarn"

package.json

+11-12
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"@types/keytar": "^4.4.2",
7878
"@types/lockfile": "^1.0.2",
7979
"@types/mocha": "^5.2.7",
80-
"@types/node": "^18.11.9",
80+
"@types/node": "^20.14.8",
8181
"@types/node-fetch": "^2.6.2",
8282
"@types/react": "^18.3.3",
8383
"@types/react-dom": "^18.3.0",
@@ -133,18 +133,22 @@
133133
"typescript-eslint": "^7.13.1",
134134
"uglify-js": "mishoo/UglifyJS2#harmony-v2.8.22",
135135
"vscode-nls-dev": "2.0.1",
136-
"yargs": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"
136+
"yargs": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
137+
"@fluentui/react-components": "^9.54.3",
138+
"@monaco-editor/react": "^4.6.0",
139+
"react": "^18.3.1",
140+
"react-dom": "^18.3.1",
141+
"react-markdown": "^9.0.1",
142+
"react-resizable": "^3.0.5",
143+
"react-router-dom": "^6.24.1"
137144
},
138145
"dependencies": {
139146
"@azure/arm-resources": "^5.0.0",
140147
"@azure/arm-sql": "^9.0.0",
141148
"@azure/arm-subscriptions": "^5.0.0",
142-
"@azure/msal-common": "^11.0.0",
143-
"@azure/msal-node": "^1.16.0",
144-
"@fluentui/react-components": "^9.54.3",
149+
"@azure/msal-common": "^14.14.0",
150+
"@azure/msal-node": "^2.12.0",
145151
"@microsoft/ads-extension-telemetry": "^3.0.2",
146-
"@monaco-editor/react": "^4.6.0",
147-
"@vscode/webview-ui-toolkit": "^1.4.0",
148152
"axios": "^1.6.0",
149153
"core-js": "^2.4.1",
150154
"decompress-zip": "^0.2.2",
@@ -162,11 +166,6 @@
162166
"pretty-data": "^0.40.0",
163167
"qs": "^6.9.1",
164168
"rangy": "^1.3.0",
165-
"react": "^18.3.1",
166-
"react-dom": "^18.3.1",
167-
"react-markdown": "^9.0.1",
168-
"react-resizable": "^3.0.5",
169-
"react-router-dom": "^6.24.1",
170169
"reflect-metadata": "0.1.12",
171170
"semver": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
172171
"tar": "^6.2.1",

src/views/htmlcontent/src/css/styles.css

+17
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,27 @@
5454
padding: 8px;
5555
background-repeat: no-repeat;
5656
background-position: 0px;
57+
text-decoration: none;
58+
overflow: visible;
59+
}
60+
61+
.icon:focus::after {
62+
content: attr(title);
63+
background-color: #292a2d;
64+
color: #cfd1d4;
65+
border: 1px solid #cfd1d4;
66+
font-size: 95%;
67+
padding:7px;
68+
padding-top: 3px;
69+
padding-bottom: 3px;
70+
text-decoration: none;
71+
z-index: 999999;
72+
position: absolute;
5773
}
5874

5975
.gridIcon {
6076
margin: 5px 5px;
77+
overflow: visible;
6178
}
6279

6380
/* messages */

yarn.lock

+15-65
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,17 @@
162162
dependencies:
163163
tslib "^2.2.0"
164164

165-
"@azure/msal-common@^11.0.0":
166-
version "11.0.0"
167-
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-11.0.0.tgz#d35bfa6cdd2a5b8c036ce427aa3fd36f8f985239"
168-
integrity sha512-SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g==
165+
"@azure/msal-common@14.14.0", "@azure/msal-common@^14.14.0":
166+
version "14.14.0"
167+
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.14.0.tgz#31a015070d5864ebcf9ebb988fcbc5c5536f22d1"
168+
integrity sha512-OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ==
169169

170-
"@azure/msal-node@^1.16.0":
171-
version "1.16.0"
172-
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.16.0.tgz#0bd469916f5a9da22d844edc879ac7e8225c0ccb"
173-
integrity sha512-eGXPp65i++mAIvziafbCH970TCeECB6iaQP7aRzZEjtU238cW4zKm40U8YxkiCn9rR1G2VeMHENB5h6WRk7ZCQ==
170+
"@azure/msal-node@^2.12.0":
171+
version "2.12.0"
172+
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.12.0.tgz#57ee6b6011a320046d72dc0828fec46278f2ab2c"
173+
integrity sha512-jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg==
174174
dependencies:
175-
"@azure/msal-common" "^11.0.0"
175+
"@azure/msal-common" "14.14.0"
176176
jsonwebtoken "^9.0.0"
177177
uuid "^8.3.0"
178178

@@ -1399,36 +1399,6 @@
13991399
dependencies:
14001400
"@vscode/extension-telemetry" "0.6.1"
14011401

1402-
"@microsoft/fast-element@^1.12.0", "@microsoft/fast-element@^1.13.0":
1403-
version "1.13.0"
1404-
resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-1.13.0.tgz#d390ff13697064a48dc6ad6bb332a5f5489f73f8"
1405-
integrity sha512-iFhzKbbD0cFRo9cEzLS3Tdo9BYuatdxmCEKCpZs1Cro/93zNMpZ/Y9/Z7SknmW6fhDZbpBvtO8lLh9TFEcNVAQ==
1406-
1407-
"@microsoft/fast-foundation@^2.49.4", "@microsoft/fast-foundation@^2.49.6":
1408-
version "2.49.6"
1409-
resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-2.49.6.tgz#0bdee7d28dcf93918075618359b083a676d2891c"
1410-
integrity sha512-DZVr+J/NIoskFC1Y6xnAowrMkdbf2d5o7UyWK6gW5AiQ6S386Ql8dw4KcC4kHaeE1yL2CKvweE79cj6ZhJhTvA==
1411-
dependencies:
1412-
"@microsoft/fast-element" "^1.13.0"
1413-
"@microsoft/fast-web-utilities" "^5.4.1"
1414-
tabbable "^5.2.0"
1415-
tslib "^1.13.0"
1416-
1417-
"@microsoft/fast-react-wrapper@^0.3.22":
1418-
version "0.3.24"
1419-
resolved "https://registry.yarnpkg.com/@microsoft/fast-react-wrapper/-/fast-react-wrapper-0.3.24.tgz#caed362a95fac88f9715a4b82425c395fba550c2"
1420-
integrity sha512-sRnSBIKaO42p4mYoYR60spWVkg89wFxFAgQETIMazAm2TxtlsnsGszJnTwVhXq2Uz+XNiD8eKBkfzK5c/i6/Kw==
1421-
dependencies:
1422-
"@microsoft/fast-element" "^1.13.0"
1423-
"@microsoft/fast-foundation" "^2.49.6"
1424-
1425-
"@microsoft/fast-web-utilities@^5.4.1":
1426-
version "5.4.1"
1427-
resolved "https://registry.yarnpkg.com/@microsoft/fast-web-utilities/-/fast-web-utilities-5.4.1.tgz#8e3082ee2ff2b5467f17e7cb1fb01b0e4906b71f"
1428-
integrity sha512-ReWYncndjV3c8D8iq9tp7NcFNc1vbVHvcBFPME2nNFKNbS1XCesYZGlIlf3ot5EmuOXPlrzUHOWzQ2vFpIkqDg==
1429-
dependencies:
1430-
exenv-es6 "^1.1.1"
1431-
14321402
"@monaco-editor/loader@^1.4.0":
14331403
version "1.4.0"
14341404
resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.4.0.tgz#f08227057331ec890fa1e903912a5b711a2ad558"
@@ -1642,10 +1612,10 @@
16421612
dependencies:
16431613
undici-types "~5.26.4"
16441614

1645-
"@types/node@^18.11.9":
1646-
version "18.18.9"
1647-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.9.tgz#5527ea1832db3bba8eb8023ce8497b7d3f299592"
1648-
integrity sha512-0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ==
1615+
"@types/node@^20.14.8":
1616+
version "20.14.13"
1617+
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.13.tgz#bf4fe8959ae1c43bc284de78bd6c01730933736b"
1618+
integrity sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==
16491619
dependencies:
16501620
undici-types "~5.26.4"
16511621

@@ -1834,16 +1804,6 @@
18341804
jszip "^3.10.1"
18351805
semver "^7.5.2"
18361806

1837-
"@vscode/webview-ui-toolkit@^1.4.0":
1838-
version "1.4.0"
1839-
resolved "https://registry.yarnpkg.com/@vscode/webview-ui-toolkit/-/webview-ui-toolkit-1.4.0.tgz#abbd5b2f8a08eee6cfb68d47a83778424f926715"
1840-
integrity sha512-modXVHQkZLsxgmd5yoP3ptRC/G8NBDD+ob+ngPiWNQdlrH6H1xR/qgOBD85bfU3BhOB5sZzFWBwwhp9/SfoHww==
1841-
dependencies:
1842-
"@microsoft/fast-element" "^1.12.0"
1843-
"@microsoft/fast-foundation" "^2.49.4"
1844-
"@microsoft/fast-react-wrapper" "^0.3.22"
1845-
tslib "^2.6.2"
1846-
18471807
18481808
version "0.8.4"
18491809
resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.4.tgz#05b76034d3e09d4b9d309d9b862994de23e7687d"
@@ -4248,11 +4208,6 @@ event-stream@^3.3.2:
42484208
stream-combiner "^0.2.2"
42494209
through "^2.3.8"
42504210

4251-
exenv-es6@^1.1.1:
4252-
version "1.1.1"
4253-
resolved "https://registry.yarnpkg.com/exenv-es6/-/exenv-es6-1.1.1.tgz#80b7a8c5af24d53331f755bac07e84abb1f6de67"
4254-
integrity sha512-vlVu3N8d6yEMpMsEm+7sUBAI81aqYYuEvfK0jNqmdb/OPXzzH7QWDDnVjMvDSY47JdHEqx/dfC/q8WkfoTmpGQ==
4255-
42564211
expand-brackets@^2.1.4:
42574212
version "2.1.4"
42584213
resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -9386,11 +9341,6 @@ systemjs@^0.19.43:
93869341
dependencies:
93879342
when "^3.7.5"
93889343

9389-
tabbable@^5.2.0:
9390-
version "5.3.3"
9391-
resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.3.3.tgz#aac0ff88c73b22d6c3c5a50b1586310006b47fbf"
9392-
integrity sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==
9393-
93949344
tabster@^8.0.0:
93959345
version "8.0.0"
93969346
resolved "https://registry.yarnpkg.com/tabster/-/tabster-8.0.0.tgz#a4412ab92643a70ff6c4f20fc82b04602fb63949"
@@ -9648,7 +9598,7 @@ ts-api-utils@^1.3.0:
96489598
resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
96499599
integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
96509600

9651-
tslib@^1.13.0, tslib@^1.9.3:
9601+
tslib@^1.9.3:
96529602
version "1.14.1"
96539603
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
96549604
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -9658,7 +9608,7 @@ tslib@^2.0.0:
96589608
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
96599609
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
96609610

9661-
tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.6.2:
9611+
tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0:
96629612
version "2.6.3"
96639613
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
96649614
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==

0 commit comments

Comments
 (0)