Skip to content

Commit 2e80971

Browse files
authored
Merge pull request #1680 from Particular/ci-fixes
CI fixes
2 parents eef9d51 + 359eff6 commit 2e80971

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup .NET SDK
2424
uses: actions/setup-dotnet@v5.4.0
2525
with:
26-
dotnet-version: 8.0.x
26+
global-json-file: global.json
2727
- name: Add msbuild to PATH
2828
uses: microsoft/setup-msbuild@v1.3
2929
- name: Build

.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ defaults:
1616
shell: pwsh
1717
jobs:
1818
release:
19-
if: ${{ github.actor != 'dependabot[bot]' }}
2019
runs-on: windows-latest
2120
steps:
2221
- name: Check for secrets
@@ -30,7 +29,7 @@ jobs:
3029
- name: Setup .NET SDK
3130
uses: actions/setup-dotnet@v5.4.0
3231
with:
33-
dotnet-version: 8.0.200 # Locked until VS/MSBuild is compatible with 8.0.300
32+
global-json-file: global.json
3433
- name: Add msbuild to PATH
3534
uses: microsoft/setup-msbuild@v1.3
3635
- name: Build
@@ -48,7 +47,7 @@ jobs:
4847
- name: Build Windows installer
4948
env:
5049
AZURE_KEY_VAULT_CLIENT_SECRET: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
51-
run: dotnet build src/Setup --configuration Release
50+
run: msbuild src/Setup -p:Configuration=Release -restore -m
5251
- name: Publish artifacts
5352
uses: actions/upload-artifact@v7.0.1
5453
with:

global.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"sdk": {
3-
"version": "8.0.400",
3+
"version": "10.0.100",
4+
"allowPrerelease": false,
45
"rollForward": "latestFeature"
56
}
67
}

0 commit comments

Comments
 (0)