Skip to content

Commit 2dc5de9

Browse files
punker76punker76
authored
Merge pull request #230 from punker76/dev
Merge 1.1.0 dev to master
2 parents 513fb18 + 4fd4d50 commit 2dc5de9

Some content is hidden

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

59 files changed

+2336
-1562
lines changed

‎Build/GongSolutions.Wpf.DragDrop.ALPHA.nuspec‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
<package>
33
<metadata>
44
<id>gong-wpf-dragdrop</id>
5-
<version>1.0.0-ALPHA017</version>
65
<title>gong-wpf-dragdrop</title>
7-
<authors>Jan Karger (punker76), Steven Kirk, mitchell.jon</authors>
6+
<authors>Jan Karger (Steven Kirk, mitchell.jon)</authors>
87
<owners>punker76</owners>
98
<licenseUrl>https://github.com/punker76/gong-wpf-dragdrop#license</licenseUrl>
109
<projectUrl>https://github.com/punker76/gong-wpf-dragdrop</projectUrl>

‎Build/GongSolutions.Wpf.DragDrop.nuspec‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
<package>
33
<metadata>
44
<id>gong-wpf-dragdrop</id>
5-
<version>1.0.0</version>
65
<title>gong-wpf-dragdrop</title>
7-
<authors>Jan Karger (punker76), Steven Kirk, mitchell.jon</authors>
6+
<authors>Jan Karger (Steven Kirk, mitchell.jon)</authors>
87
<owners>punker76</owners>
98
<licenseUrl>https://github.com/punker76/gong-wpf-dragdrop#license</licenseUrl>
109
<projectUrl>https://github.com/punker76/gong-wpf-dragdrop</projectUrl>
@@ -23,17 +22,17 @@
2322
</dependencies>
2423
</metadata>
2524
<files>
26-
<file src="Debug_NET35\GongSolutions.Wpf.DragDrop.dll" target="lib\net35\GongSolutions.Wpf.DragDrop.dll"/>
27-
<file src="Debug_NET35\GongSolutions.Wpf.DragDrop.xml" target="lib\net35\GongSolutions.Wpf.DragDrop.xml"/>
28-
<file src="Debug_NET35\GongSolutions.Wpf.DragDrop.pdb" target="lib\net35\GongSolutions.Wpf.DragDrop.pdb"/>
29-
<file src="Debug_NET40\GongSolutions.Wpf.DragDrop.dll" target="lib\net40\GongSolutions.Wpf.DragDrop.dll"/>
30-
<file src="Debug_NET40\GongSolutions.Wpf.DragDrop.xml" target="lib\net40\GongSolutions.Wpf.DragDrop.xml"/>
31-
<file src="Debug_NET40\GongSolutions.Wpf.DragDrop.pdb" target="lib\net40\GongSolutions.Wpf.DragDrop.pdb"/>
32-
<file src="Debug_NET45\GongSolutions.Wpf.DragDrop.dll" target="lib\net45\GongSolutions.Wpf.DragDrop.dll"/>
33-
<file src="Debug_NET45\GongSolutions.Wpf.DragDrop.xml" target="lib\net45\GongSolutions.Wpf.DragDrop.xml"/>
34-
<file src="Debug_NET45\GongSolutions.Wpf.DragDrop.pdb" target="lib\net45\GongSolutions.Wpf.DragDrop.pdb"/>
35-
<file src="Debug_NET46\GongSolutions.Wpf.DragDrop.dll" target="lib\net46\GongSolutions.Wpf.DragDrop.dll"/>
36-
<file src="Debug_NET46\GongSolutions.Wpf.DragDrop.xml" target="lib\net46\GongSolutions.Wpf.DragDrop.xml"/>
37-
<file src="Debug_NET46\GongSolutions.Wpf.DragDrop.pdb" target="lib\net46\GongSolutions.Wpf.DragDrop.pdb"/>
25+
<file src="Release_NET35\GongSolutions.Wpf.DragDrop.dll" target="lib\net35\GongSolutions.Wpf.DragDrop.dll"/>
26+
<file src="Release_NET35\GongSolutions.Wpf.DragDrop.xml" target="lib\net35\GongSolutions.Wpf.DragDrop.xml"/>
27+
<file src="Release_NET35\GongSolutions.Wpf.DragDrop.pdb" target="lib\net35\GongSolutions.Wpf.DragDrop.pdb"/>
28+
<file src="Release_NET40\GongSolutions.Wpf.DragDrop.dll" target="lib\net40\GongSolutions.Wpf.DragDrop.dll"/>
29+
<file src="Release_NET40\GongSolutions.Wpf.DragDrop.xml" target="lib\net40\GongSolutions.Wpf.DragDrop.xml"/>
30+
<file src="Release_NET40\GongSolutions.Wpf.DragDrop.pdb" target="lib\net40\GongSolutions.Wpf.DragDrop.pdb"/>
31+
<file src="Release_NET45\GongSolutions.Wpf.DragDrop.dll" target="lib\net45\GongSolutions.Wpf.DragDrop.dll"/>
32+
<file src="Release_NET45\GongSolutions.Wpf.DragDrop.xml" target="lib\net45\GongSolutions.Wpf.DragDrop.xml"/>
33+
<file src="Release_NET45\GongSolutions.Wpf.DragDrop.pdb" target="lib\net45\GongSolutions.Wpf.DragDrop.pdb"/>
34+
<file src="Release_NET46\GongSolutions.Wpf.DragDrop.dll" target="lib\net46\GongSolutions.Wpf.DragDrop.dll"/>
35+
<file src="Release_NET46\GongSolutions.Wpf.DragDrop.xml" target="lib\net46\GongSolutions.Wpf.DragDrop.xml"/>
36+
<file src="Release_NET46\GongSolutions.Wpf.DragDrop.pdb" target="lib\net46\GongSolutions.Wpf.DragDrop.pdb"/>
3837
</files>
3938
</package>

‎Build/build.cake‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
// Arguments
44
var target = Argument("target", "Default");
5-
var version = "1.0.0.0";
6-
var infoVersion = "1.0.0";
7-
var alphaVersion = "1.0.0-ALPHA017";
5+
var version = "1.1.0.0";
6+
var infoVersion = "1.1.0";
7+
var alphaVersion = "1.1.0-alpha001";
8+
89
var configGitLink = new GitLinkSettings {
910
RepositoryUrl = "https://github.com/punker76/gong-wpf-dragdrop",
1011
Branch = "master",
1112
Configuration = "Release"
1213
};
14+
1315
var newAssemblyInfoSettings = new AssemblyInfoSettings {
1416
Product = string.Format("GongSolutions.WPF.DragDrop {0}", version),
1517
Version = version,
@@ -18,10 +20,18 @@ var newAssemblyInfoSettings = new AssemblyInfoSettings {
1820
Copyright = string.Format("Copyright © GongSolutions.WPF.DragDrop 2013 - {0}", DateTime.Now.Year)
1921
};
2022

23+
var nuGetPackSettings = new NuGetPackSettings {
24+
BasePath = "../src/bin/GongSolutions.WPF.DragDrop/",
25+
Id = "gong-wpf-dragdrop",
26+
Title = "gong-wpf-dragdrop",
27+
Copyright = string.Format("Copyright © GongSolutions.WPF.DragDrop 2013 - {0}", DateTime.Now.Year)
28+
};
29+
2130
// Tasks
2231
Task("GitLink")
2332
.Does(() =>
2433
{
34+
configGitLink.Branch = "master";
2535
configGitLink.Configuration = "Release";
2636
GitLink("../", configGitLink);
2737
DeleteFiles("../src/bin/**/*.srcsrv");
@@ -30,6 +40,7 @@ Task("GitLink")
3040
Task("GitLink_Debug")
3141
.Does(() =>
3242
{
43+
configGitLink.Branch = "dev";
3344
configGitLink.Configuration = "Debug";
3445
GitLink("../", configGitLink);
3546
DeleteFiles("../src/bin/**/*.srcsrv");
@@ -38,14 +49,14 @@ Task("GitLink_Debug")
3849
Task("UpdateAssemblyInfo")
3950
.Does(() =>
4051
{
41-
CreateAssemblyInfo("../src/GlobalAssemblyInfo.cs", newAssemblyInfoSettings);
52+
CreateAssemblyInfo("../src/GongSolutions.WPF.DragDrop.Shared/GlobalAssemblyInfo.cs", newAssemblyInfoSettings);
4253
});
4354

4455
Task("UpdateAssemblyInfo_Debug")
4556
.Does(() =>
4657
{
4758
newAssemblyInfoSettings.InformationalVersion = string.Format("GongSolutions.WPF.DragDrop {0}", alphaVersion);
48-
CreateAssemblyInfo("../src/GlobalAssemblyInfo.cs", newAssemblyInfoSettings);
59+
CreateAssemblyInfo("../src/GongSolutions.WPF.DragDrop.Shared/GlobalAssemblyInfo.cs", newAssemblyInfoSettings);
4960
});
5061

5162
Task("Build")
@@ -63,14 +74,13 @@ Task("Build_Debug")
6374
Task("NuGetPack")
6475
.Does(() =>
6576
{
66-
var nuGetPackSettings = new NuGetPackSettings {
67-
BasePath = "../src/bin/GongSolutions.WPF.DragDrop/",
68-
Id = "gong-wpf-dragdrop",
69-
Version = version,
70-
Title = "gong-wpf-dragdrop",
71-
Copyright = string.Format("Copyright © GongSolutions.WPF.DragDrop 2013 - {0}", DateTime.Now.Year)
72-
};
77+
nuGetPackSettings.Version = version;
7378
NuGetPack("./GongSolutions.Wpf.DragDrop.nuspec", nuGetPackSettings);
79+
});
80+
81+
Task("NuGetPack_Debug")
82+
.Does(() =>
83+
{
7484
nuGetPackSettings.Version = alphaVersion;
7585
NuGetPack("./GongSolutions.Wpf.DragDrop.ALPHA.nuspec", nuGetPackSettings);
7686
});
@@ -97,11 +107,21 @@ Task("CleanOutput")
97107
// Task Targets
98108
Task("Default").IsDependentOn("CleanOutput").IsDependentOn("UpdateAssemblyInfo").IsDependentOn("Build").IsDependentOn("GitLink").IsDependentOn("ZipShowcase");
99109
Task("Debug").IsDependentOn("CleanOutput").IsDependentOn("UpdateAssemblyInfo_Debug").IsDependentOn("Build_Debug").IsDependentOn("GitLink_Debug").IsDependentOn("ZipShowcase_Debug");
110+
100111
Task("Appveyor")
101112
.IsDependentOn("CleanOutput")
102-
.IsDependentOn("UpdateAssemblyInfo").IsDependentOn("Build").IsDependentOn("GitLink").IsDependentOn("ZipShowcase")
103-
.IsDependentOn("UpdateAssemblyInfo_Debug").IsDependentOn("Build_Debug").IsDependentOn("GitLink_Debug").IsDependentOn("ZipShowcase_Debug")
113+
.IsDependentOn("UpdateAssemblyInfo")
114+
.IsDependentOn("Build")
115+
.IsDependentOn("GitLink")
116+
.IsDependentOn("ZipShowcase")
104117
.IsDependentOn("NuGetPack");
118+
Task("AppveyorDev")
119+
.IsDependentOn("CleanOutput")
120+
.IsDependentOn("UpdateAssemblyInfo_Debug")
121+
.IsDependentOn("Build_Debug")
122+
.IsDependentOn("GitLink_Debug")
123+
.IsDependentOn("ZipShowcase_Debug")
124+
.IsDependentOn("NuGetPack_Debug");
105125

106126
// Execution
107127
RunTarget(target);

‎README.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
![logo](GongSolutions.Wpf.DragDrop.Full.png)
22

3-
## Introduction
3+
[![gitter](https://img.shields.io/badge/Gitter-Join%20Chat-green.svg?style=flat-square)](https://gitter.im/punker76/gong-wpf-dragdrop)
4+
[![twitter](https://img.shields.io/badge/twitter-%40punker76-55acee.svg?style=flat-square)](https://twitter.com/punker76)
5+
6+
[![masterstatus](https://img.shields.io/appveyor/ci/punker76/gong-wpf-dragdrop/master.svg?style=flat-square&&label=master)](https://ci.appveyor.com/project/punker76/gong-wpf-dragdrop/branch/master)
7+
[![devstatus](https://img.shields.io/appveyor/ci/punker76/gong-wpf-dragdrop/dev.svg?style=flat-square&&label=dev)](https://ci.appveyor.com/project/punker76/gong-wpf-dragdrop/branch/dev)
48

5-
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/punker76/gong-wpf-dragdrop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
9+
[![release](https://img.shields.io/github/release/punker76/gong-wpf-dragdrop.svg?style=flat-square)](https://github.com/punker76/gong-wpf-dragdrop/releases/latest)
10+
[![nuget](https://img.shields.io/nuget/v/gong-wpf-dragdrop.svg?style=flat-square&&label=nuget)](http://www.nuget.org/packages/gong-wpf-dragdrop/)
11+
[![issues](https://img.shields.io/github/issues/punker76/gong-wpf-dragdrop.svg?style=flat-square)](https://github.com/punker76/gong-wpf-dragdrop/issues)
612

7-
[![Build status](https://img.shields.io/appveyor/ci/punker76/gong-wpf-dragdrop/master.svg?style=flat-square)](https://ci.appveyor.com/project/punker76/gong-wpf-dragdrop/branch/master)
8-
[![Release](https://img.shields.io/github/release/punker76/gong-wpf-dragdrop.svg?style=flat-square)](https://github.com/punker76/gong-wpf-dragdrop/releases/latest)
9-
[![Downloads](https://img.shields.io/nuget/dt/gong-wpf-dragdrop.svg?style=flat-square)](http://www.nuget.org/packages/gong-wpf-dragdrop/)
10-
[![Issues](https://img.shields.io/github/issues/punker76/gong-wpf-dragdrop.svg?style=flat-square)](https://github.com/punker76/gong-wpf-dragdrop/issues)
11-
[![Twitter](https://img.shields.io/badge/twitter-%40punker76-55acee.svg?style=flat-square)](https://twitter.com/punker76)
13+
## Introduction
1214

1315
The **GongSolutions.WPF.DragDrop** library is an easy to use drag'n'drop framework for WPF.
1416

@@ -24,7 +26,7 @@ The **GongSolutions.WPF.DragDrop** library is an easy to use drag'n'drop framewo
2426

2527
## Want to say thanks?
2628

27-
+ This framework is free, can be used in commercial applications too, so please hit the :star: Star :star: button, cause this is the only payment (Cash donations are also being accepted ;-P ).
29+
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...).
2830

2931
## Installation
3032

@@ -33,7 +35,7 @@ Or: You take the latest version from NuGet: [https://www.nuget.org/packages/gong
3335

3436
## Strong naming
3537

36-
I will not do this anymore for this packages (started with v1.0). If you need this then you should use the [Strong Namer](https://github.com/dsplaisted/strongnamer) from @dsplaisted, it's an easy to add NuGet package which will help you.
38+
If you need strong named dlls then you should use the [Strong Namer](https://github.com/dsplaisted/strongnamer) from @dsplaisted. If this doesn't work then you can clone this repository and compile your own strongly named dlls.
3739

3840
## Namespace
3941

@@ -121,7 +123,7 @@ class ExampleItemViewModel
121123

122124
In this example, we're checking that the item being dragged and the item being dropped onto are both ExampleItemViewModels and that the target item allows items to be added to its Children collection. If the drag satisfies both of these conditions, then the function tells the framework to display a Copy mouse pointer, and to use a Highlight drop target adorner.
123125

124-
For more information, check out the full [DropHandlerExample](Examples).
126+
For more information, check out the [Showcase application](src/Showcase.WPF.DragDrop.NET45).
125127

126128
## Release History
127129

‎appveyor.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# http://www.appveyor.com/docs/appveyor-yml
2+
3+
# configuration for dev
4+
-
5+
branches:
6+
only:
7+
- dev
8+
9+
version: 1.1.0-alpha{build}
10+
pull_requests:
11+
do_not_increment_build_number: true
12+
skip_tags: true
13+
image: Visual Studio 2015
14+
configuration: Release
15+
16+
platform: Any CPU
17+
18+
build_script:
19+
- ps: .\Build\build.ps1 -Script .\Build\build.cake -Target AppveyorDev
20+
21+
artifacts:
22+
- path: Build\gong-wpf-dragdrop.*.nupkg
23+
- path: Build\Showcase.WPF.DragDrop.*.zip
24+
25+
# configuration for master
26+
-
27+
branches:
28+
only:
29+
- master
30+
31+
version: 1.1.0.0
32+
pull_requests:
33+
do_not_increment_build_number: true
34+
skip_tags: true
35+
image: Visual Studio 2015
36+
configuration: Release
37+
38+
platform: Any CPU
39+
40+
build_script:
41+
- ps: .\Build\build.ps1 -Script .\Build\build.cake -Target Appveyor
42+
43+
artifacts:
44+
- path: Build\gong-wpf-dragdrop.*.nupkg
45+
- path: Build\Showcase.WPF.DragDrop.*.zip

‎src/GongSolutions.WPF.DragDrop/DefaultDragHandler.cs‎ renamed to ‎src/GongSolutions.WPF.DragDrop.Shared/DefaultDragHandler.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)