Merge pull request #139 from litetex/dev

Release
litetex · Jul 14, 2024 · 99f9dbe · 99f9dbe
2 parents 585a291 + 404f252
commit 99f9dbe
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 58 deletions.
diff --git a/.github/workflows/buildNuget.yml b/.github/workflows/buildNuget.yml
@@ -3,11 +3,11 @@ name: Build Nuget
 on:
   workflow_dispatch:
   push:
-    branches: [ develop ]
+    branches: [ dev ]
     paths-ignore: 
       - '**.md'
   pull_request:
-    branches: [ master ]
+    branches: [ dev ]
     paths-ignore: 
       - '**.md'
 
@@ -23,7 +23,7 @@ jobs:
       id: versionprovider
       shell: bash
       run: |
-        echo "version=$(date -u +%Y.%m.%d.%k%M)" >> $GITHUB_OUTPUT
+        echo "version=$(date -u +%Y.%m.%d.%-H%M)" >> $GITHUB_OUTPUT
         
   build_each:
     runs-on: ubuntu-latest
@@ -40,13 +40,13 @@ jobs:
         - "CoreFramework.CrashLogging"
         - "CoreFramework.Logging"
         dotnet-version:
-        - 6.x
+        - 8.x
 
     steps:    
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
 
@@ -61,7 +61,7 @@ jobs:
       run: files=( *.nupkg) && echo "filename=${files[0]}" >> $GITHUB_OUTPUT
 
     - name: Upload nupkg - Upload asset
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.dotnet-version }}-${{ steps.nupkgvar.outputs.filename }}
         path: src/${{ matrix.project }}/bin/Release/${{ steps.nupkgvar.outputs.filename }}
@@ -72,7 +72,7 @@ jobs:
       run: files=( *.snupkg) && echo "filename=${files[0]}" >> $GITHUB_OUTPUT
 
     - name: Upload snupkg - Upload asset
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.dotnet-version }}-${{ steps.snupkgvar.outputs.filename }}
         path: src/${{ matrix.project }}/bin/Release/${{ steps.snupkgvar.outputs.filename }}
diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
@@ -3,28 +3,32 @@ name: Check Build
 on:
   workflow_dispatch:
   push:
-    branches: [ develop ]
+    branches: [ dev ]
     paths-ignore: 
       - '**.md'
   pull_request:
-    branches: [ develop ]
+    branches: [ dev ]
     paths-ignore: 
       - '**.md'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
         dotnet-version:
-        - 6.x
+        - 8.x
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,9 +14,9 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.x
+        dotnet-version: 8.x
 
     - name: Build
       run: dotnet build --configuration Release
@@ -107,9 +107,9 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.x
+        dotnet-version: 8.x
 
     - name: Pack
       working-directory: src/${{ matrix.project }}
@@ -122,7 +122,7 @@ jobs:
       run: files=( *.nupkg) && echo "filename=${files[0]}" >> $GITHUB_OUTPUT
 
     - name: Upload nupkg - Upload asset
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.nupkgvar.outputs.filename }}
         path: src/${{ matrix.project }}/bin/Release/${{ steps.nupkgvar.outputs.filename }}
@@ -133,7 +133,7 @@ jobs:
       run: files=( *.snupkg) && echo "filename=${files[0]}" >> $GITHUB_OUTPUT
 
     - name: Upload snupkg - Upload asset
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.snupkgvar.outputs.filename }}
         path: src/${{ matrix.project }}/bin/Release/${{ steps.snupkgvar.outputs.filename }}

diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -3,66 +3,68 @@ name: Sonar CI
 on:
   workflow_dispatch:
   push:
-    branches: [ master, develop ]
+    branches: [ master, dev ]
     paths-ignore: 
       - '**.md'
   pull_request:
     types: [opened, synchronize, reopened]
     paths-ignore: 
       - '**.md'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   sonar:
     name: SonarCloud Scan
-    runs-on: windows-latest
-    # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
+    runs-on: ubuntu-latest
+    # Automated Dependency 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
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 21.x
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.x
+          dotnet-version: 8.x
 
       - 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
+        uses: actions/cache@v4
         with:
-          path: ~\sonar\cache
+          path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: .\src\.sonar\scanner
+          path: ./src/.sonar/scanner
           key: ${{ runner.os }}-sonar-scanner
           restore-keys: ${{ runner.os }}-sonar-scanner
 
       - name: Install SonarCloud scanner
         if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
         working-directory: src
-        shell: powershell
         run: |
-          New-Item -Path .\.sonar\scanner -ItemType Directory
-          dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+          mkdir -p .sonar/scanner
+          dotnet tool update dotnet-sonarscanner --tool-path .sonar/scanner
 
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         working-directory: src
-        shell: powershell
         run: |
-          .\.sonar\scanner\dotnet-sonarscanner begin /k:"litetex_CoreFrameworkBase" /o:"litetex" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
-           dotnet build --configuration Release
-          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+          .sonar/scanner/dotnet-sonarscanner begin /k:"litetex_CoreFrameworkBase" /o:"litetex" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+          dotnet build --configuration Release
+          .sonar/scanner/dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
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**: _Deprecated / 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/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) |
+| 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=dev)](https://github.com/litetex/CoreFramework/actions/workflows/sonar.yml?query=branch%3Adev)  |
+| Check Build | [![Latest workflow runs](https://img.shields.io/github/actions/workflow/status/litetex/CoreFramework/checkBuild.yml?branch=dev)](https://github.com/litetex/CoreFramework/actions/workflows/checkBuild.yml?branch%3Adev) |
+| Build Nuget | [![Latest workflow runs](https://img.shields.io/github/actions/workflow/status/litetex/CoreFramework/buildNuget.yml?branch=dev)](https://github.com/litetex/CoreFramework/actions/workflows/buildNuget.yml?branch%3Adev) |
 | 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
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.416",
+        "version": "8.0.100",
         "rollForward": "latestMinor"
     }
 }
diff --git a/renovate.json b/renovate.json
@@ -1,23 +1,27 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "rebaseWhen": "behind-base-branch",
+  "ignorePaths": [
+    "global.json"
+  ],
   "packageRules": [
     {
       "description": "Stick with .NET LTS",
       "datasources": [
         "dotnet-version"
       ],
-      "allowedVersions": "<7"
+      "allowedVersions": "<9"
     },
     {
       "description": "Stick with .NET LTS",
       "matchPackagePatterns": [
+        "^Microsoft.SourceLink.GitHub",
         "^dotnet" 
       ],
       "datasources": [
         "nuget"
       ],
-      "allowedVersions": "<7"
+      "allowedVersions": "<9"
     }
   ]
 }
diff --git a/src/CoreFramework.Base/CoreFramework.Base.csproj b/src/CoreFramework.Base/CoreFramework.Base.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
 
     <PackageId>Litetex.CoreFramework.Base</PackageId>
     <Description>Things that are frequently used in code - Base Module</Description>
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <!-- SourceLink -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj b/src/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
 
     <PackageId>Litetex.CoreFramework.Config.Json</PackageId>
     <Description>Things that are frequently used in code - JSON Configuration Module</Description>
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <!-- SourceLink -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj b/src/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
 
     <PackageId>Litetex.CoreFramework.Config.Yaml</PackageId>
     <Description>Things that are frequently used in code - YAML Configuration Module</Description>
@@ -25,11 +25,11 @@
 
   <!-- SourceLink -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YamlDotNet" Version="13.7.1" />
+    <PackageReference Include="YamlDotNet" Version="15.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CoreFramework.Config/CoreFramework.Config.csproj b/src/CoreFramework.Config/CoreFramework.Config.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
 
     <PackageId>Litetex.CoreFramework.Config</PackageId>
     <Description>Things that are frequently used in code - Configuration Module</Description>
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <!-- SourceLink -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj b/src/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
 
     <PackageId>Litetex.CoreFramework.CrashLogging</PackageId>
     <Description>Things that are frequently used in code - CrashLogging Module</Description>
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <!-- SourceLink -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>