Skip to content

Commit

Permalink
Update CI to install .NET SDK 8.0
Browse files Browse the repository at this point in the history
And some various cleanups.
  • Loading branch information
andyleejordan committed Dec 16, 2023
1 parent 774fbec commit 2b11d15
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 64 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .vsts-ci/azure-pipelines-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 6 additions & 3 deletions .vsts-ci/azure-pipelines-release.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
20 changes: 0 additions & 20 deletions .vsts-ci/misc-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ name: Misc-$(Build.SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rr)

trigger:
- gh-readonly-queue/main/*
pr:
paths:
exclude:
- '**/*.md'

resources:
repositories:
Expand All @@ -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
17 changes: 11 additions & 6 deletions .vsts-ci/templates/ci-general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
31 changes: 0 additions & 31 deletions .vsts-ci/templates/credscan.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 2b11d15

Please sign in to comment.