Skip to content

Commit de75a24

Browse files
punker76punker76
committed
Merge branch 'develop'
2 parents bab45aa + e6daaf7 commit de75a24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1787
-427
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": "4.0.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: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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+
6.x
24+
8.x
25+
9.x
26+
- name: List dotnet sdks
27+
run: dotnet --info
28+
- name: Run the Cake script
29+
uses: cake-build/cake-action@v1
30+
with:
31+
cake-version: tool-manifest
32+
verbosity: Normal
33+
script-path: build.cake
34+
target: ci
35+
env:
36+
azure-key-vault-url: ${{ secrets.AZURE_KEY_VAULT_URL }}
37+
azure-key-vault-client-id: ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }}
38+
azure-key-vault-tenant-id: ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }}
39+
azure-key-vault-client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
40+
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+
}

‎GitVersion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
assembly-versioning-scheme: Major
22
assembly-file-versioning-scheme: MajorMinorPatchTag
3-
next-version: 3.2.0
3+
next-version: 4.0.0
44
mode: ContinuousDeployment
55
branches:
66
master:

‎NuGet.Config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,9 @@
1515
<clear />
1616
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
1717
</activePackageSource>
18+
<packageSourceMapping>
19+
<packageSource key="nuget.org">
20+
<package pattern="*" />
21+
</packageSource>
22+
</packageSourceMapping>
1823
</configuration>

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
1+
<!-- [![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine) -->
22

33
<div align="center">
44
<br />
@@ -10,7 +10,7 @@
1010
An easy to use drag'n'drop framework for WPF.
1111
</p>
1212
<p>
13-
Supporting .NET Framework 4.6.2+, .NET Core 3.1, .NET 5 and .NET 6 (on Windows)
13+
Supporting .NET Framework 4.6.2 and later, .NET 6 and later (on Windows)
1414
</p>
1515

1616
<a href="https://gitter.im/punker76/gong-wpf-dragdrop">
@@ -96,3 +96,5 @@ Does your company use `GongSolutions.WPF.DragDrop`? Ask your manager or marketi
9696
![screenshot04](./screenshots/2016-09-03_00h53_21.png)
9797

9898
![gif02](./screenshots/DragDropSample01.gif)
99+
100+
![gif03](./screenshots/DragHint-Demo.gif)

‎appveyor.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ branches:
66
- main
77

88
environment:
9+
# bad, but without this, gitversion doesn't work anymore
10+
IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
911
azure-key-vault-url:
1012
secure: 1mKS/HfCVq+iYNRVSrrN8NEowOkKt3knrpMzw+SOy3g=
1113
azure-key-vault-client-id:
@@ -17,21 +19,20 @@ environment:
1719
azure-key-vault-certificate:
1820
secure: BSPdW2TgnQtoQXXbeDECug==
1921

20-
skip_tags: true
2122
image: Visual Studio 2022
22-
test: off
23+
test: false
2324

2425
# install:
2526
# - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
26-
# - ps: ./dotnet-install.ps1 -Version 6.0.100 -InstallDir "C:\Program Files\dotnet"
27+
# - ps: ./dotnet-install.ps1 -Version 8.0.403 -InstallDir "C:\Program Files\dotnet"
2728

2829
pull_requests:
2930
do_not_increment_build_number: false
3031

3132
build_script:
32-
- ps: dotnet --list-sdks
33+
- ps: dotnet --info
3334
- ps: gitversion /version
34-
- ps: .\build.ps1 --target=ci
35+
- ps: .\build.ps1 --target=ci --verbosity=diagnostic
3536

3637
artifacts:
3738
- path: \Publish\*.*

0 commit comments

Comments
 (0)