Merge branch 'develop' into main

punker76 · Dec 5, 2021 · 846ae11 · 846ae11
2 parents 004afea + 641cee0
commit 846ae11
Show file tree

Hide file tree

Showing 52 changed files with 2,179 additions and 1,650 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "1.3.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -258,7 +258,6 @@ paket-files/
 
 # cake
 [tT]ools/
-![tT]ools/packages.config
 
 # XamlStyler
 !XamlStyler/
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,6 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
-next-version: 2.4.0
+next-version: 3.0.0
 mode: ContinuousDeployment
 branches:
   master:

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
     An easy to use drag'n'drop framework for WPF.
   </p>
   <p>
-    Supporting .NET Framework 4.5+, .NET Core 3 (3.0 and 3.1), and .NET 5 (on Windows)
+    Supporting .NET Framework 4.5.2+, .NET Core 3.1, .NET 5 and .NET 6 (on Windows)
   </p>
 
   <a href="https://gitter.im/punker76/gong-wpf-dragdrop">

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,32 +4,34 @@ branches:
   only:
     - develop
     - main
-    - /\d*\.\d*\.\d*/
 
 environment:
   azure-key-vault-url:
     secure: 1mKS/HfCVq+iYNRVSrrN8NEowOkKt3knrpMzw+SOy3g=
   azure-key-vault-client-id:
     secure: JfSqzmsJdXB6uIxttCRoQw1NygwxqXHDj9uIqQnWOb9VCnQYlRPlAnxgW0yTSX4b
+  azure-key-vault-tenant-id:
+    secure: FxjkcqtpulfpDpfSAu4onaLVP/H1S1ORRCQCqsZkDC6YhCSmFoMxYNsWv5uGe3ah
   azure-key-vault-client-secret:
     secure: CUpRJxMLeUZwNPMcqI0wECaWfy5AMnWn1UZhBd9WnQ3Z16lJP1Vzrkf24mccbhUD
   azure-key-vault-certificate:
     secure: BSPdW2TgnQtoQXXbeDECug==
 
 skip_tags: true
-image: Visual Studio 2019
+image: Visual Studio 2022
 test: off
 
-install:
-  - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
-  - ps: ./dotnet-install.ps1 -Version 5.0.301 -InstallDir "C:\Program Files\dotnet"
+# 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"
 
 pull_requests:
   do_not_increment_build_number: false
 
 build_script:
   - ps: dotnet --list-sdks
-  - ps: .\build.ps1 -target appveyor
+  - ps: gitversion /version
+  - ps: .\build.ps1 --target=ci
 
 artifacts:
   - path: \Publish\*.*
@@ -39,4 +41,4 @@ nuget:
 
 skip_commits:
   files:
-    - '**/*.md'
+    - '**/*.md'