Skip to content

Commit

Permalink
Merge pull request #476 from punker76/jk/targetframework-cake
Browse files Browse the repository at this point in the history
Remove .NET Core 3.1 support
  • Loading branch information
punker76 authored Oct 28, 2023
2 parents 1ecaf90 + cd0f788 commit 692ff80
Show file tree
Hide file tree
Showing 12 changed files with 355 additions and 209 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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ end_of_line = CRLF
indent_style = space
indent_size = 4

[*.{md,yml,json}]
[*.{md,yml,json,cake}]
indent_style = space
indent_size = 2

Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

name: ci

on:
push:
branches:
- main
- develop
pull_request:
branches:
- develop

jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
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: tool-manifest
verbosity: Normal
script-path: build.cake
target: ci
env:
azure-key-vault-url: ${{ secrets.AZURE_KEY_VAULT_URL }}
azure-key-vault-client-id: ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }}
azure-key-vault-tenant-id: ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }}
azure-key-vault-client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
azure-key-vault-certificate: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE }}
26 changes: 26 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": "0.2.0",
"configurations": [
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/Showcase/bin/Debug/net6.0-windows/Showcase.WPF.DragDrop.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Showcase",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
}
]
}
41 changes: 41 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/GongSolutions.WPF.DragDrop.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/GongSolutions.WPF.DragDrop.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/src/GongSolutions.WPF.DragDrop.sln"
],
"problemMatcher": "$msCompile"
}
]
}
11 changes: 9 additions & 2 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

artifacts:
- path: \Publish\*.*
Expand Down
Loading

0 comments on commit 692ff80

Please sign in to comment.