Merge pull request #20 from jjm-one/develop

Develop
jjm-one · Nov 2, 2023 · 24a25d7 · 24a25d7
2 parents a1e5fc1 + 2e5f699
commit 24a25d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -62,29 +62,30 @@ jobs:
     needs: build-and-test-release
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          java-version: 17
+          distribution: 'zulu' # Alternative distribution options are available.
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: .\.sonar\scanner
           key: ${{ runner.os }}-sonar-scanner
           restore-keys: ${{ runner.os }}-sonar-scanner
       - name: Cache dotnet-coverage
         id: cache-dotnet-coverage
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: .\.dotnet-coverage\dotnet-coverage
           key: ${{ runner.os }}-dotnet-coverage

diff --git a/....Extensions.Logging.Helpers.Tests/jjm.one.Serilog.Extensions.Logging.Helpers.Tests.csproj b/....Extensions.Logging.Helpers.Tests/jjm.one.Serilog.Extensions.Logging.Helpers.Tests.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>1.2.1</Version>
+        <Version>1.2.2</Version>
         <Authors>Jonas Merkle [JJM]</Authors>
         <Copyright>© by Jonas Merkle [JJM], 2023.</Copyright>
         <RootNamespace>jjm.one.Serilog.Extensions.Logging.Helpers.Tests</RootNamespace>
@@ -32,8 +32,8 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
         <PackageReference Include="Moq" Version="4.20.69" />
-        <PackageReference Include="xunit" Version="2.5.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+        <PackageReference Include="xunit" Version="2.6.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/....one.Serilog.Extensions.Logging.Helpers/jjm.one.Serilog.Extensions.Logging.Helpers.csproj b/....one.Serilog.Extensions.Logging.Helpers/jjm.one.Serilog.Extensions.Logging.Helpers.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6;net7</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	  <Version>1.2.1</Version>
+	  <Version>1.2.2</Version>
     <Authors>Jonas Merkle [JJM] </Authors>
     <Copyright>© by Jonas Merkle [JJM], 2023.</Copyright>
     <PackageId>jjm.one.Serilog.Extensions.Logging.Helpers</PackageId>