diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index d2a7e601c7..f6549e6249 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -42,6 +42,7 @@ jobs: with: cache: true cache-dependency-path: 'PowerShellEditorServices/**/packages.lock.json' + global-json-file: PowerShellEditorServices/global.json - name: Install PSResources shell: pwsh diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml index d37b41213c..7c23c8399b 100644 --- a/.vsts-ci/azure-pipelines-ci.yml +++ b/.vsts-ci/azure-pipelines-ci.yml @@ -41,10 +41,10 @@ jobs: steps: - template: templates/ci-general.yml -- job: macOS11 - displayName: macOS 11 +- job: macOS12 + displayName: macOS 12 pool: - vmImage: macOS-11 + vmImage: macOS-12 steps: - template: templates/ci-general.yml diff --git a/.vsts-ci/azure-pipelines-release.yml b/.vsts-ci/azure-pipelines-release.yml index f1d7b90b86..5f02104218 100644 --- a/.vsts-ci/azure-pipelines-release.yml +++ b/.vsts-ci/azure-pipelines-release.yml @@ -1,14 +1,17 @@ name: Release-$(Build.SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rr) +trigger: none + variables: # Don't download unneeded packages - - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE + - name: DOTNET_NOLOGO value: 'true' # Improve performance by not sending telemetry - name: DOTNET_CLI_TELEMETRY_OPTOUT value: 'true' - -trigger: none + # Improve performance by not generating certificates + - name: DOTNET_GENERATE_ASPNET_CERTIFICATE + value: 'false' resources: repositories: diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml index 92f52fa6b4..4d12295089 100644 --- a/.vsts-ci/misc-analysis.yml +++ b/.vsts-ci/misc-analysis.yml @@ -2,10 +2,6 @@ name: Misc-$(Build.SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: - gh-readonly-queue/main/* -pr: - paths: - exclude: - - '**/*.md' resources: repositories: @@ -22,19 +18,3 @@ jobs: - checkout: self - checkout: ComplianceRepo - template: ci-compliance.yml@ComplianceRepo - -# NOTE: This enables our project to work with Visual Studio's Rich Navigation: -# https://visualstudio.microsoft.com/services/rich-code-navigation/ -- job: RichCodeNav - pool: - vmImage: windows-latest - steps: - # TODO: Move to GitHub Action - - task: RichCodeNavIndexer@0 - continueOnError: true - inputs: - serviceConnection: rich-nav - nugetServiceConnection: rich-nav-nuget - githubServiceConnection: PowerShell - languages: typescript,csharp - serviceEndpoint: https://prod.richnav.vsengsaas.visualstudio.com diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml index abba8d3854..5d3814b83d 100644 --- a/.vsts-ci/templates/ci-general.yml +++ b/.vsts-ci/templates/ci-general.yml @@ -33,19 +33,24 @@ steps: - task: UseDotNet@2 condition: not(${{ parameters.usePipelineArtifact }}) - displayName: Install .NET 7.0.x SDK + displayName: Install .NET 8.x SDK inputs: packageType: sdk - version: 7.0.x - performMultiLevelLookup: true + version: 8.x - task: UseDotNet@2 condition: not(${{ parameters.usePipelineArtifact }}) - displayName: Install .NET 6.0.x runtime + displayName: Install .NET 7.x runtime inputs: packageType: runtime - version: 6.0.x - performMultiLevelLookup: true + version: 7.x + +- task: UseDotNet@2 + condition: not(${{ parameters.usePipelineArtifact }}) + displayName: Install .NET 6.x runtime + inputs: + packageType: runtime + version: 6.x - task: UseNode@1 inputs: diff --git a/.vsts-ci/templates/credscan.yml b/.vsts-ci/templates/credscan.yml deleted file mode 100644 index eb711c8e0f..0000000000 --- a/.vsts-ci/templates/credscan.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - pool: 'Hosted VS2017' - jobName: 'credscan' - displayName: Secret Scan - -jobs: -- job: ${{ parameters.jobName }} - pool: - name: ${{ parameters.pool }} - - displayName: ${{ parameters.displayName }} - - steps: - - powershell: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))" - displayName: Set Build Name for Non-PR - condition: ne(variables['Build.Reason'], 'PullRequest') - - - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2 - displayName: 'Scan for secrets' - inputs: - debugMode: false - - - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2 - displayName: 'Publish Secret Scan Logs to Build Artifacts' - continueOnError: true - - - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1 - displayName: 'Check for failures' - inputs: - CredScan: true - ToolLogsNotFoundAction: Error diff --git a/README.md b/README.md index 2c8ebbd72e..2aacd437cb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # PowerShell for Visual Studio Code -[![Build Status](https://dev.azure.com/powershell/vscode-powershell/_apis/build/status/PowerShell.vscode-powershell?branchName=main)](https://dev.azure.com/powershell/vscode-powershell/_build/latest?definitionId=51&branchName=main) +[![CI Tests](https://github.com/PowerShell/vscode-powershell/actions/workflows/ci-test.yml/badge.svg)](https://github.com/PowerShell/vscode-powershell/actions/workflows/ci-test.yml) [![Version](https://img.shields.io/visual-studio-marketplace/v/ms-vscode.PowerShell)](https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell) [![Installs](https://img.shields.io/visual-studio-marketplace/i/ms-vscode.PowerShell)](https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell) [![Join the chat on Discord](https://img.shields.io/discord/180528040881815552.svg?label=%23vscode&logo=discord&logoColor=white)](https://aka.ms/powershell-vscode-discord)