Skip to content

Commit 692ff80

Browse files
authored
Merge pull request #476 from punker76/jk/targetframework-cake
Remove .NET Core 3.1 support
2 parents 1ecaf90 + cd0f788 commit 692ff80

File tree

12 files changed

+355
-209
lines changed

12 files changed

+355
-209
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "1.3.0",
6+
"version": "3.1.0",
77
"commands": [
88
"dotnet-cake"
99
]

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ end_of_line = CRLF
99
indent_style = space
1010
indent_size = 4
1111

12-
[*.{md,yml,json}]
12+
[*.{md,yml,json,cake}]
1313
indent_style = space
1414
indent_size = 2
1515

.github/workflows/ci.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
name: ci
3+
4+
on:
5+
push:
6+
branches:
7+
- main
8+
- develop
9+
pull_request:
10+
branches:
11+
- develop
12+
13+
jobs:
14+
windows-latest:
15+
name: windows-latest
16+
runs-on: windows-latest
17+
steps:
18+
- uses: actions/checkout@v1
19+
- name: Setup .NET
20+
uses: actions/setup-dotnet@v1
21+
with:
22+
dotnet-version: |
23+
5.x
24+
6.x
25+
- name: List dotnet sdks
26+
run: dotnet --list-sdks
27+
- name: Run the Cake script
28+
uses: cake-build/cake-action@v1
29+
with:
30+
cake-version: tool-manifest
31+
verbosity: Normal
32+
script-path: build.cake
33+
target: ci
34+
env:
35+
azure-key-vault-url: ${{ secrets.AZURE_KEY_VAULT_URL }}
36+
azure-key-vault-client-id: ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }}
37+
azure-key-vault-tenant-id: ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }}
38+
azure-key-vault-client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
39+
azure-key-vault-certificate: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE }}

.vscode/launch.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
// Use IntelliSense to find out which attributes exist for C# debugging
6+
// Use hover for the description of the existing attributes
7+
// For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/src/Showcase/bin/Debug/net6.0-windows/Showcase.WPF.DragDrop.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/src/Showcase",
16+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17+
"console": "internalConsole",
18+
"stopAtEntry": false
19+
},
20+
{
21+
"name": ".NET Core Attach",
22+
"type": "coreclr",
23+
"request": "attach"
24+
}
25+
]
26+
}

.vscode/tasks.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/src/GongSolutions.WPF.DragDrop.sln",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/src/GongSolutions.WPF.DragDrop.sln",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"--project",
36+
"${workspaceFolder}/src/GongSolutions.WPF.DragDrop.sln"
37+
],
38+
"problemMatcher": "$msCompile"
39+
}
40+
]
41+
}

appveyor.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@ skip_tags: true
2121
image: Visual Studio 2022
2222
test: off
2323

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

@@ -31,7 +38,7 @@ pull_requests:
3138
build_script:
3239
- ps: dotnet --list-sdks
3340
- ps: gitversion /version
34-
- ps: .\build.ps1 --target=ci
41+
- ps: .\build.ps1 --target=ci #--verbosity=diagnostic
3542

3643
artifacts:
3744
- path: \Publish\*.*

0 commit comments

Comments
 (0)