Merge pull request #119 from litetex/develop

Maintenance release
litetex · Nov 10, 2023 · 585a291 · 585a291
2 parents 2e3a0a2 + 2e7e240
commit 585a291
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 41 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/buildNuget.yml b/.github/workflows/buildNuget.yml
@@ -43,7 +43,7 @@ jobs:
         - 6.x
 
     steps:    
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3

diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
@@ -19,10 +19,9 @@ jobs:
       matrix:
         dotnet-version:
         - 6.x
-        - 7.x
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
@@ -104,7 +104,7 @@ jobs:
         - "CoreFramework.Logging"
 
     steps:    
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3

diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -15,36 +15,38 @@ jobs:
   sonar:
     name: SonarCloud Scan
     runs-on: windows-latest
+    # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
+    if: ${{ github.event_name != 'pull_request' || !(startsWith(github.head_ref, 'renovate/') || startsWith(github.head_ref, 'dependabot/')) }}
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11.x
+          java-version: 21.x
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.x
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
           path: ~\sonar\cache
-          key: ${{ runner.os }}-sonar-fix2
-          restore-keys: ${{ runner.os }}-sonar-fix2
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache SonarCloud scanner
         id: cache-sonar-scanner
         uses: actions/cache@v3
         with:
           path: .\src\.sonar\scanner
-          key: ${{ runner.os }}-sonar-scanner-fix2
-          restore-keys: ${{ runner.os }}-sonar-scanner-fix2
+          key: ${{ runner.os }}-sonar-scanner
+          restore-keys: ${{ runner.os }}-sonar-scanner
 
       - name: Install SonarCloud scanner
         if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # CoreFramework <img src="CFR-128.png" width="48" /> [![Latest Version](https://img.shields.io/github/v/release/litetex/CoreFramework?style=flat-square)](https://github.com/litetex/CoreFramework/releases)
-_Current state: Maintenance mode_
+> **Current state**: _Maintenance mode_
 
 Stuff that is frequently used in (my) code and therefore here summarized
 
@@ -120,7 +120,7 @@ Stuff that is frequently used in (my) code and therefore here summarized
 ## Development [![Latest Version](https://img.shields.io/github/v/release/litetex/CoreFramework?style=flat-square&include_prereleases&label=prerelease)](https://github.com/litetex/CoreFramework/releases)
 | Workflow | Status |
 | --- | --- |
-| Sonar Build | [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=litetex_CoreFrameworkBase&metric=alert_status)](https://sonarcloud.io/dashboard?id=litetex_CoreFrameworkBase) <br>[![Latest workflow runs](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Sonar%20CI/develop)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Sonar+CI%22+branch%3Adevelop)  |
-| Check Build | [![Latest workflow runs](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Check%20Build/develop)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Check+Build%22+branch%3Adevelop) |
-| Build Nuget | [![Latest workflow runs](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Build%20Nuget/develop)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Build+Nuget%22+branch%3Adevelop) |
-| Release | [![master workflow runs](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Release/master?label=master)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Release%22+branch%3Amaster) <br>[![master workflow runs](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Release/master-release-test?label=release-test)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Release%22+branch%3Amaster-release-test) |
+| Sonar Build | [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=litetex_CoreFrameworkBase&metric=alert_status)](https://sonarcloud.io/dashboard?id=litetex_CoreFrameworkBase) <br>[![Latest workflow runs](https://img.shields.io/github/actions/workflow/status/litetex/CoreFramework/sonar.yml?branch=develop)](https://github.com/litetex/CoreFramework/actions/workflows/sonar.yml?query=branch%3Adevelop)  |
+| Check Build | [![Latest workflow runs](https://img.shields.io/github/actions/workflow/status/litetex/CoreFramework/checkBuild.yml?branch=develop)](https://github.com/litetex/CoreFramework/actions/workflows/checkBuild.yml?branch%3Adevelop) |
+| Build Nuget | [![Latest workflow runs](https://img.shields.io/github/actions/workflow/status/litetex/CoreFramework/buildNuget.yml?branch=develop)](https://github.com/litetex/CoreFramework/actions/workflows/buildNuget.yml?branch%3Adevelop) |
+| Release | [![master workflow runs](https://img.shields.io/github/actions/workflow/status/litetex/CoreFramework/release.yml?branch=master&label=master)](https://github.com/litetex/CoreFramework/actions/workflows/release.yml?query=branch%3Amaster) <br>[![master workflow runs](https://img.shields.io/github/actions/workflow/status/litetex/CoreFramework/release.yml?branch=master-release-test&label=release-test)](https://github.com/litetex/CoreFramework/actions/workflows/release.yml?query=branch%3Amaster-release-test) |
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+    "sdk": {
+        "version": "6.0.416",
+        "rollForward": "latestMinor"
+    }
+}
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "rebaseWhen": "behind-base-branch",
+  "packageRules": [
+    {
+      "description": "Stick with .NET LTS",
+      "datasources": [
+        "dotnet-version"
+      ],
+      "allowedVersions": "<7"
+    },
+    {
+      "description": "Stick with .NET LTS",
+      "matchPackagePatterns": [
+        "^dotnet" 
+      ],
+      "datasources": [
+        "nuget"
+      ],
+      "allowedVersions": "<7"
+    }
+  ]
+}
diff --git a/src/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj b/src/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj b/src/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YamlDotNet" Version="12.0.2" />
+    <PackageReference Include="YamlDotNet" Version="13.7.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CoreFramework.Logging/CoreFramework.Logging.csproj b/src/CoreFramework.Logging/CoreFramework.Logging.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
@@ -33,9 +33,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>