Merge branch 'develop' into main

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "1.3.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}

.github/workflows/build.yml

@@ -2,37 +2,38 @@ name: Build
 
 on:
   push:
-    branches: [ develop, main ]
+    branches:
+      - main
+      - develop
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
 
 jobs:
-  build:
-
+  windows-latest:
+    name: windows-latest
     runs-on: windows-latest
-
     steps:
     - name: Checkout
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
     - name: Install gpr tool
       # Helper tool from Jamie Cansdale (GitHub Support) Thx!!!
       run: dotnet tool install --tool-path tools gpr
     - name: Build with Cake Action
       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 }}
-      uses: ecampidoglio/cake-action@v1
+      uses: cake-build/cake-action@v1
       with:
-        cake-version: 0.38.5
+        cake-version: 1.3.0
         cake-bootstrap: true
+        verbosity: Normal
+        script-path: build.cake
         target: appveyor
     - name: Publish NuGet
       if: success()

GitVersion.yml

@@ -1,7 +1,7 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
 mode: ContinuousDeployment
-next-version: 2.0.0
+next-version: 2.1.0
 branches:
   master:
     regex: ^main

README.md

@@ -1,4 +1,7 @@
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
+
 <div align="center">
+  <br />
   <a href="https://github.com/punker76/MahApps.Metro.SimpleChildWindow">
     <img alt="MahApps.Metro.SimpleChildWindow" width="200" heigth="200" src="./MahApps.Metro.SimpleChildWindow.png">
   </a>

appveyor.yml

@@ -10,23 +10,28 @@ environment:
     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:
-  #- cinst dotnetcore-sdk --version=3.1.100
+# 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: .\build.ps1 -target appveyor
+  - ps: dotnet --list-sdks
+  - ps: gitversion /version
+  - ps: .\build.ps1 --target=appveyor
 
 artifacts:
   - path: \Publish\*.*
@@ -36,4 +41,4 @@ nuget:
 
 skip_commits:
   files:
-    - '**/*.md'
+    - '**/*.md'

build.cake

@@ -2,14 +2,13 @@
 // TOOLS / ADDINS
 ///////////////////////////////////////////////////////////////////////////////
 
-#module nuget:?package=Cake.DotNetTool.Module
-#tool "dotnet:?package=NuGetKeyVaultSignTool&version=1.2.28"
-#tool "dotnet:?package=AzureSignTool&version=2.0.17"
+#tool dotnet:?package=NuGetKeyVaultSignTool&version=1.2.28
+#tool dotnet:?package=AzureSignTool&version=3.0.0
+#tool dotnet:?package=GitReleaseManager.Tool&version=0.12.1
+#tool dotnet:?package=GitVersion.Tool&version=5.6.3
 
-#tool GitVersion.CommandLine&version=5.5.1
-#tool gitreleasemanager
-#tool vswhere
-#addin Cake.Figlet
+#tool vswhere&version=2.8.4
+#addin nuget:?package=Cake.Figlet&version=2.0.1
 
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -313,19 +312,13 @@ Task("CreateRelease")
     .WithCriteria(() => !isPullRequest)
     .Does(() =>
 {
-    var username = EnvironmentVariable("GITHUB_USERNAME");
-    if (string.IsNullOrEmpty(username))
-    {
-        throw new Exception("The GITHUB_USERNAME environment variable is not defined.");
-    }
-
     var token = EnvironmentVariable("GITHUB_TOKEN");
     if (string.IsNullOrEmpty(token))
     {
         throw new Exception("The GITHUB_TOKEN environment variable is not defined.");
     }
 
-    GitReleaseManagerCreate(username, token, "punker76", repoName, new GitReleaseManagerCreateSettings {
+    GitReleaseManagerCreate(token, "punker76", repoName, new GitReleaseManagerCreateSettings {
         Milestone         = gitVersion.MajorMinorPatch,
         Name              = gitVersion.AssemblySemFileVer,
         Prerelease        = isDevelopBranch,
@@ -355,4 +348,4 @@ Task("appveyor")
 // EXECUTION
 ///////////////////////////////////////////////////////////////////////////////
 
-RunTarget(target);
+RunTarget(target);