Merge branch 'develop'

punker76 · Dec 5, 2024 · de75a24 · de75a24
2 parents bab45aa + e6daaf7
commit de75a24
Show file tree

Hide file tree

Showing 61 changed files with 1,787 additions and 427 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "1.3.0",
+      "version": "4.0.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.editorconfig b/.editorconfig
@@ -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
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,40 @@
+
+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: | 
+            6.x
+            8.x
+            9.x
+      - name: List dotnet sdks
+        run: dotnet --info
+      - 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 }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -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"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -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"
+        }
+    ]
+}
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,6 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
-next-version: 3.2.0
+next-version: 4.0.0
 mode: ContinuousDeployment
 branches:
   master:

diff --git a/NuGet.Config b/NuGet.Config
@@ -15,4 +15,9 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </activePackageSource>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
+<!-- [![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine) -->
 
 <div align="center">
   <br />
@@ -10,7 +10,7 @@
     An easy to use drag'n'drop framework for WPF.
   </p>
   <p>
-    Supporting .NET Framework 4.6.2+, .NET Core 3.1, .NET 5 and .NET 6 (on Windows)
+    Supporting .NET Framework 4.6.2 and later, .NET 6 and later (on Windows)
   </p>
 
   <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
 ![screenshot04](./screenshots/2016-09-03_00h53_21.png)
 
 ![gif02](./screenshots/DragDropSample01.gif)
+
+![gif03](./screenshots/DragHint-Demo.gif)
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,6 +6,8 @@ branches:
     - main
 
 environment:
+  # bad, but without this, gitversion doesn't work anymore
+  IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
   azure-key-vault-url:
     secure: 1mKS/HfCVq+iYNRVSrrN8NEowOkKt3knrpMzw+SOy3g=
   azure-key-vault-client-id:
@@ -17,21 +19,20 @@ environment:
   azure-key-vault-certificate:
     secure: BSPdW2TgnQtoQXXbeDECug==
 
-skip_tags: true
 image: Visual Studio 2022
-test: off
+test: false
 
 # install:
   # - 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"
+  # - ps: ./dotnet-install.ps1 -Version 8.0.403 -InstallDir "C:\Program Files\dotnet"
 
 pull_requests:
   do_not_increment_build_number: false
 
 build_script:
-  - ps: dotnet --list-sdks
+  - ps: dotnet --info
   - ps: gitversion /version
-  - ps: .\build.ps1 --target=ci
+  - ps: .\build.ps1 --target=ci --verbosity=diagnostic
 
 artifacts:
   - path: \Publish\*.*