Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	src/Config.Tests/Config.Tests.csproj
#	src/Config.Tool/Config.Tool.csproj
#	src/Config/Config.csproj
#	src/Configuration/Configuration.csproj
#	src/Directory.Build.props
#	src/Directory.Build.targets

.github/dependabot.yml

@@ -7,3 +7,34 @@ updates:
   directory: /
   schedule:
     interval: daily
+  groups:
+    Azure:
+      patterns:
+        - "Azure*"
+        - "Microsoft.Azure*"
+    Identity:
+      patterns:
+        - "System.IdentityModel*"
+        - "Microsoft.IdentityModel*"
+    System:
+      patterns:
+        - "System*"
+      exclude-patterns:
+        - "System.IdentityModel*"
+    Extensions:
+      patterns:
+        - "Microsoft.Extensions*"
+    Web:
+      patterns:
+        - "Microsoft.AspNetCore*"
+    Tests:
+      patterns:
+        - "Microsoft.NET.Test*"
+        - "xunit*"
+        - "coverlet*"
+    ThisAssembly:
+      patterns:
+        - "ThisAssembly*"
+    ProtoBuf:
+      patterns:
+        - "protobuf-*"

.github/workflows/build.yml

@@ -17,9 +17,12 @@ on:
 
 env:
   DOTNET_NOLOGO: true
+  PackOnBuild: true
+  GeneratePackageOnBuild: true
   VersionPrefix: 42.42.${{ github.run_number }}
   VersionLabel: ${{ github.ref }}
-
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
 defaults:
   run:
     shell: bash
@@ -31,7 +34,7 @@ jobs:
       matrix: ${{ steps.lookup.outputs.matrix }}
     steps:
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: 🔎 lookup
         id: lookup
@@ -50,13 +53,13 @@ jobs:
         os: ${{ fromJSON(needs.os-matrix.outputs.matrix) }}
     steps:
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
           fetch-depth: 0
 
       - name: 🙏 build
-        run: dotnet build -m:1
+        run: dotnet build -m:1 -bl:build.binlog
 
       - name: ⚙ GNU grep
         if: matrix.os == 'macOS-latest'
@@ -67,8 +70,12 @@ jobs:
       - name: 🧪 test
         uses: ./.github/workflows/test
 
-      - name: 📦 pack
-        run: dotnet pack -m:1
+      - name: 🐛 logs
+        uses: actions/upload-artifact@v3
+        if: runner.debug && always()
+        with:
+          name: logs
+          path: '*.binlog'
 
       # Only push CI package to sleet feed if building on ubuntu (fastest)
       - name: 🚀 sleet
@@ -83,7 +90,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
           fetch-depth: 0

.github/workflows/changelog.yml

@@ -17,7 +17,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: main

.github/workflows/dotnet-file.yml

@@ -24,14 +24,15 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: main
           token: ${{ env.GH_TOKEN }}
 
       - name: ⌛ rate
         shell: pwsh
+        if: github.event_name != 'workflow_dispatch'
         run: |
           # add random sleep since we run on fixed schedule
           sleep (get-random -max 60)
@@ -70,7 +71,7 @@ jobs:
           validate: false
 
       - name: ✍ pull request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           base: main
           branch: dotnet-file-sync

.github/workflows/includes.yml

@@ -21,16 +21,17 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           token: ${{ env.GH_TOKEN }}
 
       - name: +Mᐁ includes
         uses: devlooped/actions-includes@v1
 
       - name: ✍ pull request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
+          add-paths: '**/*.md'
           base: main
           branch: markdown-includes
           delete-branch: true

.github/workflows/publish.yml

@@ -10,25 +10,33 @@ on:
 env:
   DOTNET_NOLOGO: true
   Configuration: Release
-
+  PackOnBuild: true
+  GeneratePackageOnBuild: true
+  VersionLabel: ${{ github.ref }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
           fetch-depth: 0
 
       - name: 🙏 build
-        run: dotnet build -m:1 -p:version=${GITHUB_REF#refs/*/v}
+        run: dotnet build -m:1 -bl:build.binlog
 
       - name: 🧪 test
         uses: ./.github/workflows/test
 
-      - name: 📦 pack
-        run: dotnet pack -m:1 -p:version=${GITHUB_REF#refs/*/v}
+      - name: 🐛 logs
+        uses: actions/upload-artifact@v3
+        if: runner.debug && always()
+        with:
+          name: logs
+          path: '*.binlog'
 
       - name: 🚀 nuget
         run: dotnet nuget push ./bin/**/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} --skip-duplicate

.github/workflows/sponsor.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: 🤘 checkout
         if: env.token != ''
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: 💜 sponsor 
         if: env.token != ''

.gitignore

@@ -1,12 +1,15 @@
 bin
-app
 obj
 artifacts
 pack
 TestResults
+results
+BenchmarkDotNet.Artifacts
+/app
 .vs
 .vscode
 .idea
+local.settings.json
 
 *.suo
 *.sdf
@@ -31,5 +34,6 @@ node_modules
 _site
 .jekyll-metadata
 .jekyll-cache
+.sass-cache
 Gemfile.lock
 package-lock.json