Skip to content

Commit

Permalink
Merge pull request #4429 from MahApps/jk/targetframework-cake
Browse files Browse the repository at this point in the history
Housekeeping
  • Loading branch information
punker76 committed Oct 15, 2023
2 parents 221996b + 41f48d3 commit 231774e
Show file tree
Hide file tree
Showing 17 changed files with 334 additions and 278 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "1.3.0",
"version": "3.1.0",
"commands": [
"dotnet-cake"
]
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
3.1.x
5.x
6.x
- name: List dotnet sdks
run: dotnet --list-sdks
- name: Run the Cake script
uses: cake-build/cake-action@v1
with:
cake-version: 1.3.0
cake-bootstrap: true
cake-version: tool-manifest
verbosity: Normal
script-path: build.cake
target: ci
Expand Down
23 changes: 15 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@ skip_tags: true
image: Visual Studio 2022
test: off

# install:
install:
# Appveyor uses git checkout -qf FETCH_HEAD but all GitVersion versions above 5.6.3 doesn't support this detached header
# This is a workaround for this issue
- ps: |
if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -ne "")
{
git checkout -qf $($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT)
}
# - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
# - ps: ./dotnet-install.ps1 -Version 6.0.100 -InstallDir "C:\Program Files\dotnet"

Expand All @@ -31,7 +38,7 @@ pull_requests:
build_script:
- ps: dotnet --list-sdks
- ps: gitversion /version
- ps: .\build.ps1 --target=ci
- ps: .\build.ps1 --target=ci #--verbosity=diagnostic

after_build:
- ps: gci -Filter *.trx -Path .\TestResults\ | % { (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_.FullName)) }
Expand All @@ -46,9 +53,9 @@ skip_commits:
files:
- '**/*.md'

notifications:
- provider: Webhook
url: https://webhooks.gitter.im/e/3065442a8d5860a11008
on_build_success: true
on_build_failure: true
on_build_status_changed: false
# notifications:
# - provider: Webhook
# url: https://webhooks.gitter.im/e/3065442a8d5860a11008
# on_build_success: true
# on_build_failure: true
# on_build_status_changed: false
Loading

0 comments on commit 231774e

Please sign in to comment.