diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 571ca691..3ac67578 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -13,19 +13,17 @@ jobs: # ubuntu build not supported in paket.dependencies for repo builds, # need to add linux commands first os: [windows-latest, macos-latest] - dotnet: [6.0.101] fail-fast: false # we have timing issues on some OS, so we want them all to run runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 + - uses: actions/setup-node@v3 with: - dotnet-version: ${{ matrix.dotnet }} - - uses: actions/setup-node@v2-beta - with: - node-version: '14' + node-version: '16' + cache: 'yarn' - name: Restore tools run: dotnet tool restore - run: yarn global add vsce diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 121b03c5..4350072a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,16 +20,15 @@ jobs: steps: # manual triggers are detached HEADs, so we need to checkout the branch # to actually create + push a commit later on in the workflow - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 + - uses: actions/setup-node@v3 with: - dotnet-version: '6.0.101' - - uses: actions/setup-node@v2-beta - with: - node-version: '14' + node-version: '16' + cache: 'yarn' - name: Restore tools run: dotnet tool restore - name: install VSCE globally diff --git a/global.json b/global.json index 8f73c70c..e83850d9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,5 @@ { "sdk": { - "version": "6.0.101", - "rollForward": "latestFeature" + "version": "6.0.401" } } diff --git a/package.json b/package.json index 1440bf1e..b6c68237 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,6 @@ "xpath": "^0.0.32" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }