Merge pull request #19 from adrianiftode/fixes/vulnerable-dependencies

adrianiftode · web-flow · commit efea4692b2b7 · 2025-03-04T15:07:31.000+01:00
Update packages with security vulenrabilities
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,10 +1,12 @@
-version: 1.1.{build}
-image: Visual Studio 2019
+version: 1.2.{build}
+image: Visual Studio 2022
 branches:
   only:
   - master
+  - /\d+\.\d+\.\d+/
 pull_requests:
-  do_not_increment_build_number: true
+  do_not_increment_build_number: false
+skip_branch_with_pr: true
 configuration: Release
 shallow_clone: true
 
@@ -18,6 +20,23 @@ skip_commits:
 
 init:
   - cmd: dotnet --version
+  - ps: |
+      if ($env:APPVEYOR_REPO_TAG -eq "true")
+      {
+        try
+        {
+           Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
+        }
+        catch
+        {
+           Write-Output "Update-AppveyorBuild Fail to change version to TAG: '$env:APPVEYOR_REPO_TAG_NAME'"   -ForegroundColor Red
+           Write-Output "Exception Error: $PSItem.Exception.Message" -ForegroundColor Red
+           Write-Output "Exception Error: $PSItem.Exception.GetType().Name" -ForegroundColor Red 
+        }
+      }
+  - ps: |
+      Write-Host "APPVEYOR_BUILD_VERSION='$env:APPVEYOR_BUILD_VERSION'" -ForegroundColor Yellow
+      Write-Host "APPVEYOR_REPO_TAG_NAME= '$env:APPVEYOR_REPO_TAG_NAME'" -ForegroundColor Yellow
   - ps: 'if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & dotnet tool install -g dotnet-sonarscanner }'
   - cmd: dotnet tool install -g minicover
 
@@ -36,22 +55,22 @@ nuget:
 before_build: 
   - dotnet restore
 build_script:
-  # Ensure Java 11, required by Sonar
-  - set JAVA_HOME=C:\Program Files\Java\jdk11
+  # Ensure Java 15, required by Sonar
+  - set JAVA_HOME=C:\Program Files\Java\jdk19
+  - if not exist "%JAVA_HOME%\bin\java.exe" (echo "%JAVA_HOME%\bin\java.exe does not exist" && exit 1)
   - set PATH=%JAVA_HOME%\bin;%PATH%
-  # Begin SonarScanner
-  - ps: 'if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & dotnet sonarscanner begin /k:"Moq.ILogger" /o:adrianiftode-github /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env:SONAR_TOKEN" /v:"$env:APPVEYOR_BUILD_NUMBER" /d:sonar.cs.opencover.reportsPaths="opencovercoverage.xml" /d:sonar.coverage.exclusions=test/**}'
-  - dotnet build
+  - ps: 'if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & dotnet sonarscanner begin /k:"adrianiftode_FluentAssertions.Web" /o:adrianiftode-github /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env:SONAR_TOKEN" /v:"$env:APPVEYOR_BUILD_NUMBER" /d:sonar.cs.opencover.reportsPaths="opencovercoverage.xml" /d:sonar.coverage.exclusions=test/**}'
+  - dotnet build -c %CONFIGURATION% /p:Version=%APPVEYOR_BUILD_VERSION%
   - minicover instrument
 test_script:
-  - dotnet test --no-restore --no-build
+  - dotnet test --no-restore --no-build --nologo --verbosity:q
 after_test:
   - minicover uninstrument
   - minicover opencoverreport
   # will fail when the test coverage is lower than the threshold
   - minicover report --threshold 90
   - ps: 'if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & dotnet sonarscanner end /d:sonar.login="$env:SONAR_TOKEN" }'
-  - dotnet pack --no-restore --include-symbols -c %CONFIGURATION%
+  - dotnet pack --no-build --include-symbols -c %CONFIGURATION% /p:PackageVersion=%APPVEYOR_BUILD_VERSION%
 
 artifacts:
   - path: '**\*.nupkg'
@@ -60,8 +79,16 @@ artifacts:
 deploy:
   - provider: NuGet
     api_key:
-     secure: O+eAN9xt6vbmeNTfpqoQ5c64xbzUCXrZXhJU6/3Vw9BvSn747F9PH5tFtuxEqLTA
+     secure: DbQndcBhytd1c9OjkuTZDytpWBemxjl0eskUAhXO6y4L0TdjH2H6SubzOnWCH7bD
     skip_symbols: true
     artifact: /.*\.nupkg/
-    on: 
-      branch: master
+    on:
+      appveyor_repo_tag: true
+
+  - provider: GitHub
+    release: $(APPVEYOR_BUILD_VERSION)
+    auth_token:
+        secure: WXU/Xj3ntIZVx89KDAa/V9FszL7l3pOFpFdWVEsKggcn7bGviwOOpm9RSxZ7q+biREJXWL+1hYhcXQltmQDbaX7ga5jNMGyFFWpIWSDpb8x+1Aeg10fZX1SEWQ0t6VUr
+    artifact: /.*\.nupkg/
+    on:
+      appveyor_repo_tag: true
diff --git a/src/Moq.ILogger/Moq.ILogger.csproj b/src/Moq.ILogger/Moq.ILogger.csproj
@@ -12,30 +12,18 @@
     <Authors>Adrian Iftode</Authors>
     <PackageDescription>Enables the Moq's Verify API over the *ILogger* extensions (LogInformation, LogError, etc).</PackageDescription>
     <PackageTags>Moq;ILogger;ILoggerExtensions;unit;unittest;logging</PackageTags>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <PackageProjectUrl>https://github.com/adrianiftode/Moq.ILogger</PackageProjectUrl>
     <RepositoryUrl>https://github.com/adrianiftode/Moq.ILogger</RepositoryUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.13.0" />
+    <PackageReference Include="Moq" Version="4.18.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
       <Version>2.0.0</Version>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/tests/Moq.ILogger.Tests/Moq.ILogger.Tests.csproj b/tests/Moq.ILogger.Tests/Moq.ILogger.Tests.csproj
@@ -1,22 +1,33 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net461;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Moq" Version="4.13.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="FluentAssertions" Version="7.2.0" />
+    <PackageReference Include="Moq" Version="4.18.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+ 
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Moq.ILogger\Moq.ILogger.csproj" />
   </ItemGroup>
diff --git a/tests/Moq.ILogger.Tests/VerifyLogExceptionTests.cs b/tests/Moq.ILogger.Tests/VerifyLogExceptionTests.cs
@@ -30,13 +30,5 @@ public void Ctor_WhenInnerException_DoesNotThrow()
 
             act.Should().NotThrow();
         }
-
-        [Fact]
-        public void Exception_ShouldBeBinarySerializable()
-        {
-            var sut = new VerifyLogException("Some message", new Exception());
-
-            sut.Should().BeBinarySerializable();
-        }
     }
 }
diff --git a/tests/Moq.ILogger.Tests/VerifyLogUnexpectedExceptionTests.cs b/tests/Moq.ILogger.Tests/VerifyLogUnexpectedExceptionTests.cs
@@ -30,13 +30,5 @@ public void Ctor_WhenInnerException_DoesNotThrow()
 
             act.Should().NotThrow();
         }
-
-        [Fact]
-        public void Exception_ShouldBeBinarySerializable()
-        {
-            var sut = new VerifyLogUnexpectedException("Some message", new Exception());
-
-            sut.Should().BeBinarySerializable();
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,5 @@ public void Ctor_WhenInnerException_DoesNotThrow()`
`30`	`30`
`31`	`31`	`act.Should().NotThrow();`
`32`	`32`	`}`
`33`		`-`
`34`		`- [Fact]`
`35`		`- public void Exception_ShouldBeBinarySerializable()`
`36`		`- {`
`37`		`- var sut = new VerifyLogException("Some message", new Exception());`
`38`		`-`
`39`		`- sut.Should().BeBinarySerializable();`
`40`		`- }`
`41`	`33`	`}`
`42`	`34`	`}`