Skip to content

Commit

Permalink
Merge branch 'main' into dev/gcampbell/FixIsUserPreset
Browse files Browse the repository at this point in the history
  • Loading branch information
gcampbell-msft authored Sep 30, 2024
2 parents eec0b5d + 3305ff2 commit fabdabd
Show file tree
Hide file tree
Showing 10 changed files with 1,229 additions and 1,216 deletions.
4 changes: 4 additions & 0 deletions .github/actions/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# [OSS Contributors] Delete this .npmrc file to use the npmjs registry instead of the Microsoft Azure Artifacts feed for local development

registry=https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/
always-auth=true
286 changes: 143 additions & 143 deletions .github/actions/yarn.lock

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# [OSS Contributors] Delete this .npmrc file to use the npmjs registry instead of the Microsoft Azure Artifacts feed for local development

registry=https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/
always-auth=true
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@ Follow the [Typescript Coding guidelines](https://github.com/Microsoft/TypeScrip
### Changelog

Please update the CHANGELOG.md file as part of your pull request. Follow the style within that file and give yourself credit for the changes you make.

### Adding/Updating package.json dependencies

We maintain a public Azure Artifacts feed that we point the package manager to in the .npmrc file.

Because of this, if you want to add/update a dependency version in package.json, intervention from our team will be required to successfully merge PRs that have dependency updates. Please ping our team in the PR.

For local development before attempting to merge a PR, you can delete the .npmrc file and use the default NPM feed directly. Please do not push any subsequent changes to the yarn.lock file.
3 changes: 0 additions & 3 deletions jobs/release/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ extends:
templateContext:
type: releaseJob
isProduction: true
sdl:
codeSignValidation:
additionalTargetsGlobPattern: -|**\*.js
inputs:
- input: pipelineArtifact
pipeline: BuildPrereleasePipeline
Expand Down
3 changes: 0 additions & 3 deletions jobs/release/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ extends:
templateContext:
type: releaseJob
isProduction: true
sdl:
codeSignValidation:
additionalTargetsGlobPattern: -|**\*.js
inputs:
- input: pipelineArtifact
pipeline: BuildReleasePipeline
Expand Down
2 changes: 1 addition & 1 deletion jobs/shared/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ steps:
displayName: Build files
inputs:
script: |
npm run vscode:prepublish
yarn compile-production
- task: MSBuild@1
displayName: Sign files
inputs:
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3677,7 +3677,6 @@
"@test": "out/test/"
},
"scripts": {
"vscode:prepublish": "yarn run compile-production",
"compile": "yarn install && webpack --mode development",
"compile-watch": "yarn install && webpack --mode development --watch --progress",
"compile-production": "yarn install && yarn run translations-generate && webpack --env BUILD_VSCODE_NLS=true --mode production",
Expand Down
4 changes: 4 additions & 0 deletions tools/pr-creator/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# [OSS Contributors] Delete this .npmrc file to use the npmjs registry instead of the Microsoft Azure Artifacts feed for local development

registry=https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/
always-auth=true
2,130 changes: 1,065 additions & 1,065 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit fabdabd

Please sign in to comment.