Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DevSkim-VSCode-Plugin/.npmrc.pr
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
registry=https://twcsecurityassurance.pkgs.visualstudio.com/SecurityEngineering/_packaging/PublicRegistriesFeed/npm/registry/
registry=https://pkgs.dev.azure.com/microsoft-sdl/General/_packaging/PublicRegistriesFeed/npm/registry/

always-auth=true
13 changes: 6 additions & 7 deletions DevSkim-VSCode-Plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,12 @@
"vsce-pack": "vsce package || echo 'Release build failed'",
"pipeline-pack":"npm install --global @microsoft/artifacts-npm-credprovider --registry https://pkgs.dev.azure.com/artifacts-public/23934c1b-a3b5-4b70-9dd3-d1bef4cc72a0/_packaging/AzureArtifacts/npm/registry/ && cp .npmrc.pr .npmrc && artifacts-npm-credprovider && npm run restore-net && npm run rewrite-registry:root && npm run rewrite-registry:client && npm run pack-ext",
"pipeline-pack-release":"npm install --global @microsoft/artifacts-npm-credprovider --registry https://pkgs.dev.azure.com/artifacts-public/23934c1b-a3b5-4b70-9dd3-d1bef4cc72a0/_packaging/AzureArtifacts/npm/registry/ && cp .npmrc.release .npmrc && artifacts-npm-credprovider && npm run restore-net-release && npm run rewrite-registry:root-release && npm run rewrite-registry:client-release && npm run pack-ext",
"restore-net":"dotnet restore --configfile ../nuget.config.azure ../DevSkim-Dotnet/Microsoft.DevSkim.LanguageServer",
"restore-net-release":"dotnet restore --configfile ../nuget.release.config ../DevSkim-Dotnet/Microsoft.DevSkim.LanguageServer",
"rewrite-registry:root": "node scripts/updatePackageLock.js ../package-lock.json https://twcsecurityassurance.pkgs.visualstudio.com/SecurityEngineering/_packaging/PublicRegistriesFeed/npm/registry/",
"rewrite-registry:client": "node scripts/updatePackageLock.js ../client/package-lock.json https://twcsecurityassurance.pkgs.visualstudio.com/SecurityEngineering/_packaging/PublicRegistriesFeed/npm/registry/",
"rewrite-registry:root-release": "node scripts/updatePackageLock.js ../package-lock.json https://twcdot.pkgs.visualstudio.com/Data/_packaging/Data_PublicPackages/npm/registry/",
"rewrite-registry:client-release": "node scripts/updatePackageLock.js ../client/package-lock.json https://twcdot.pkgs.visualstudio.com/Data/_packaging/Data_PublicPackages/npm/registry/"

"restore-net":"dotnet restore --configfile ../nuget.config ../DevSkim-Dotnet/Microsoft.DevSkim.LanguageServer",
"restore-net-release":"dotnet restore --configfile ../nuget.config ../DevSkim-Dotnet/Microsoft.DevSkim.LanguageServer",
"rewrite-registry:root": "node scripts/updatePackageLock.js ../package-lock.json https://pkgs.dev.azure.com/microsoft-sdl/General/_packaging/PublicRegistriesFeed/npm/registry/",
"rewrite-registry:client": "node scripts/updatePackageLock.js ../client/package-lock.json https://pkgs.dev.azure.com/microsoft-sdl/General/_packaging/PublicRegistriesFeed/npm/registry/",
"rewrite-registry:root-release": "node scripts/updatePackageLock.js ../package-lock.json https://pkgs.dev.azure.com/microsoft-sdl/General/_packaging/Data_PublicPackages/npm/registry/",
"rewrite-registry:client-release": "node scripts/updatePackageLock.js ../client/package-lock.json https://pkgs.dev.azure.com/microsoft-sdl/General/_packaging/Data_PublicPackages/npm/registry/"
},
"devDependencies": {
"@types/node": "^14.x",
Expand Down
14 changes: 7 additions & 7 deletions Pipelines/cli/devskim-cli-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ resources:
repositories:
- repository: templates
type: git
name: SecurityEngineering/OSS-Tools-Pipeline-Templates
name: General/OSS-Tools-Pipeline-Templates
ref: refs/tags/v2.0.4
- repository: 1esPipelines
type: git
Expand Down Expand Up @@ -44,7 +44,7 @@ extends:
dotnetTestArgs: '-- --coverage --report-trx'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.config.azure'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
- template: dotnet-test-job.yml@templates
Expand All @@ -58,7 +58,7 @@ extends:
dotnetTestArgs: '-- --coverage --report-trx'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.config.azure'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
- stage: Build
Expand All @@ -75,7 +75,7 @@ extends:
artifactName: 'linux-mac-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.config.azure'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand All @@ -89,7 +89,7 @@ extends:
artifactName: 'win-netcore-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.config.azure'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand All @@ -104,7 +104,7 @@ extends:
artifactName: 'nuget-lib-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.config.azure'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand All @@ -119,7 +119,7 @@ extends:
artifactName: 'nuget-cli-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.config.azure'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand Down
33 changes: 17 additions & 16 deletions Pipelines/cli/devskim-cli-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resources:
repositories:
- repository: templates
type: git
name: Data/OSS-Tools-Pipeline-Templates
name: General/OSS-Tools-Pipeline-Templates
ref: refs/tags/v2.0.4
- repository: 1esPipelines
type: git
Expand Down Expand Up @@ -43,7 +43,7 @@ extends:
dotnetTestArgs: '-- --coverage --report-trx'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.release.config'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
- template: dotnet-test-job.yml@templates
Expand All @@ -57,7 +57,7 @@ extends:
dotnetTestArgs: '-- --coverage --report-trx'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.release.config'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1

Expand All @@ -75,7 +75,7 @@ extends:
artifactName: 'linux-mac-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.release.config'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand All @@ -89,7 +89,7 @@ extends:
artifactName: 'win-netcore-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.release.config'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand All @@ -104,7 +104,7 @@ extends:
artifactName: 'nuget-lib-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.release.config'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand All @@ -119,7 +119,7 @@ extends:
artifactName: 'nuget-cli-archive'
includeNuGetOrg: false
nugetFeedsToUse: 'config'
nugetConfigPath: 'nuget.release.config'
nugetConfigPath: 'nuget.config'
onInit:
- task: NuGetAuthenticate@1
preBuild:
Expand Down Expand Up @@ -150,6 +150,7 @@ extends:
inputs:
packageType: 'sdk'
version: ${{ variables.DotnetVersion }}
- task: NuGetAuthenticate@1
- template: nbgv-set-version-steps.yml@templates
# set-version-steps only sets it for current job, while adding isOutput only sets it for future jobs
# https://learn.microsoft.com/en-us/azure/devops/pipelines/process/set-variables-scripts?view=azure-devops&tabs=powershell#set-an-output-variable-for-use-in-future-jobs
Expand Down Expand Up @@ -206,7 +207,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: First Party Code Sign - Linux
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -245,7 +246,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: First Party Code Sign - MacOS
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -284,7 +285,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: First Party Code Sign - Windows
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -323,7 +324,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: First Party Code Sign - .NET Core App
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -363,7 +364,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: Third Party Code Sign - Linux
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -402,7 +403,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: Third Party Code Sign - MacOS
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -440,7 +441,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: Third Party Code Sign - Windows
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -478,7 +479,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: Third Party Code Sign - .NET Core App
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down Expand Up @@ -518,7 +519,7 @@ extends:
- task: EsrpCodeSigning@5
displayName: Code Sign Nuget Packages
inputs:
ConnectedServiceName: 'oss-esrp-signing-v5-connection'
ConnectedServiceName: 'oss-esrp-signing-devskim-v5-connection'
AppRegistrationClientId: '8694c10c-c89d-4231-9dca-36cb80737ad0'
AppRegistrationTenantId: '33e01921-4d64-4f8c-a055-5bdaffd5e33d'
AuthAKVName: 'oss-signing-vault'
Expand Down
70 changes: 0 additions & 70 deletions Pipelines/vs/devskim-visualstudio-pr.yml

This file was deleted.

Loading
Loading