Bump the test-dependencies group across 1 directory with 2 updates (#107

) * Bump the test-dependencies group across 1 directory with 2 updates Bumps the test-dependencies group with 2 updates in the / directory: [FluentAssertions](https://github.com/fluentassertions/fluentassertions) and [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest). Updates `FluentAssertions` from 6.12.2 to 7.0.0 - [Release notes](https://github.com/fluentassertions/fluentassertions/releases) - [Changelog](https://github.com/fluentassertions/fluentassertions/blob/develop/AcceptApiChanges.ps1) - [Commits](fluentassertions/fluentassertions@6.12.2...7.0.0) Updates `Microsoft.NET.Test.Sdk` from 17.11.1 to 17.12.0 - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](microsoft/vstest@v17.11.1...v17.12.0) --- updated-dependencies: - dependency-name: FluentAssertions dependency-type: direct:production update-type: version-update:semver-major dependency-group: test-dependencies - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: test-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * Output .NET SDK version during build * Improve output for SDK version * Pin to .NET 8 * Audit transititive dependencies * Ensure that GitVersion updates are applied in the build group * Allow dependabot to update transititive dependencies * Fix vulnerabilities * Code quality fix IDE0300 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: elzik <[email protected]>
elzik · Dec 11, 2024 · 4a22202 · 4a22202
1 parent a5965d6
commit 4a22202
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 9 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,6 +14,7 @@ updates:
         - "AutoFixture*"
         - "coverlet*"
         - "FluentAssertions*"
+        - "GitVersion*"
         - "Microsoft.NET.Test*"
         - "NSubstitute*"
         - "Polly.Testing*"
@@ -29,4 +30,7 @@ updates:
         - "xunit*"
       build-dependencies:
         patterns:
-        - "GitVersion*"
+        - "GitVersion*"
+    allow:
+    - dependency-type: "all"
+
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -61,7 +61,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.x.x
     - name: Build & Test
       run: ./Build/build-and-test.ps1
       shell: pwsh

diff --git a/Build/build-and-test.ps1 b/Build/build-and-test.ps1
@@ -4,6 +4,9 @@ $repoRootPath = (Resolve-Path "$PSScriptRoot/../").Path
 
 Import-Module $(Resolve-Path "$repoRootPath/Build/Test-ExitCode.psm1")
 
+$sdkVersionUsed = (dotnet --version)
+Write-Output "SDK Version Used: $sdkVersionUsed"
+
 dotnet test $repoRootPath/Elzik.FmSync.sln `
 	-c Release `
 	--verbosity normal `
@@ -14,7 +17,7 @@ Test-ExitCode
 
 dotnet tool update `
 	--global dotnet-reportgenerator-globaltool `
-	--version 5.1.8
+	--version 5.*
 Test-ExitCode
 
 reportgenerator `

diff --git a/Elzik.FmSync.sln b/Elzik.FmSync.sln
@@ -21,6 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elzik.FmSync.Application.Te
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6839B032-FEC5-4978-A064-BD18FB683118}"
 	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
 		README.md = README.md
 	EndProjectSection
 EndProject

diff --git a/Installer/Elzik.FmSync.WindowsInstaller/Elzik.FmSync.WindowsInstaller.wixproj b/Installer/Elzik.FmSync.WindowsInstaller/Elzik.FmSync.WindowsInstaller.wixproj
@@ -3,6 +3,7 @@
     <UpdateAssemblyInfo>false</UpdateAssemblyInfo>
     <GenerateGitVersionInformation>false</GenerateGitVersionInformation>
     <GitVersionTargetFramework>net8.0</GitVersionTargetFramework>
+	<NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
   <ItemGroup>
     <None Include="LICENSE.rtf" />

diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.100",
+    "rollForward": "latestMinor"
+  }
+}
diff --git a/src/Elzik.FmSync.Application/Elzik.FmSync.Application.csproj b/src/Elzik.FmSync.Application/Elzik.FmSync.Application.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'!='Debug'">

diff --git a/src/Elzik.FmSync.Console/Elzik.FmSync.Console.csproj b/src/Elzik.FmSync.Console/Elzik.FmSync.Console.csproj
@@ -7,6 +7,7 @@
     <Nullable>enable</Nullable>
     <RootNamespace>Elzik.FmSync</RootNamespace>
     <AssemblyName>fmsync</AssemblyName>
+	<NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'!='Debug'">

diff --git a/src/Elzik.FmSync.Domain/Elzik.FmSync.Domain.csproj b/src/Elzik.FmSync.Domain/Elzik.FmSync.Domain.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'!='Debug'">

diff --git a/src/Elzik.FmSync.Infrastructure/Elzik.FmSync.Infrastructure.csproj b/src/Elzik.FmSync.Infrastructure/Elzik.FmSync.Infrastructure.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'!='Debug'">

diff --git a/src/Elzik.FmSync.Worker/Elzik.FmSync.Worker.csproj b/src/Elzik.FmSync.Worker/Elzik.FmSync.Worker.csproj
@@ -5,6 +5,7 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UserSecretsId>dotnet-Elzik.FmSync.Worker-4d67e15b-f529-48cc-919a-3c678579aeb2</UserSecretsId>
+		<NuGetAuditMode>all</NuGetAuditMode>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'!='Debug'">

diff --git a/tests/Elzik.FmSync.Application.Tests.Unit/Elzik.FmSync.Application.Tests.Unit.csproj b/tests/Elzik.FmSync.Application.Tests.Unit/Elzik.FmSync.Application.Tests.Unit.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'!='Debug'">
@@ -26,8 +27,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
       <PrivateAssets>all</PrivateAssets>
@@ -38,6 +39,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.analyzers" Version="1.17.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

diff --git a/tests/Elzik.FmSync.Console.Tests.Functional/ConsoleTests.cs b/tests/Elzik.FmSync.Console.Tests.Functional/ConsoleTests.cs
@@ -94,7 +94,7 @@ public async Task Synchronise_EmptyFolder_LogsToFile()
 
             // Assert
             var fileLog = await File.ReadAllTextAsync(_logPath);
-            var fileLogLines = fileLog.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+            var fileLogLines = fileLog.Split([Environment.NewLine], StringSplitOptions.None);
             var expectedWorkingDirectoryLogText = $"Synchronising *.md files in {_buildOutputDirectory}".TrimEnd('\\', '/');
             _testOutputHelper.WriteLine($"expectedWorkingDirectoryLogText = {expectedWorkingDirectoryLogText}");
             fileLogLines.Should().Contain(line => line.EndsWith(expectedWorkingDirectoryLogText));

diff --git a/tests/Elzik.FmSync.Console.Tests.Functional/Elzik.FmSync.Console.Tests.Functional.csproj b/tests/Elzik.FmSync.Console.Tests.Functional/Elzik.FmSync.Console.Tests.Functional.csproj
@@ -4,6 +4,7 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
+		<NuGetAuditMode>all</NuGetAuditMode>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'!='Debug'">
@@ -37,7 +38,7 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="FluentAssertions.Json" Version="6.1.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...ync.Infrastructure.Tests.Integration/Elzik.FmSync.Infrastructure.Tests.Integration.csproj b/...ync.Infrastructure.Tests.Integration/Elzik.FmSync.Infrastructure.Tests.Integration.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'!='Debug'">
@@ -34,7 +35,7 @@
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
 	  <PackageReference Include="FluentAssertions.Json" Version="6.1.0" />
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 	  <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Elzik.FmSync.Worker.Tests.Functional/Elzik.FmSync.Worker.Tests.Functional.csproj b/tests/Elzik.FmSync.Worker.Tests.Functional/Elzik.FmSync.Worker.Tests.Functional.csproj
@@ -4,6 +4,7 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
+		<NuGetAuditMode>all</NuGetAuditMode>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'!='Debug'">
@@ -37,7 +38,7 @@
 				<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			</PackageReference>
 			<PackageReference Include="FluentAssertions.Json" Version="6.1.0" />
-			<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+			<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 			<PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
 				<PrivateAssets>all</PrivateAssets>
 				<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>