Skip to content

Commit f0c6100

Browse files
punker76punker76
committed
Merge branch 'develop' into main
2 parents 8b8d5c5 + a4dc9ab commit f0c6100

Some content is hidden

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

41 files changed

+1771
-618
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ paket-files/
258258

259259
# cake
260260
[tT]ools/
261+
![tT]ools/packages.config
261262

262263
# XamlStyler
263264
!XamlStyler/

‎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: 2.3.0
3+
next-version: 2.4.0
44
mode: ContinuousDeployment
55
branches:
66
master:

‎NOTICE.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
This license applies to modified Microsoft WPF code used in GongSolutions.WPF.DragDrop/Utilities/VisualTreeDescendantBoundsHelper.cs and originally sourced from https://github.com/dotnet/wpf/blob/83b9af142acd341d4bf470450e8b5c3ec3723d76/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Visual.cs
2+
3+
The MIT License (MIT)
4+
5+
Copyright (c) .NET Foundation and Contributors
6+
7+
All rights reserved.
8+
9+
Permission is hereby granted, free of charge, to any person obtaining a copy
10+
of this software and associated documentation files (the "Software"), to deal
11+
in the Software without restriction, including without limitation the rights
12+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
copies of the Software, and to permit persons to whom the Software is
14+
furnished to do so, subject to the following conditions:
15+
16+
The above copyright notice and this permission notice shall be included in all
17+
copies or substantial portions of the Software.
18+
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
25+
SOFTWARE.

‎README.md

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
An easy to use drag'n'drop framework for WPF.
99
</p>
1010
<p>
11-
Supporting .NET Framework 4.5+ and .NET Core 3 (3.0 and 3.1)
11+
Supporting .NET Framework 4.5+, .NET Core 3 (3.0 and 3.1), and .NET 5 (on Windows)
1212
</p>
1313

1414
<a href="https://gitter.im/punker76/gong-wpf-dragdrop">
@@ -17,16 +17,20 @@
1717
<a href="https://twitter.com/punker76">
1818
<img src="https://img.shields.io/badge/twitter-%40punker76-55acee.svg?style=flat-square">
1919
</a>
20+
<br />
2021
<a href="https://ci.appveyor.com/project/punker76/gong-wpf-dragdrop/branch/main">
2122
<img alt="mainstatus" src="https://img.shields.io/appveyor/ci/punker76/gong-wpf-dragdrop/main.svg?style=flat-square&&label=main">
2223
</a>
2324
<a href="https://ci.appveyor.com/project/punker76/gong-wpf-dragdrop/branch/develop">
2425
<img alt="devstatus" src="https://img.shields.io/appveyor/ci/punker76/gong-wpf-dragdrop/develop.svg?style=flat-square&&label=develop">
2526
</a>
27+
<a href="https://github.com/punker76/gong-wpf-dragdrop/issues">
28+
<img src="https://img.shields.io/github/issues/punker76/gong-wpf-dragdrop.svg?style=flat-square">
29+
</a>
30+
<br />
2631
<a href="https://github.com/punker76/gong-wpf-dragdrop/releases/latest">
2732
<img src="https://img.shields.io/github/release/punker76/gong-wpf-dragdrop.svg?style=flat-square">
2833
</a>
29-
<br />
3034
<a href="https://www.nuget.org/packages/gong-wpf-dragdrop">
3135
<img src="https://img.shields.io/nuget/dt/gong-wpf-dragdrop.svg?style=flat-square">
3236
</a>
@@ -36,22 +40,20 @@
3640
<a href="https://www.nuget.org/packages/gong-wpf-dragdrop">
3741
<img src="https://img.shields.io/nuget/vpre/gong-wpf-dragdrop.svg?style=flat-square&label=nuget-pre">
3842
</a>
39-
<a href="https://github.com/punker76/gong-wpf-dragdrop/issues">
40-
<img src="https://img.shields.io/github/issues/punker76/gong-wpf-dragdrop.svg?style=flat-square">
41-
</a>
4243
<br />
4344
<br />
4445

4546
</div>
4647

4748
## Features
4849

49-
+ Works with MVVM : the logic for the drag and drop can be placed in a ViewModel. No code needs to be placed in codebehind, instead attached properties are used to bind to a drag handler/drop handler in a ViewModel.
50+
+ Works with MVVM : the logic for the drag and drop can be placed in a ViewModel. No code needs to be placed in code-behind, instead attached properties are used to bind to a drag handler/drop handler in a ViewModel.
5051
+ Works with multiple selections.
51-
+ Can drag data within the same control to re-order, or between controls.
52+
+ Can drag data within the same control to re-order, or between (different) controls.
5253
+ Works with `ListBox`, `ListView`, `TreeView`, `DataGrid` and any other `ItemsControl`.
53-
+ Can insert, move or copy an item into a collection of the same control or into another.
54+
+ Can insert, move or copy an item into a collection of the same/another control (same item type).
5455
+ Can display Adorners to give the user visual feedback of the operation in progress.
56+
+ Can display a preview of the dragged item (the preview is always visible).
5557
+ Has sensible defaults so that you have to write less code for common operations.
5658

5759
## Let's get started
@@ -64,12 +66,26 @@
6466
- [Wiki](../../wiki)
6567
- [License](./LICENSE)
6668

69+
## License
70+
71+
Copyright © Jan Karger, Steven Kirk and Contributors. All rights reserved.
72+
73+
`GongSolutions.WPF.DragDrop` is provided as-is under the BSD 3-Clause License. For more information see [LICENSE](./LICENSE).
74+
6775
## Want to say thanks?
6876

69-
This framework is free and can be used for free, open source and commercial applications. It's tested and contributed by many people... So mainly hit the :star: button, that's all... thx :squirrel: (:dollar:, :euro:, :beer: or some other gifts are also being accepted...).
77+
This framework is free and can be used for free, open source and commercial applications. It's tested, used and contributed by many awesome people. So hit the magic :star: button, we appreciate it!!! :pray:
78+
79+
[Become a sponsor](https://github.com/sponsors/punker76) and show your support to this open source project.
80+
81+
If you use `GongSolutions.WPF.DragDrop` as serious task, and you'd like to honor my work on it, please donate, I'll appreciate it.
82+
83+
Does your company use `GongSolutions.WPF.DragDrop`? Ask your manager or marketing team if your company would be interested in supporting this project. Your company's logo can be shown [on GitHub](https://github.com/punker76/gong-wpf-dragdrop#readme) - who doesn't want a little extra exposure?
7084

7185
## In action
7286

87+
![gif01](./screenshots/gong_240.gif)
88+
7389
![screenshot01](./screenshots/2016-09-03_00h51_35.png)
7490

7591
![screenshot02](./screenshots/2016-09-03_00h52_20.png)
@@ -78,4 +94,4 @@ This framework is free and can be used for free, open source and commercial appl
7894

7995
![screenshot04](./screenshots/2016-09-03_00h53_21.png)
8096

81-
![gif01](./screenshots/DragDropSample01.gif)
97+
![gif02](./screenshots/DragDropSample01.gif)

‎appveyor.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ branches:
44
only:
55
- develop
66
- main
7+
- /\d*\.\d*\.\d*/
78

89
environment:
910
azure-key-vault-url:
@@ -20,12 +21,14 @@ image: Visual Studio 2019
2021
test: off
2122

2223
install:
23-
#- cinst dotnetcore-sdk --version=3.1.100
24+
- ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
25+
- ps: ./dotnet-install.ps1 -Version 5.0.301 -InstallDir "C:\Program Files\dotnet"
2426

2527
pull_requests:
2628
do_not_increment_build_number: false
2729

2830
build_script:
31+
- ps: dotnet --list-sdks
2932
- ps: .\build.ps1 -target appveyor
3033

3134
artifacts:

‎build.cake

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// TOOLS / ADDINS
33
///////////////////////////////////////////////////////////////////////////////
44

5-
#module nuget:?package=Cake.DotNetTool.Module
6-
#tool "dotnet:?package=NuGetKeyVaultSignTool&version=1.2.18"
7-
#tool "dotnet:?package=AzureSignTool&version=2.0.17"
5+
#module nuget:?package=Cake.DotNetTool.Module&version=0.5.0
6+
#tool dotnet:?package=NuGetKeyVaultSignTool&version=1.2.28
7+
#tool dotnet:?package=AzureSignTool&version=2.0.17
8+
#tool dotnet:?package=GitReleaseManager.Tool&version=0.11.0
9+
#tool dotnet:?package=GitVersion.Tool&version=5.6.6
810

9-
#tool GitVersion.CommandLine&version=5.3.7
10-
#tool gitreleasemanager
11-
#tool vswhere
12-
#addin Cake.Figlet
11+
#tool vswhere&version=2.8.4
12+
#addin nuget:?package=Cake.Figlet&version=1.4.0
1313

1414
///////////////////////////////////////////////////////////////////////////////
1515
// ARGUMENTS
@@ -372,8 +372,9 @@ Task("CreateRelease")
372372
Task("Default")
373373
.IsDependentOn("Clean")
374374
.IsDependentOn("Restore")
375-
.IsDependentOn("Build");
376-
// .IsDependentOn("dotnetBuild") // doesn't work with Fody
375+
//.IsDependentOn("Build")
376+
.IsDependentOn("dotnetBuild") // doesn't work with Fody
377+
;
377378

378379
Task("appveyor")
379380
.IsDependentOn("Default")

‎screenshots/gong_240.gif

338 KB
Loading

‎src/Directory.build.props

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<IsBuildingWpfTempProj Condition="$(MSBuildProjectName.Contains('_wpftmp')) != 'true'">false</IsBuildingWpfTempProj>
4+
<IsBuildingWpfTempProj Condition="$(MSBuildProjectName.Contains('_wpftmp')) == 'true'">true</IsBuildingWpfTempProj>
5+
</PropertyGroup>
6+
27
<!-- Project properties -->
38
<PropertyGroup>
4-
<TargetFrameworks>net45;net46;net47;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
9+
<TargetFrameworks>net45;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5-windows</TargetFrameworks>
510
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
611
<GenerateDocumentationFile>false</GenerateDocumentationFile>
712
<AutoGenerateBindingRedirects Condition=" $(TargetFramework.StartsWith('net4')) ">true</AutoGenerateBindingRedirects>
8-
<LangVersion>8.0</LangVersion>
13+
<LangVersion>latest</LangVersion>
914
<DebugSymbols>true</DebugSymbols>
1015
<DebugType>full</DebugType>
1116
<NoWarn>$(NoWarn);CS1591</NoWarn>
1217
<NoError>$(NoError);CS1591</NoError>
1318
<UseWPF>true</UseWPF>
1419
</PropertyGroup>
1520

21+
<PropertyGroup>
22+
<DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_OR_GREATER</DefineConstants>
23+
</PropertyGroup>
24+
1625
<!-- SourceLink -->
1726
<PropertyGroup>
1827
<!-- Optional: Declare that the Repository URL can be published to NuSpec -->
@@ -28,8 +37,8 @@
2837

2938
<!-- Add the references for all projects and targets -->
3039
<ItemGroup>
31-
<PackageReference Include="JetBrains.Annotations" Version="2020.*" PrivateAssets="All" />
32-
<PackageReference Include="WpfAnalyzers" Version="2.4.*" PrivateAssets="All" />
40+
<PackageReference Include="JetBrains.Annotations" Version="2021.*" PrivateAssets="All" IncludeAssets="build;compile" />
41+
<PackageReference Include="WpfAnalyzers" Version="3.5.*" PrivateAssets="All" />
3342
</ItemGroup>
3443

3544
<ItemGroup>

0 commit comments

Comments
 (0)