Skip to content

Commit 7222ba6

Browse files
authored
Merge branch 'main' into snippet-foreach-progress
2 parents bff9179 + 41b7e30 commit 7222ba6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3935
-7303
lines changed

.config/tsaoptions.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"instanceUrl": "https://msazure.visualstudio.com",
3+
"projectName": "One",
4+
"areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell",
5+
"notificationAliases": [ "[email protected]", "[email protected]" ],
6+
"codebaseName": "PowerShell_vscode-powershell_20240328",
7+
"tools": [ "CredScan", "PoliCheck", "BinSkim" ]
8+
}

.eslintrc.json

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,42 +33,28 @@
3333
"error",
3434
"always"
3535
],
36-
"@typescript-eslint/explicit-function-return-type": [
37-
"error"
38-
],
36+
"@typescript-eslint/explicit-function-return-type": "error",
37+
"@typescript-eslint/no-empty-object-type": "off",
3938
"@typescript-eslint/no-floating-promises": [
4039
"error",
4140
{
4241
"ignoreVoid": true
4342
}
4443
],
45-
"@typescript-eslint/no-non-null-assertion": [
46-
"off"
47-
],
44+
"@typescript-eslint/no-non-null-assertion": "off",
45+
"@typescript-eslint/no-require-imports": "off",
4846
"@typescript-eslint/no-unused-vars": [
4947
"error",
5048
{
5149
"argsIgnorePattern": "^_"
5250
}
5351
],
54-
"@typescript-eslint/no-unsafe-argument": [
55-
"off"
56-
],
57-
"@typescript-eslint/no-unsafe-assignment": [
58-
"off"
59-
],
60-
"@typescript-eslint/no-unsafe-call": [
61-
"off"
62-
],
63-
"@typescript-eslint/no-unsafe-member-access": [
64-
"off"
65-
],
66-
"@typescript-eslint/no-unsafe-return": [
67-
"off"
68-
],
69-
"@typescript-eslint/restrict-template-expressions": [
70-
"off"
71-
],
52+
"@typescript-eslint/no-unsafe-argument": "off",
53+
"@typescript-eslint/no-unsafe-assignment": "off",
54+
"@typescript-eslint/no-unsafe-call": "off",
55+
"@typescript-eslint/no-unsafe-member-access": "off",
56+
"@typescript-eslint/no-unsafe-return": "off",
57+
"@typescript-eslint/restrict-template-expressions": "off",
7258
"@typescript-eslint/prefer-nullish-coalescing": [
7359
"error",
7460
{

.github/dependabot.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/release.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- Ignore
5+
authors:
6+
- dependabot
7+
categories:
8+
- title: Enhancements & Features ✨
9+
labels:
10+
- Issue-Enhancement
11+
- title: Squashed Bugs 🐛
12+
labels:
13+
- Issue-Bug
14+
- title: Other Changes 🙏
15+
labels:
16+
- "*"

.github/workflows/ci-test.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
pull_request:
77
# The branches below must be a subset of the branches above
88
branches: [ main ]
9-
paths-ignore: [ '**/*.md' ]
109
merge_group:
1110
types: [ checks_requested ]
1211

@@ -19,12 +18,8 @@ jobs:
1918
runs-on: ${{ matrix.os }}
2019
env:
2120
DOTNET_NOLOGO: true
22-
DOTNET_CLI_TELEMETRY_OPTOUT: true
2321
DOTNET_GENERATE_ASPNET_CERTIFICATE: false
2422
DISPLAY: ':99.0'
25-
defaults:
26-
run:
27-
working-directory: vscode-powershell
2823
steps:
2924
- name: Checkout PowerShellEditorServices
3025
uses: actions/checkout@v4
@@ -41,16 +36,17 @@ jobs:
4136
uses: actions/setup-dotnet@v4
4237
with:
4338
cache: true
44-
cache-dependency-path: 'PowerShellEditorServices/**/packages.lock.json'
39+
cache-dependency-path: PowerShellEditorServices/**/*.csproj
4540
global-json-file: PowerShellEditorServices/global.json
41+
config-file: PowerShellEditorServices/nuget.config
4642

4743
- name: Install PSResources
4844
shell: pwsh
49-
run: ../PowerShellEditorServices/tools/installPSResources.ps1
45+
run: ./vscode-powershell/tools/installPSResources.ps1
5046

5147
- uses: actions/setup-node@v4
5248
with:
53-
node-version: 18
49+
node-version: 20
5450
cache: npm
5551
cache-dependency-path: vscode-powershell/package-lock.json
5652

@@ -60,14 +56,15 @@ jobs:
6056

6157
- name: Build, test and package
6258
shell: pwsh
63-
run: Invoke-Build
59+
run: Invoke-Build -Configuration Release
60+
working-directory: vscode-powershell
6461

6562
- name: Upload build artifacts
6663
uses: actions/upload-artifact@v4
6764
if: always()
6865
with:
6966
name: vscode-powershell-vsix-${{ matrix.os }}
70-
path: vscode-powershell/powershell-*.vsix
67+
path: '**/*.vsix'
7168

7269
- name: Upload test results
7370
uses: actions/upload-artifact@v4

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.gitignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
**.js
2+
**.js.map
13
.vscode-test/
2-
logs/
4+
*.vsix
5+
dist/
36
modules
47
modules/
58
node_modules/
6-
obj/
7-
bin/
89
out/
9-
sessions/
10+
test/mocks/BinaryModule/bin/
11+
test/mocks/BinaryModule/obj/
1012
test-results.xml
11-
*.vsix
12-
*.DS_Store
13+
tsconfig.tsbuildinfo

.mocharc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"require": "source-map-support/register",
99
"timeout": 600000,
1010
"slow": 2000,
11-
"spec": "out/test/**/*.test.js"
11+
"spec": "test/**/*.test.js"
1212
}

.npmrc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
; We use Dependabot to update our packages, so we want to add without a prefix
2-
save-exact=true
1+
; We generally want to save install/update commands
2+
save=true
3+
; We use a public Azure Artifacts mirror
4+
registry=https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
5+
always-auth=true
6+
; But we don't want references to it in the lockfile
7+
omit-lockfile-registry-resolved=true

0 commit comments

Comments
 (0)